update catalogs (#3371)

71 files changed, 41179 insertions, 22267 deletions

diff --git a/po/af.po b/po/af.po
index b32d81c..7b6d7d5 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -31,14 +31,16 @@ msgid "Interface"
 msgstr "Koppelvlak"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-adres"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -74,23 +76,27 @@ msgid "Configure Local Area Network..."
 msgstr "Stel plaaslike netwerk op..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Hulp"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Pas toe"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Kanselleer"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -100,7 +106,8 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -109,7 +116,7 @@ msgstr "OK"
 msgid "Please wait"
 msgstr "Wag asb."
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Wag asb... Konfigurasie word toegpas"
@@ -145,6 +152,7 @@ msgstr "Toestel %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmasker"
@@ -160,6 +168,7 @@ msgid "Started on boot"
 msgstr "Gelaai tydens herlaaityd"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-kliënt"
@@ -171,20 +180,23 @@ msgid ""
 "Run the \"%s\" assistant from the Mageia Linux Control Center"
 msgstr ""
 "Hierdie koppelvlak is nog nie opgestel nie.\n"
-"Loods die \"%s\" Add an interface\"-assistent vanuit die Mageia Control Center"
+"Loods die \"%s\" Add an interface\"-assistent vanuit die Mageia Control "
+"Center"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Verwyder 'n netwerkkoppelvlak"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Geen IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Geen Masker"
@@ -253,12 +265,12 @@ msgstr ""
 "\n"
 "Wat wil u doen?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Deaktiveer"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Aktiveer"
@@ -273,8 +285,8 @@ msgstr "herkonfigureer"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Netwerk Toestel"
@@ -341,7 +353,11 @@ msgstr "Die interne domeinnaam"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -633,13 +649,14 @@ msgstr "Laat alle gebruikers toe"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Vuurmuur"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Kon nie die spieëlwebplek %s kontak nie"
@@ -649,12 +666,12 @@ msgstr "Kon nie die spieëlwebplek %s kontak nie"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Alles"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -681,12 +698,12 @@ msgstr "Rugsteun gebruiker se lêers"
 msgid "Clear logs"
 msgstr "Verwyder almal"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -834,7 +851,7 @@ msgstr "Modus"
 msgid "Enabled"
 msgstr "Aktiveer"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Beskrywing"
@@ -876,9 +893,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Waarskuwing"
@@ -2344,12 +2361,12 @@ msgstr ""
 "Pasop, daar is 'n ander internet konneksie, wat moontlik u netwerk gebruik, "
 "bespeur"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Gekonnekteer"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nie gekonnekteer"
@@ -2414,7 +2431,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "beperk"
@@ -2454,19 +2471,22 @@ msgstr "Model kaart:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Magtiging"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Gebruikerskode"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Wagwoord"
@@ -2591,13 +2611,15 @@ msgstr ""
 "Elke item moet as 'n IP-adres in dot-desimalenotasie\n"
 "(1.2.3.4) gegee word."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Portaal"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Die DNS-bediener se IP"
@@ -2625,21 +2647,25 @@ msgstr ""
 "name\" FQHN af kom"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Konneksie tydlimiet (in sekondes)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-rekenaarnaam"
@@ -2650,11 +2676,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adres moet in 1.2.3.4. formaat wees"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Deurgang IP-adres moet in 1.2.3.4. formaat wees"
@@ -2673,6 +2701,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Ken rekenaarnaam vanaf DHCP-adres toe."
@@ -2694,6 +2723,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Warm-inprop Netwerk"
@@ -2762,27 +2792,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skriptipe"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminaaltipe"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3941,90 +3976,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Draadlose konneksie"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Bedryfsvlak"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Beheerde"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Meester"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekondêre"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Outo"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Netwerknaam (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Enkripsie-sleutel"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Wagwoord"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Gebruikerskode"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4032,12 +4070,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Wagwoord"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4056,12 +4094,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Naam van die sertifikaat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4070,32 +4108,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Netwerk-ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Bedryfsfrekwensie"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Sensitiwiteits behoud"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4115,17 +4158,19 @@ msgstr ""
 "sal stuur. 'n Waarde gelyk aan die maksimun pakkie grootte sal dit\n"
 "de-aktiveer. U kan dit ook stel na Outo, bepaald of af."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentasie"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig program se ekstra argumente"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4140,12 +4185,13 @@ msgstr ""
 "Raadpleeg die iwconfig(8) man vir ekstra inligting."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy program se ekstra argumente"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4164,12 +4210,13 @@ msgstr ""
 "\n"
 "Raadpleeg die iwpspy(8) vir verdere inligting."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv program se ekstra argumente"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4197,107 +4244,107 @@ msgstr ""
 "\n"
 "Raadpleeg die iwpriv(8) vir verdere inligting."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Gebruik outospeuring"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Modus"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4305,12 +4352,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4319,12 +4366,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Tipe sertifikaat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4334,12 +4381,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4349,12 +4396,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4372,26 +4419,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4400,7 +4447,7 @@ msgstr ""
 "Freq moet 'n k, M of G agtervoegsel kry. (byvoorbeeld, \"2.6G\" vir 2.46Ghz "
 "frekwensie), of u moet genoeg 0'e (zero's) byvoeg."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4409,17 +4456,17 @@ msgstr ""
 "Tempo moet agtervoegsels van k,M, of G kry (byvoorbeeld \"11M\" vir 11M) of "
 "voeg genoeg 0'e (zero'z) by."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4563,6 +4610,287 @@ msgstr "Konnekteer"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Geen ethernetkaart is op die stelsel gevind nie. Gebruik asb. die "
+"hardewarekonfigurasieprogram."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Verwyder 'n netwerkkoppelvlak"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Kies die netwerkkoppelvlak om op te stel:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Daar was 'n probleem met die verwydering van die \"%s\" koppelvlak:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Geluk, die \"%s\" netwerkkoppelvlak is suksesvol verwyder"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Kabelkonneksie"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Toestel: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS-konfigurasie"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS-bedieners"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Deursoek Domein"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "niks"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "staties"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Begin tydens herlaaityd"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Belmetode"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Konneksiespoed"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Konneksie tydlimiet (in sekondes)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Verskaffer se foonnommer"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Beheer van Vloei"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Lyn-terminasie"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Tydsbeperking vi modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Gebruik slot-lêer"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Wag vir skakeltoon voor skakel"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Wag as besig"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Modem se klank"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kaart IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kaartgeheue (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kaart I/O"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kaart IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europese protokol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol vir die res vd wêreld \n"
+"geen D-Kanaal nie (bruikhuurlyne)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Vervaardiger"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Media-klas"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Modulenaam"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "MAC-adres:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Ligging op die bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Deurgang IP-adres moet in 1.2.3.4. formaat wees"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Portaal:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Koppelvlak:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Internetkonneksie-konfigurasie"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Hierdie koppelvlak is nog nie opgestel nie.\n"
+"Loods die \"%s\"-assistent vanuit die Mageia Control Center"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Rekenaarnaam (opsioneel)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Eerste DNS-bediener (opsioneel)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Tweede DNS-bediener (opsioneel)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Eerste DNS-bediener (opsioneel)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Internetkonneksiekonfigurasie"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internettoegang"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Konneksietipe:"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Status:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Konneksie word getoets..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parameters"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4766,11 +5094,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Geen toestelle gevind nie"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Toestel: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4994,6 +5317,103 @@ msgstr "Installeer stelsel"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Diens Bestuurder"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Vuurmuurkonfigurasie gevind!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Wil Taai-sleutels aktiveer?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Geen Detail"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Aktiveer %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Netwerkkoppelvlak: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "tipe: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Deurgang se IP-adres"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Stel gasheer naam %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Diens Bestuurder"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Poort: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Poort: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignoreer"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Vuurmuurkonfigurasie gevind!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Draadlose konneksie"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Wil u die konfigurasie toets?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Onthou hierdie wagwoord"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5037,20 +5457,6 @@ msgstr "Interne ISDN-kaart"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol vir die res van die wêreld"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europese protokol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol vir die res vd wêreld \n"
-"geen D-Kanaal nie (bruikhuurlyne)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5099,11 +5505,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Konneksie word getoets..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5124,11 +5525,6 @@ msgstr "U persoonlike telefoonnommer"
 msgid "Provider name (ex provider.net)"
 msgstr "Voorsienernaam (bv voorsiener.co.za)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Verskaffer se foonnommer"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5139,41 +5535,6 @@ msgstr "Voorsiener DNS 1 (opsioneel)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Voorsiener DNS 2 (opsioneel)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Belmetode"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Konneksiespoed"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Konneksie tydlimiet (in sekondes)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kaart IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kaartgeheue (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kaart I/O"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kaart IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5337,16 +5698,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Eerste DNS-bediener (opsioneel)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Tweede DNS-bediener (opsioneel)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5655,11 +6006,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS-adres moet in 1.2.3.4. formaat wees"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Deurgang IP-adres moet in 1.2.3.4. formaat wees"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6099,16 +6445,6 @@ msgstr ""
 #~ "\n"
 #~ "Ek gaan nou u LAN met daardie kaart opstel."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Geen ethernetkaart is op die stelsel gevind nie. Gebruik asb. die "
-#~ "hardewarekonfigurasieprogram."
-
-#~ msgid "Connection type: "
-#~ msgstr "Konneksietipe:"
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s is alreeds in gebruik\n"
 
@@ -7082,9 +7418,6 @@ msgstr ""
 #~ msgid "IPsec policy"
 #~ msgstr "IPsec-reels"
 
-#~ msgid "none"
-#~ msgstr "niks"
-
 #~ msgid "Source/destination"
 #~ msgstr "Bron/bestemming"
 
@@ -7097,181 +7430,12 @@ msgstr ""
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "U moet afteken en weer inteken alvorens veranderinge bekragtig word"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Diens Bestuurder"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Vuurmuurkonfigurasie gevind!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Wil Taai-sleutels aktiveer?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Geen Detail"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Aktiveer %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Netwerkkoppelvlak: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "tipe: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Deurgang se IP-adres"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Stel gasheer naam %s: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Diens Bestuurder"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Poort: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignoreer"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Vuurmuurkonfigurasie gevind!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Draadlose konneksie"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Wil u die konfigurasie toets?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Onthou hierdie wagwoord"
-
-#~ msgid "Gateway:"
-#~ msgstr "Portaal:"
-
-#~ msgid "Interface:"
-#~ msgstr "Koppelvlak:"
-
-#, fuzzy
-#~ msgid "Manage connections"
-#~ msgstr "Kabelkonneksie"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS-konfigurasie"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS-bedieners"
-
-#~ msgid "Search Domain"
-#~ msgstr "Deursoek Domein"
-
-#~ msgid "static"
-#~ msgstr "staties"
-
-#~ msgid "Start at boot"
-#~ msgstr "Begin tydens herlaaityd"
-
-#~ msgid "Flow control"
-#~ msgstr "Beheer van Vloei"
-
-#~ msgid "Line termination"
-#~ msgstr "Lyn-terminasie"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Tydsbeperking vi modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Gebruik slot-lêer"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Wag vir skakeltoon voor skakel"
-
-#~ msgid "Busy wait"
-#~ msgstr "Wag as besig"
-
-#~ msgid "Modem sound"
-#~ msgstr "Modem se klank"
-
-#~ msgid "Vendor"
-#~ msgstr "Vervaardiger"
-
-#~ msgid "Media class"
-#~ msgstr "Media-klas"
-
-#~ msgid "Module name"
-#~ msgstr "Modulenaam"
-
-#~ msgid "Mac Address"
-#~ msgstr "MAC-adres:"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Ligging op die bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Verwyder 'n netwerkkoppelvlak"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Daar was 'n probleem met die verwydering van die \"%s\" koppelvlak:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Geluk, die \"%s\" netwerkkoppelvlak is suksesvol verwyder"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Diskonnekteer..."
 
 #~ msgid "Connect..."
 #~ msgstr "Konnekteer..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Internetkonneksie-konfigurasie"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Rekenaarnaam (opsioneel)"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Eerste DNS-bediener (opsioneel)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Internetkonneksiekonfigurasie"
-
-#~ msgid "Internet access"
-#~ msgstr "Internettoegang"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parameters"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Geen Detail"
diff --git a/po/am.po b/po/am.po
index 4a9a99c..27839ec 100644
--- a/po/am.po
+++ b/po/am.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -25,14 +25,16 @@ msgid "Interface"
 msgstr "የተጠቃሚው እይታ"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP አድራሻ"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr ""
@@ -68,23 +70,27 @@ msgid "Configure Local Area Network..."
 msgstr ""
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "እርዳታ"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "ተጠቀም"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "ተወው"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "እሺ"
@@ -94,7 +100,8 @@ msgstr "እሺ"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -103,7 +110,7 @@ msgstr "እሺ"
 msgid "Please wait"
 msgstr "እባክዎ ይጠብቁ"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "እባክዎ ይጠብቁ... ምርጫውን በስራ ላይ አያዋለ ነው"
@@ -137,6 +144,7 @@ msgstr ""
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -152,6 +160,7 @@ msgid "Started on boot"
 msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr ""
@@ -164,17 +173,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "የአቢወርድ ቋንቋ፦"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, fuzzy, c-format
 msgid "No IP"
 msgstr "የማተሚያ IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "ፋይል የለም"
@@ -227,12 +238,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "አይቻል"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "ይቻል"
@@ -247,8 +258,8 @@ msgstr "ተስተካክሏል"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "የመረብ መሳሪያ"
@@ -314,7 +325,11 @@ msgstr "ህገ ወጥ የዶሴ ስም"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -596,13 +611,14 @@ msgstr "ለሁሉም ተጠቃሚዎች ፍቀድ"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "የእሳት ግድግዳ"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "ከአንጸባራቂ %s ጋር መገናኘት አልተቻለም"
@@ -612,12 +628,12 @@ msgstr "ከአንጸባራቂ %s ጋር መገናኘት አልተቻለም"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "ሁሉንም"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -644,12 +660,12 @@ msgstr "ሁሉንም የምስል ፋይሎች"
 msgid "Clear logs"
 msgstr "ሁሉንም ሰርዝ"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -797,7 +813,7 @@ msgstr "የአሠራሩ ዘዴ"
 msgid "Enabled"
 msgstr "ይቻል"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "መግለጫ"
@@ -839,9 +855,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "ማስጠንቀቂያ"
@@ -2299,12 +2315,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "ተገናኝቷል"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "አልተገናኘም"
@@ -2369,7 +2385,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "ሜክሲኮ"
@@ -2409,19 +2425,22 @@ msgstr "የካርድ ሞዴል፦"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, fuzzy, c-format
 msgid "Authentication"
 msgstr "ማስረጃ"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "የመዝገብ ሚስጢራዊ ቃል"
@@ -2541,13 +2560,15 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "ቀዳሚ ተጠሪ ይጠቀም"
@@ -2573,21 +2594,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "ህገ ወጥ የዶሴ ስም"
@@ -2598,11 +2623,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr ""
@@ -2621,6 +2648,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2642,6 +2670,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Name=መረብ"
@@ -2710,27 +2739,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, fuzzy, c-format
 msgid "Script-based"
 msgstr "የተመሠረተው፦"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, fuzzy, c-format
 msgid "Terminal-based"
 msgstr "የተመሠረተው፦"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3889,90 +3923,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "ሽቦ አልባ ግንኙነት"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "የመሸፈኛ ዘዴ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "ገዢ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "ደጋሚ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "ሁለተኛ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "ራስ-ገዝ"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "የመረብ ስም (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "የሚስጢራዊ ግልበጣ ቁልፍ"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "ሚስጢራዊ ቃል"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "የተጠቃሚ ስም"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3980,12 +4017,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "ሚስጢራዊ ቃል"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4004,12 +4041,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4018,32 +4055,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "የመረብ መለያ"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, fuzzy, c-format
 msgid "Bitrate (in b/s)"
 msgstr "በጥቅም ላይ ያለ"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4057,17 +4099,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4078,12 +4122,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4095,12 +4140,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4118,107 +4164,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "&ፖርት፦"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "በራስ-ገዝ ፈልጎ አግኝ"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "የአሠራሩ ዘዴ"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4226,12 +4272,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4240,12 +4286,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4255,12 +4301,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4270,12 +4316,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4293,50 +4339,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4478,6 +4524,278 @@ msgstr "አገናኝ"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "የአቢወርድ ቋንቋ፦"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "ለማስተካከል የመረብ እይታ ይምረጡ:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "ግንኙነቶችን ይቆጣጠሩ"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "መሳሪያ: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "የማስተካከያው አራሚ"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS ሰርቨር 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "የObjectDirectory ዶሜን"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ምንም"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "ራስ-ገዝ"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "ቍጥር አሰጣጡን እንደገና በ...ላይ ጀምር፦"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, fuzzy, c-format
+msgid "Dialing mode"
+msgstr "የመሸፈኛ ዘዴ"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "የግንኙነት ፍጥነት"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "የአገልግሎት ሰጪው ስልክ ቁጥር"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "የፍሰት ቁጥጥር"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr " መለያ መስመር፦"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "ድምፅ የለም"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "ፋይሉ በፊትም ነበር። የ-yes ምርጫን ተጠቀሙ።"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "እባክዎ ይጠብቁ.."
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "ድምፅ የለም"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "ካርድ IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "ካርድ mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "ካርድ IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "ካርድ IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, fuzzy, c-format
+msgid "European protocol (EDSS1)"
+msgstr "መካከለኛ አውሮፓውያን፣ Macintosh"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "የፋይል ስም አቅድ"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "ኢሜያል አድራሻ"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "ጥቅም"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, fuzzy, c-format
+msgid "Location on the bus"
+msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "የተጠቃሚው እይታ"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "የኢንተርኔት ሰዓትን ተጠቀም"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "ህገ ወጥ የዶሴ ስም"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "የአገልግሎት ሰጪ ስልክ ቁጥር"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "የኢንተርኔት ሰዓትን ተጠቀም"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Name=ኢንተርኔት"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "የፋይሉ ዓይነት"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "ሁኔታ፦"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "ግንኙነትዎን በመሞከር ላይ..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "መለኪያዎች"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4669,11 +4987,6 @@ msgstr ""
 msgid "No device found"
 msgstr "ምንም ጽሑፍ አልተገኘም"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "መሳሪያ: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4896,6 +5209,103 @@ msgstr "ሲስተም ትከል"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "የአገልግሎቶች መቆጣጠሪያ"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "ተስተካክሎ የተቀመጠውን ባዕድ መነሻ ጥቀስ"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "ይህንን ሁኔታ መጠቀም ይፈልጋሉ?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "ያለ ዝርዝሮች"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "%s አስጀምርs"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "የተጠቃሚው እይታ"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "ዓይነት፦"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "&ፖርት፦"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "የIP አድራሻ፦"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "ዞሮ መመለሻ ፋይል ስም: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "የአገልግሎቶች መቆጣጠሪያ"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "&ፖርት፦"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "&ፖርት፦"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "ይተዉ"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "ተስተካክሎ የተቀመጠውን ባዕድ መነሻ ጥቀስ"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "ሽቦ አልባ ግንኙነት"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "ምርጫውን መሞከር ይፈልጋሉ?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "ይህን ሚስጢራዊ ቃል አስታውስ"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4939,18 +5349,6 @@ msgstr "ውስጣዊ ISDN ካርድ"
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:71
-#, fuzzy, c-format
-msgid "European protocol (EDSS1)"
-msgstr "መካከለኛ አውሮፓውያን፣ Macintosh"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -4999,11 +5397,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "ግንኙነትዎን በመሞከር ላይ..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5024,11 +5417,6 @@ msgstr "የራስዎ ስልክ ቁጥር"
 msgid "Provider name (ex provider.net)"
 msgstr "የአገልግሎት ሰጪው ስም (ለምሳሌ: provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "የአገልግሎት ሰጪው ስልክ ቁጥር"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5039,41 +5427,6 @@ msgstr "የአገልግሎት ሰጪ ስልክ ቁጥር"
 msgid "Provider DNS 2 (optional)"
 msgstr "የአገልግሎት ሰጪ ስልክ ቁጥር"
 
-#: ../lib/network/netconnect.pm:352
-#, fuzzy, c-format
-msgid "Dialing mode"
-msgstr "የመሸፈኛ ዘዴ"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "የግንኙነት ፍጥነት"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "ካርድ IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "ካርድ mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "ካርድ IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "ካርድ IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5228,16 +5581,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "የዶሜን ስም"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5511,11 +5854,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5923,10 +6261,6 @@ msgstr ""
 #~ msgid "Clone"
 #~ msgstr "አገናኝ"
 
-#, fuzzy
-#~ msgid "Connection type: "
-#~ msgstr "የፋይሉ ዓይነት"
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s አስቀድሞ ጥቅም ላይ ነው\n"
 
@@ -5977,170 +6311,19 @@ msgstr ""
 #~ msgid "Direction"
 #~ msgstr "አቅጣጫ"
 
-#~ msgid "none"
-#~ msgstr "ምንም"
-
 #~ msgid "Level"
 #~ msgstr "ደረጃ"
 
 #~ msgid "default"
 #~ msgstr "ቀዳሚ"
 
-#~ msgid "use"
-#~ msgstr "ጥቅም"
-
 #~ msgid "unique"
 #~ msgstr "የተለየ"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "የአገልግሎቶች መቆጣጠሪያ"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "ተስተካክሎ የተቀመጠውን ባዕድ መነሻ ጥቀስ"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "ይህንን ሁኔታ መጠቀም ይፈልጋሉ?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "ያለ ዝርዝሮች"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "%s አስጀምርs"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "የተጠቃሚው እይታ"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "ዓይነት፦"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "&ፖርት፦"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "የIP አድራሻ፦"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "ዞሮ መመለሻ ፋይል ስም: %s"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "የአገልግሎቶች መቆጣጠሪያ"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "&ፖርት፦"
-
-#~ msgid "Ignore"
-#~ msgstr "ይተዉ"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "ተስተካክሎ የተቀመጠውን ባዕድ መነሻ ጥቀስ"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "ሽቦ አልባ ግንኙነት"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "ምርጫውን መሞከር ይፈልጋሉ?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "ይህን ሚስጢራዊ ቃል አስታውስ"
-
-#, fuzzy
-#~ msgid "Interface:"
-#~ msgstr "የተጠቃሚው እይታ"
-
-#~ msgid "Manage connections"
-#~ msgstr "ግንኙነቶችን ይቆጣጠሩ"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "የማስተካከያው አራሚ"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "የObjectDirectory ዶሜን"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#, fuzzy
-#~ msgid "Start at boot"
-#~ msgstr "ቍጥር አሰጣጡን እንደገና በ...ላይ ጀምር፦"
-
-#~ msgid "Flow control"
-#~ msgstr "የፍሰት ቁጥጥር"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr " መለያ መስመር፦"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "ፋይሉ በፊትም ነበር። የ-yes ምርጫን ተጠቀሙ።"
-
-#~ msgid "Busy wait"
-#~ msgstr "እባክዎ ይጠብቁ.."
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "ድምፅ የለም"
-
-#, fuzzy
-#~ msgid "Module name"
-#~ msgstr "የፋይል ስም አቅድ"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "ኢሜያል አድራሻ"
-
-#, fuzzy
-#~ msgid "Location on the bus"
-#~ msgstr "መረጃ በ%s መጠቀሚያ ፕሮግራም ላይ"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "የአቢወርድ ቋንቋ፦"
-
 #~ msgid "Disconnect..."
 #~ msgstr "ግንኙነት አቋርጥ..."
 
 #, fuzzy
-#~ msgid "Internet connection configuration"
-#~ msgstr "የኢንተርኔት ሰዓትን ተጠቀም"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "ህገ ወጥ የዶሴ ስም"
-
-#, fuzzy
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "የኢንተርኔት ሰዓትን ተጠቀም"
-
-#, fuzzy
-#~ msgid "Internet access"
-#~ msgstr "Name=ኢንተርኔት"
-
-#~ msgid "Status:"
-#~ msgstr "ሁኔታ፦"
-
-#~ msgid "Parameters"
-#~ msgstr "መለኪያዎች"
-
-#, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "ያለ ዝርዝሮች"
 
diff --git a/po/ar.po b/po/ar.po
index 2b63e45..9653e38 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,19 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-19 13:18+0000\n"
 "Last-Translator: salim salim <almusalimalmusalimah@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
 
 #: ../bin/drakconnect-old:45
 #, c-format
@@ -26,14 +27,16 @@ msgid "Interface"
 msgstr "الواجهة"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "عنوان IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "البروتوكول"
@@ -69,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "تهيئة الشبكة المحلية..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "مساعدة"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "تطبيق"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "إلغاء"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "موافق"
@@ -95,16 +102,17 @@ msgstr "موافق"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "الرجاء الانتظار"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "يرجى الإنتظار... جاري تطبيق التهيئة"
@@ -140,6 +148,7 @@ msgstr "المحوّل %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "قناع الشبكة"
@@ -155,6 +164,7 @@ msgid "Started on boot"
 msgstr "يتم تشغيله عند الإقلاع"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "عميل DHCP"
@@ -169,17 +179,19 @@ msgstr ""
 "قم بتشغيل مساعد \"أ%s\" من مركز تحكّم ماجيّا لينكس"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "إعداد واجهة شبكة جديدة (LAN، ISDN، ADSL، ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "بدون IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "لا قناع"
@@ -203,16 +215,22 @@ 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). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
 "أنت على وشك تهيئة جهازك لمشاركة إتصاله بالإنترنت.\n"
-"باستخدام هذه الميزة ستتمكن الحواسيب الأخرى في الشبكة المحلية من استخدام اتصال الحاسب بالإنترنت.\n"
+"باستخدام هذه الميزة ستتمكن الحواسيب الأخرى في الشبكة المحلية من استخدام "
+"اتصال الحاسب بالإنترنت.\n"
 "\n"
-"تأكد من أنك قمت بتهيئة وصلة الشبكة/الإنترنت باستخدام drakconnect قبل المتابعة.\n"
+"تأكد من أنك قمت بتهيئة وصلة الشبكة/الإنترنت باستخدام drakconnect قبل "
+"المتابعة.\n"
 "\n"
 "ملحوظة: تحتاج إلى موائم للشبكة كي تقوم بإعداد الشبكة المحلية (LAN)."
 
@@ -242,12 +260,12 @@ msgstr ""
 "\n"
 "ماذا تريد أن تفعل؟"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "تعطيل"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "تمكين"
@@ -262,8 +280,8 @@ msgstr "اعادة تهيئة"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "رجاء اختر واجهة الشبكة الموصولة مباشرة باﻹنترنت"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "جهاز الشبكة"
@@ -271,7 +289,8 @@ msgstr "جهاز الشبكة"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one network adapter on your system configured for LAN connections:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
@@ -281,7 +300,8 @@ msgid ""
 "disable the firewall protection on it using drakfirewall before\n"
 "configuring Internet Connection sharing."
 msgstr ""
-"لا يوجد في نظامك غير واحد من محولات الشبكة قد هُيئ  ﻹتصالات الشبكة المحلية LAN :\n"
+"لا يوجد في نظامك غير واحد من محولات الشبكة قد هُيئ  ﻹتصالات الشبكة المحلية "
+"LAN :\n"
 "%s\n"
 "\n"
 "I am about to setup your Local Area Network with that adapter.\n"
@@ -292,7 +312,9 @@ msgstr ""
 
 #: ../bin/drakgw:156
 #, 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 "الرجاء اختيار موائم الشبكة الذي سيتم به الإتصال بالشبكة المحلية."
 
 #: ../bin/drakgw:177
@@ -334,7 +356,11 @@ msgstr "اسم النطاق الداخلي"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -349,10 +375,9 @@ msgstr "خطأ"
 
 #: ../bin/drakgw:188
 #, c-format
-msgid ""
-"Potential LAN address conflict found in current config of %s!\n"
-""
-msgstr "عثر على تعارض في عنوان الشبكة المحلية المبدئي في التهيئة الحالي لـ%s!\n"
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr ""
+"عثر على تعارض في عنوان الشبكة المحلية المبدئي في التهيئة الحالي لـ%s!\n"
 
 #: ../bin/drakgw:204
 #, c-format
@@ -445,13 +470,17 @@ msgstr "أنشر معلومات الطابعة"
 #: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter configured for LAN has been detected on your system.\n"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that "
+"the Mageia firewall is not enabled for network adapter connected to your LAN "
+"network."
 msgstr ""
 "لم يُعثر على محول شبكة إيثرنت مهيئ  للشبكة المحلية في نظام التشغيل لديك.\n"
 "\n"
-"رجاء شغل أداة تهيئة العتاد لتتم تهيئته, وتأكد أن جدار ماجيّا معطل تجاه محول الشبكة المتصل بشبكة LAN لديك."
+"رجاء شغل أداة تهيئة العتاد لتتم تهيئته, وتأكد أن جدار ماجيّا معطل تجاه محول "
+"الشبكة المتصل بشبكة LAN لديك."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -467,11 +496,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"
-"يمكنك الآن مشاركة اتصال الإنترنت مع الحاسبات الأخرى في شبكتك المحلية باستخدام تهيئة الشبكة الأوتوماتيكية (DHCP) و\n"
+"يمكنك الآن مشاركة اتصال الإنترنت مع الحاسبات الأخرى في شبكتك المحلية "
+"باستخدام تهيئة الشبكة الأوتوماتيكية (DHCP) و\n"
 " خادم الذاكرة المخبئة والبروكسي الشّفافي (SQUID)."
 
 #: ../bin/drakgw:351
@@ -486,8 +517,12 @@ msgstr "تم اكتشاف إعداد للجدار الناري!"
 
 #: ../bin/drakgw:366
 #, 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:371
 #, c-format
@@ -622,13 +657,14 @@ msgstr "العناوين المرخص و المسموح لها"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "جدار ناري تفاعلي"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "تعذر الإتصال بالمساعد"
@@ -638,12 +674,12 @@ msgstr "تعذر الإتصال بالمساعد"
 msgid "Log"
 msgstr "السّجل"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "إسمح"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "احجب و امنع"
@@ -670,12 +706,12 @@ msgstr "خدمات ممنوعة و محجوبة"
 msgid "Clear logs"
 msgstr "مسح السجلات"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "اللائحة السوداء"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "اللائحة البيضاء"
@@ -757,8 +793,12 @@ msgstr "كلمة المرور مطلوبة"
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "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 ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -821,7 +861,7 @@ msgstr "وحدة"
 msgid "Enabled"
 msgstr "تمكين"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "الوصف"
@@ -838,8 +878,15 @@ msgstr "سجل شخصي جديد..."
 
 #: ../bin/draknetprofile:155
 #, c-format
-msgid "Please specify the name of the new network profile to be created (e.g., work, home, roaming, ..). This new profile will be created based on current settings, and you'll be able to configure your system configuration as usual afterwards."
-msgstr "رجاء حدد اسم حساب الشبكة الجديدة التي ستنشئها اﻵن (مثال .. المنزل ، المكتب ، العمل ... ). سيتم إنشاء هذا الحسلاب الجديد بناء على اﻹعدادات الحالية, و ستكون قادرا بعدئذ من على تهيئة نظامك كالمعتاد سابقا."
+msgid ""
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
+"settings, and you'll be able to configure your system configuration as usual "
+"afterwards."
+msgstr ""
+"رجاء حدد اسم حساب الشبكة الجديدة التي ستنشئها اﻵن (مثال .. المنزل ، المكتب ، "
+"العمل ... ). سيتم إنشاء هذا الحسلاب الجديد بناء على اﻹعدادات الحالية, و "
+"ستكون قادرا بعدئذ من على تهيئة نظامك كالمعتاد سابقا."
 
 #: ../bin/draknetprofile:166
 #, c-format
@@ -853,12 +900,17 @@ msgstr "أُنشئ حساب شخصي جديد..."
 
 #: ../bin/draknetprofile:172
 #, c-format
-msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
-msgstr "أنت اﻵن تستخدم حساب الشبكة %s. باستطاعتك تهيئة نظامك كالمعتاد, من اﻵن فصاعدا سيتم حفظ إعداداتك الخاصة بالشبكةفي هذا الحساب."
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+"أنت اﻵن تستخدم حساب الشبكة %s. باستطاعتك تهيئة نظامك كالمعتاد, من اﻵن فصاعدا "
+"سيتم حفظ إعداداتك الخاصة بالشبكةفي هذا الحساب."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "تحذير"
@@ -870,7 +922,9 @@ msgstr "هل تريد تأكيد حذف الحساب اﻹفتراضي؟"
 
 #: ../bin/draknetprofile:186
 #, c-format
-msgid "You can not delete the current profile. Please switch to a different profile first."
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
 msgstr "لا يمكنك حذف الحساب الحالي . رجاء حوّل لحساب أخر أولا"
 
 #: ../bin/draknetprofile:194 ../bin/draknfs:356
@@ -993,34 +1047,51 @@ msgstr "يجب أن يكون دليلا."
 #: ../bin/draknfs:146
 #, 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 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"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1028,31 +1099,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\">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"
 
 #: ../bin/draknfs:177
 #, c-format
@@ -1081,23 +1167,49 @@ msgstr "خيارات متقدمة"
 
 #: ../bin/draknfs:183
 #, 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> 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 ""
+"<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."
 
 #: ../bin/draknfs:184
 #, 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> 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 ""
+"<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."
 
 #: ../bin/draknfs:185
 #, 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> 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 ""
+"<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)."
 
 #: ../bin/draknfs:186
 #, 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> 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 ""
+"<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."
 
 #: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
@@ -1460,13 +1572,10 @@ msgstr ""
 msgid "Mageia"
 msgstr "ماجيّا"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
-msgid ""
-"_: Translator(s) name(s) & email(s)\n"
-""
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Arabeyes <support@arabeyes.org>\n"
 
 #: ../bin/draksambashare:229
@@ -1508,7 +1617,9 @@ msgstr "التعليق:"
 
 #: ../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
@@ -1539,7 +1650,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
@@ -1679,7 +1791,8 @@ msgstr ""
 
 #: ../bin/draksambashare:795
 #, 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:803
@@ -1729,7 +1842,9 @@ msgstr "مساعد تهيئة خادم سامبا"
 
 #: ../bin/draksambashare:1057
 #, 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:1073
@@ -1739,17 +1854,22 @@ msgstr ""
 
 #: ../bin/draksambashare:1073
 #, 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:1073
 #, 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:1073
 #, 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:1090
@@ -1774,7 +1894,12 @@ msgstr ""
 
 #: ../bin/draksambashare:1092
 #, 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:1096
@@ -1814,7 +1939,9 @@ msgstr "وضع الأمن"
 
 #: ../bin/draksambashare:1122
 #, 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:1122
@@ -1824,7 +1951,10 @@ msgstr ""
 
 #: ../bin/draksambashare:1122
 #, 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:1133
@@ -1839,7 +1969,9 @@ msgstr ""
 
 #: ../bin/draksambashare:1138
 #, 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:1143
@@ -1859,7 +1991,9 @@ msgstr ""
 
 #: ../bin/draksambashare:1154
 #, 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:1154
@@ -1894,12 +2028,16 @@ msgstr ""
 
 #: ../bin/draksambashare:1168
 #, 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:1168
 #, 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:1176
@@ -2289,15 +2427,17 @@ msgstr "إجراء محلي"
 
 #: ../bin/net_monitor:512
 #, 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 "تحذير، تم اكتشاف اتصال إنترنت آخر، ربما يستخدم شبكتك"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "متّصل"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "غير متصل"
@@ -2362,7 +2502,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "متري"
@@ -2402,19 +2542,22 @@ msgstr "مودم سلكي (( مودم كيبل ))"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "استخدام BPALogin )مطلوبة لـTelstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "المواثقة"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "اسم الدخول للحساب (اسم المستخدم)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "كلمة المرور للحساب"
@@ -2537,13 +2680,15 @@ msgstr ""
 "كل مادة يجب إدخالها كعنوان IP بشكل منقوط\n"
 "(مثلاً، 1.2.3.4(."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "البوّابة"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "إحصل على خوادم DNS من DHCP"
@@ -2569,21 +2714,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "بشكل افتراضي سيتمّ تحديد نطاق البحث من اسم المضيف المهيّء بالكامل"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "الوقت الأقصى لـ DHCP (بالثواني)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "اسم مضيف DHCP"
@@ -2594,11 +2743,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "عنوان IP يجب أن يكون بنسق 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "يجب أن يكون قناع الشبكة على النسق 255.255.224.0"
@@ -2610,25 +2761,36 @@ msgstr "تحذير: عنوان الـ IP %s عادة ما يكون محفوظا�
 
 #: ../lib/network/connection/ethernet.pm:195
 #, c-format
-msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
+msgid ""
+"%s is already used by a connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start at boot"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "تعيين اسم المضيف من عنوان DHCP ( أو أنشئ واحدا مميز )"
 
 #: ../lib/network/connection/ethernet.pm:223
 #, c-format
-msgid "This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically."
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:226
 #, c-format
-msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
+msgid ""
+"You should define a hostname for this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections.  If "
+"left blank, 'localhost.localdomain' will be used."
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "القبْس السريع للشبكة"
@@ -2697,27 +2859,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "مبني على نص برمجي"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "مبني على محطة طرفيّة"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3876,88 +4043,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "إعدادات اللاسلكي"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "وضعية التّشغيل"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "مُصطنع"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "مُدار"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "رئيسي"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "مُكرّر"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "ثانوي"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "آلي"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "إسم الشّبكة (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "مفتاح التشفير"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "أخفِ كلمة المرور"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "كلمة مرور تسجيل الدخول EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3965,12 +4137,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "كلمة مرور بروتوكول المصادقة القابلة للتمديد EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -3989,12 +4161,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "شّهادة موكّل بروتوكول المصادقة القابلة للتمديد EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4003,39 +4175,47 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "رقم مُعرّف الشّبكة"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "تردّد التّشغيل"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "عتبة الحساسية"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "معدّل البث (بِتْ/ث)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, 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 ""
 "يضيف RTS/CTS المُصافحة قبل كل بثّ رزم للتّأكّد من أنّ\n"
@@ -4045,37 +4225,41 @@ msgstr ""
 "حجم رزمة تُعطّل المخطّط. يمكنك أيضاً تحديد هذا المُعطى بتلقائي،\n"
 "ثابت أو معطّل."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "مستوى التّجزّء"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "المُعطيات الإضافية لأمر iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 محدّد مسبّقا كإسم المضيف).\n"
+"ap، channel، commit، enc، power، retry، sens، txpower )nick محدّد مسبّقا كإسم "
+"المضيف).\n"
 "\n"
 "راجع صفحة الدّليل iwconfig(8)  للمزيد من المعلومات."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "المُعطيات الإضافيّة لأمر iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4094,21 +4278,25 @@ msgstr ""
 "\n"
 "رجاع صفحة دليل iwpspy)8( للمزيد من المعلومات."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "المُعطيات الإضافيّة لأمر iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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."
@@ -4124,107 +4312,107 @@ msgstr ""
 "\n"
 "راجع صفحة دليل iwpriv(8) للمزيد من المعلومات."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "بروتوكول المصادقة القابلة للتمديد EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "تحقق و فحص  آلي"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "وضع بروتوكول المصادقة القابلة للتمديد EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "بروتوكول المصادقة المحمية القابلة للتمديد PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4232,12 +4420,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4246,12 +4434,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "شهادة EAP CA"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4261,12 +4449,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4276,12 +4464,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4299,42 +4487,54 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
-msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
-msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 "يجب أن يكون للتردّد اللاحقة k، أو M أو G (مثلاً، \"2.46G\" للتردّد 2.46 GHz(، أو إضافة أصفار كافية."
+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 ""
+"يجب أن يكون للتردّد اللاحقة k، أو M أو G (مثلاً، \"2.46G\" للتردّد 2.46 GHz(، "
+"أو إضافة أصفار كافية."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "يجب أن يكون للمعدّل اللاحقة k، أو M أو G (مثلاً، \"11M\" للمعدّل 11M)، أو إضافة أصفار كافية."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"يجب أن يكون للمعدّل اللاحقة k، أو M أو G (مثلاً، \"11M\" للمعدّل 11M)، أو إضافة "
+"أصفار كافية."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4352,7 +4552,8 @@ msgstr "مودم Alcatel speedtouch USB"
 #: ../lib/network/connection/xdsl.pm:125
 #, 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 ""
@@ -4362,7 +4563,9 @@ msgstr ""
 
 #: ../lib/network/connection/xdsl.pm:185
 #, 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:205
@@ -4476,6 +4679,285 @@ msgstr "اتصل"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "واجهة الشبكة "
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "اختيار واجهة الشبكة لتهيئتها:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"ظهرت مشكلة أثناء إعادة تشغيل الشبكة: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "تهانينا، انتهت تهيئة الشبكة ."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "إدارة اتّصالات VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "الجهاز: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "تهيئة VPN "
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "خادم DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "نطاق البحث"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "آلي"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "يتم تشغيله عند الإقلاع"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "وضعية الإتصال"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "سرعة الإتصال"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "الوقت الأقصى للاتصال (بالثواني)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "رقم هاتف المزوّد"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "وصلة المودم"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "اختيار ملف"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "الكويت"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "المودم"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ للبطاقة"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "ذاكرة البطاقة (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO للبطاقة"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 للبطاقة"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "البروتوكول الأوروبي (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"بروتوكول لبقية العالم\n"
+"لا D-Channel (خطوط مؤجرة)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "وحدة"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "عنوان حقيقي"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "روسيا البيضاء"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "عنوان البوابات يجب أن تكون على النسق 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "البوّابة"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "الواجهة"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "ليس هناك أي اتصال إنترنت مهيأ"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"ليس لديك أي اتصال إنترنت مهيئ.\n"
+"شغّل مساعد \"%s\" من مركز تحكم ماجيّا لينكس"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "خادم DNS الأول (اختياري)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "خادم DNS الأول (اختياري)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "خادم DNS الثاني (اختياري)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "خادم DNS الأول (اختياري)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "تهيئة الاتصال"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "إذن الطابعة"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "زمن الاتصال:"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "الحالة"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "اختبار الوصلة..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "مُعطيات IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4664,7 +5146,8 @@ msgstr ""
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
 
@@ -4678,11 +5161,6 @@ msgstr ""
 msgid "No device found"
 msgstr "لم يُعثر على أي جهاز"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "الجهاز: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4758,9 +5236,10 @@ 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 ""
 
 #: ../lib/network/ifw.pm:132
@@ -4815,11 +5294,12 @@ msgstr "محاولة هجوم \"%s\" بواسطة %s"
 
 #: ../lib/network/ifw.pm:151
 #, 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
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -4855,7 +5335,10 @@ msgstr "رجاءا اختر التعريف الصحيح"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver description (.inf) file, or corresponding driver file (.dll or .o files). Note that only drivers up to Windows XP are supported."
+msgid ""
+"Please select the Windows driver description (.inf) file, or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
 msgstr ""
 
 #: ../lib/network/ndiswrapper.pm:45
@@ -4900,6 +5383,103 @@ msgstr "تثبيت مشغّل جديد"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "هجوم الخدمة"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "جدار ناري تفاعلي"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "كيف تريد طلب هذا الاتصال؟"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "واجهة الشبكة "
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "البروتوكول"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "عنوان IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "هجوم الخدمة"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "جدار ناري تفاعلي"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "اتّصال لاسلكي"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "كيف تريد طلب هذا الاتصال؟"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4945,20 +5525,6 @@ msgstr "بطاقة ISDN داخلية"
 msgid "Protocol for the rest of the world"
 msgstr "بروتوكول لبقية العالم"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "البروتوكول الأوروبي (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"بروتوكول لبقية العالم\n"
-"لا D-Channel (خطوط مؤجرة)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5007,11 +5573,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "اختبار الوصلة..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5032,11 +5593,6 @@ msgstr "رقم هاتفك الشخصي"
 msgid "Provider name (ex provider.net)"
 msgstr "اسم المزوّد (مثلاً provider.net("
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "رقم هاتف المزوّد"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5047,41 +5603,6 @@ msgstr "مُزوّد DNS 1 (اختياري)"
 msgid "Provider DNS 2 (optional)"
 msgstr "مُزوّد Provider DNS 2 (اختياري)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "وضعية الإتصال"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "سرعة الإتصال"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "الوقت الأقصى للاتصال (بالثواني)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ للبطاقة"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "ذاكرة البطاقة (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO للبطاقة"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 للبطاقة"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5115,13 +5636,15 @@ 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"
+"إذا كانت لديك بطاقة ISA، فإن القيم التي ستعرض على الشاشة التالية يجب أن تكون "
+"صحيحة.\n"
 "\n"
-"إذا كانت لديك بطاقة PCMCIA، يجب عليك أن تعرف قيم \"irq\" و \"io\" الخاصة ببطاقتك.\n"
+"إذا كانت لديك بطاقة PCMCIA، يجب عليك أن تعرف قيم \"irq\" و \"io\" الخاصة "
+"ببطاقتك.\n"
 
 #: ../lib/network/netconnect.pm:437
 #, c-format
@@ -5140,8 +5663,13 @@ msgstr "أي من الآتي هي بطاقة ISDN الخاصة بك؟"
 
 #: ../lib/network/netconnect.pm:461
 #, 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:475
 #, c-format
@@ -5241,16 +5769,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "اسم النطاق"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "خادم DNS الأول (اختياري)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "خادم DNS الثاني (اختياري)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5312,12 +5830,16 @@ msgstr "ظهرت مشكلة أثناء إختبار إتصال الشبكة"
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
-msgid "This can be caused by invalid network configuration, or problems with your modem or router."
+msgid ""
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
 msgstr ""
 
 #: ../lib/network/netconnect.pm:772
 #, c-format
-msgid "You might want to relaunch the configuration to verify the connection settings."
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
 msgstr ""
 
 #: ../lib/network/netconnect.pm:775
@@ -5327,12 +5849,16 @@ msgstr "تهانينا، انتهت تهيئة الشبكة ."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
-msgid "However, the Internet connectivity test failed. You should test your connection manually, and verify your Internet modem or router."
+msgid ""
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
 msgstr ""
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
-msgid "If your connection does not work, you might want to relaunch the configuration."
+msgid ""
+"If your connection does not work, you might want to relaunch the "
+"configuration."
 msgstr "إذا لم يعمل الإتصال , فلربما من اﻷفضل لك إعادة التهيئة."
 
 #: ../lib/network/netconnect.pm:778
@@ -5342,8 +5868,11 @@ msgstr "تهانينا, انتهت تهيئة الشبكة و اﻹنترنت."
 
 #: ../lib/network/netconnect.pm:779
 #, c-format
-msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
-msgstr "بعد عمل ذلك، ننصح بإعادة تشغيل بيئة X لديك لتفادي أي مشاكل تتعلق بإسم المضيف."
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+"بعد عمل ذلك، ننصح بإعادة تشغيل بيئة X لديك لتفادي أي مشاكل تتعلق بإسم المضيف."
 
 #: ../lib/network/netconnect.pm:790
 #, c-format
@@ -5442,12 +5971,14 @@ msgstr "يجب أن يحتوي اسم مضيف Zeroconf على . (نقطة("
 #: ../lib/network/netconnect.pm:813
 #, 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"
+"اضغط موافق لحفظ التهيئة الخاصة بك، أو اضغط إلغاء لإعادة تهيئة وصلات الإنترنت "
+"و الشبكة.\n"
 
 #: ../lib/network/netconnect.pm:816
 #, c-format
@@ -5489,7 +6020,6 @@ msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
-""
 msgstr ""
 "لقد قمت بتهيئة طرق متعددة للإتصال بالإنترنت.\n"
 "اختر الطريقة التي تريد استخدامها.\n"
@@ -5507,8 +6037,12 @@ msgstr "جاري تهيئة جهاز الشبكة %s (مشغّل %s)"
 
 #: ../lib/network/netconnect.pm:824
 #, 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:825
 #, c-format
@@ -5533,11 +6067,6 @@ msgstr "أخيراً وليس آخراً يمكنك أيضاً أن تدخل ع�
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "عنوان خادم DNS يجب أن يكون على النسق 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "عنوان البوابات يجب أن تكون على النسق 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5559,7 +6088,9 @@ msgstr "إعدادات الشبكة المتقدمة"
 
 #: ../lib/network/network.pm:524
 #, c-format
-msgid "Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."
+msgid ""
+"Here you can configure advanced network settings. Please note that you have "
+"to reboot the machine for changes to take effect."
 msgstr ""
 
 #: ../lib/network/network.pm:526
@@ -5619,7 +6150,9 @@ msgstr "تهيئة البروكسي"
 
 #: ../lib/network/network.pm:549
 #, 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:550
@@ -5674,7 +6207,6 @@ msgid ""
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
-""
 msgstr ""
 
 #: ../lib/network/shorewall.pm:158
@@ -5709,7 +6241,8 @@ msgstr ""
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
 msgstr ""
 
 #: ../lib/network/thirdparty.pm:152
@@ -5747,7 +6280,8 @@ msgstr "اختيار ملف"
 #: ../lib/network/thirdparty.pm:206
 #, c-format
 msgid "Please select the firmware file (for example: %s)"
-msgstr "الرجاء اختيار ملف البرنامج الثابت - firmware - ( على سبيل المثال : %s )"
+msgstr ""
+"الرجاء اختيار ملف البرنامج الثابت - firmware - ( على سبيل المثال : %s )"
 
 #: ../lib/network/thirdparty.pm:230
 #, c-format
@@ -5766,8 +6300,12 @@ msgstr "أدخل قرص مرن"
 
 #: ../lib/network/thirdparty.pm:243
 #, 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:243
 #, c-format
diff --git a/po/az.po b/po/az.po
index d5dd7a9..c13f2f1 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -30,14 +30,16 @@ msgid "Interface"
 msgstr "Ara üz"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP ünvanı"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -73,23 +75,27 @@ msgid "Configure Local Area Network..."
 msgstr "Yerli Şəbəkəni Quraşdır..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Yardım"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Tədbiq Et"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Ləğv Et"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Oldu"
@@ -99,7 +105,8 @@ msgstr "Oldu"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -108,7 +115,7 @@ msgstr "Oldu"
 msgid "Please wait"
 msgstr "Xahiş edirik, gözləyin"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Xahiş edirik, gözləyin... Qurğular tətbiq edilir"
@@ -144,6 +151,7 @@ msgstr "%s Adapteri: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -159,6 +167,7 @@ msgid "Started on boot"
 msgstr "Açılışda başladılır"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP alıcısı"
@@ -173,17 +182,19 @@ msgstr ""
 "Ana pəncərədə quraşdırma sehirbazını işə salın"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Şəbəkə ara üzünü sil"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IP yoxdur"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Maskasız"
@@ -252,12 +263,12 @@ msgstr ""
 "\n"
 "Nə etmək istəyirsiniz?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Qeyri-fəallaşdır"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Fəallaşdır"
@@ -272,8 +283,8 @@ msgstr "Yenidən Qur"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Şəbəkə Avadanlığı"
@@ -341,7 +352,11 @@ msgstr "Daxili domen adı"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -634,13 +649,14 @@ msgstr "Bütün istifadəçilərə icazə ver"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Atəş Divarı"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "%s əksi ilə rabitə qurula bilmir"
@@ -650,12 +666,12 @@ msgstr "%s əksi ilə rabitə qurula bilmir"
 msgid "Log"
 msgstr "Qeyd"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Hamısı"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -682,12 +698,12 @@ msgstr "İstifadəçi fayllarının ehtiyat nüsxəsini çıxart"
 msgid "Clear logs"
 msgstr "Hamısını təmizlə"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -835,7 +851,7 @@ msgstr "Mod"
 msgid "Enabled"
 msgstr "Fəallaşdır"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "İzahat"
@@ -877,9 +893,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Xəbərdarlıq"
@@ -2349,12 +2365,12 @@ msgstr ""
 "Diqqət, başqa internet bağlantısı aşkar edildi, güman ki şəbəkənizi istifadə "
 "edir"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Bağlandı"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Bağlı deyil"
@@ -2419,7 +2435,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "məhdudlaşdır"
@@ -2459,19 +2475,22 @@ msgstr "Kart modeli:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Tanıtma"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Hesab Girişi (istifadəçi adı)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Hesap Şifrəsi"
@@ -2596,13 +2615,15 @@ msgstr ""
 "Hər üzv nöqtəli onluq IP şəklində girilməlidir,\n"
 "(misal üçün 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Şəbəkə Keçidi"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS Verici IP'si"
@@ -2628,21 +2649,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Bağlantı vaxt dolması (saniyə sonra)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP qovşaq adı"
@@ -2653,11 +2678,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP ünvanı 1.2.3.4 şəklində olmalıdır"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Şəbəkə keçişi ünvanı 1.2.3.4 şəklində olmalıdır"
@@ -2676,6 +2703,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "DHCP ünvanı üçün qovşaq adı tə'yin edin"
@@ -2697,6 +2725,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Ani Şəbəkə Fəallaşdırılması (Network Hotplugging)"
@@ -2765,27 +2794,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skript əsaslı"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal-əsaslı"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3944,90 +3978,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Kabelsiz bağlantı"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "İdrə Modu"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "İdarə edilən"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Əsas"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Təkrarlayıcı"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "İkinci"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Avtomatik"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Şəbəkə adı (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Şifrələmə açarı"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Şifrə"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Hesab Girişi (istifadəçi adı)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4035,12 +4072,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Şifrə"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4059,12 +4096,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4073,32 +4110,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Şəbəkə ID-si"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "İşləmə tezliyi"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Həssaslıq aralığı"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Vuruş sıxlığı (v/s olaraq)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4112,17 +4154,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fraqmentasiya"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig əmri əlavə arqumentləri"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4133,12 +4177,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy əmri əlavə arqumentləri"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4150,12 +4195,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv əmri əlavə arqumentləri"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4173,107 +4219,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Avtomatik təsbit et"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Mod"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "TLS"
 msgstr "LSB"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4281,12 +4327,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4295,12 +4341,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4310,12 +4356,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4325,12 +4371,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4348,26 +4394,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4376,7 +4422,7 @@ msgstr ""
 "Tezliyin yanına k, M ya da G şəkilçisi qoyulmalıdır (misal üçün, 2.46 GHz "
 "tezlik üçün \"2.46G\" ), ya da lazım olan qədər '0' (sıfır) əlavə edin."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4385,17 +4431,17 @@ msgstr ""
 "Sıxlığın yanına k, M ya da G şəkilçisi qoyulmalıdır (misal üçün, 11M üçün "
 "\"11M\" ), ya da lazım olan qədər '0' (sıfır) əlavə edin."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4537,6 +4583,287 @@ msgstr "Bağlan"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Sisteminizdə şəbəkə kartı tapıla bilməyib.Avadanlığı quran vasitəni işə "
+"salın."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Şəbəkə ara üzünü sil"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Quraşdırılacaq şəbəkə ara üzünü seç:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Şəbəkənin yenidən başladılması sırasında xəta oldu: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Təbriklər, \"%s\" şəbəkə ara üzü müvəffəqiyyətlə silindi"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Bağlantıları idarə et"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Avadanlıq: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS quraşdırılması"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS vericiləri"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Axtarış Sahəsi"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "heç biri"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statik"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Açılışda başlat"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Yığma modu"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Bağlantı sürəti"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Bağlantı vaxt dolması (saniyə sonra)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "İXM telefon nömrəsi"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Flow idarəsi"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Sətir sonlandırılması"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Modem vaxt dolması"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Qıfıl faylını işlət"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Zəng vurmadan əvvəl ton səsini gözləyin"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Məşğul gözləməsi"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Modem səsi"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kart IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kart mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kart GÇ"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kart IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Avropa protokolu (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Dünyanın geri qalanı üçün protokol \n"
+" D-Channel yoxdur (kiralıq xətlər)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "E'malatçı"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Mediya sinifi"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Modul adı"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Mac Ünvanı"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Yol"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Yol üstündə mövqe"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Şəbəkə keçişi ünvanı 1.2.3.4 şəklində olmalıdır"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Şəbəkə Keçidi:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Ara üz:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "İnternet bağlantısının quraşdırılması"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"BU ara üz hələlik quraşdırılmayıb.\n"
+"Ana pəncərədə quraşdırma sehirbazını işə salın"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Qovşaq adı (arzuya görə)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Birinci DNS Vericisi (arzuya görə)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "İkinci DNS Vericisi (arzuya görə)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Birinci DNS Vericisi (arzuya görə)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "İnternet Bağlantısı Quraşdırılması"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "İnternet yetişməsi"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Bağlantı növü:"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Vəziyyət:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Bağlantınız sınanır..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametrlər"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4738,11 +5065,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Heç bir avadanlıq tapıla bilmədi"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Avadanlıq: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4965,6 +5287,103 @@ msgstr "Sistemin qurulumu"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Xidmət _növü:"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Atəş divarı quruluşu tapıldı!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Həqiqətən də bu oyundan çıxmaq istəyirsiniz?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Təfsilatsız"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Gedişat: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Şəbəkə ara üzü: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Çatma şəkli: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Kompüterin IP ünvanı:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "%s qovşaq adı verilir: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Xidmət _növü:"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Qapı: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Qapı: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Nəzərə alma"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Atəş divarı quruluşu tapıldı!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Kabelsiz bağlantı"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Qurğuları sınamaq istəyirsiniz?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Bu şifrəni yadında saxla"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5008,20 +5427,6 @@ msgstr "Daxili ISDN kart"
 msgid "Protocol for the rest of the world"
 msgstr "Dünyanın geri qalanı üçün protokol"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Avropa protokolu (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Dünyanın geri qalanı üçün protokol \n"
-" D-Channel yoxdur (kiralıq xətlər)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5070,11 +5475,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Bağlantınız sınanır..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5095,11 +5495,6 @@ msgstr "Şəxsi telefon nömrəniz"
 msgid "Provider name (ex provider.net)"
 msgstr "İnternet xidmət vericinizin adı (məsələn azeronline.com)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "İXM telefon nömrəsi"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5110,41 +5505,6 @@ msgstr "Provayder DNS-i 1 (arzuya görə)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provayder DNS-i 2 (arzuya görə)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Yığma modu"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Bağlantı sürəti"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Bağlantı vaxt dolması (saniyə sonra)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kart IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kart mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kart GÇ"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kart IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5307,16 +5667,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domen adı"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Birinci DNS Vericisi (arzuya görə)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "İkinci DNS Vericisi (arzuya görə)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5619,11 +5969,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS vericisi ünvanı 1.2.3.4 şəklində olmalıdır"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Şəbəkə keçişi ünvanı 1.2.3.4 şəklində olmalıdır"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6068,16 +6413,6 @@ msgstr ""
 #~ "\n"
 #~ "Yerli Şəbəkə adapterinizi qurmaq üzərəyəm?"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Sisteminizdə şəbəkə kartı tapıla bilməyib.Avadanlığı quran vasitəni işə "
-#~ "salın."
-
-#~ msgid "Connection type: "
-#~ msgstr "Bağlantı növü:"
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s onsuzda istifadədədir\n"
 
@@ -6235,9 +6570,6 @@ msgstr ""
 #~ msgid "IPsec policy"
 #~ msgstr "IPsec siyasəti"
 
-#~ msgid "none"
-#~ msgstr "heç biri"
-
 #~ msgid "Source/destination"
 #~ msgstr "Mənbə/Hədəf"
 
@@ -6252,184 +6584,12 @@ msgstr ""
 #~ "Dəyişikliklərin fəal olması üçün hesabdan çıxış edib, yenidən "
 #~ "girməlisiniz."
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Xidmət _növü:"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Atəş divarı quruluşu tapıldı!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Həqiqətən də bu oyundan çıxmaq istəyirsiniz?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Təfsilatsız"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Gedişat: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Şəbəkə ara üzü: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Çatma şəkli: %s\n"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Kompüterin IP ünvanı:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "%s qovşaq adı verilir: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Xidmət _növü:"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Qapı: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Nəzərə alma"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Atəş divarı quruluşu tapıldı!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Kabelsiz bağlantı"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Qurğuları sınamaq istəyirsiniz?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Bu şifrəni yadında saxla"
-
-#~ msgid "Gateway:"
-#~ msgstr "Şəbəkə Keçidi:"
-
-#~ msgid "Interface:"
-#~ msgstr "Ara üz:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Bağlantıları idarə et"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS quraşdırılması"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS vericiləri"
-
-#~ msgid "Search Domain"
-#~ msgstr "Axtarış Sahəsi"
-
-#~ msgid "static"
-#~ msgstr "statik"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Açılışda başlat"
-
-#~ msgid "Flow control"
-#~ msgstr "Flow idarəsi"
-
-#~ msgid "Line termination"
-#~ msgstr "Sətir sonlandırılması"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Modem vaxt dolması"
-
-#~ msgid "Use lock file"
-#~ msgstr "Qıfıl faylını işlət"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Zəng vurmadan əvvəl ton səsini gözləyin"
-
-#~ msgid "Busy wait"
-#~ msgstr "Məşğul gözləməsi"
-
-#~ msgid "Modem sound"
-#~ msgstr "Modem səsi"
-
-#~ msgid "Vendor"
-#~ msgstr "E'malatçı"
-
-#~ msgid "Media class"
-#~ msgstr "Mediya sinifi"
-
-#~ msgid "Module name"
-#~ msgstr "Modul adı"
-
-#~ msgid "Mac Address"
-#~ msgstr "Mac Ünvanı"
-
-#~ msgid "Bus"
-#~ msgstr "Yol"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Yol üstündə mövqe"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Şəbəkə ara üzünü sil"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Şəbəkənin yenidən başladılması sırasında xəta oldu: \n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Təbriklər, \"%s\" şəbəkə ara üzü müvəffəqiyyətlə silindi"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Bağlantını Kəs..."
 
 #~ msgid "Connect..."
 #~ msgstr "Bağlan..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "İnternet bağlantısının quraşdırılması"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Qovşaq adı (arzuya görə)"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Birinci DNS Vericisi (arzuya görə)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "İnternet Bağlantısı Quraşdırılması"
-
-#~ msgid "Internet access"
-#~ msgstr "İnternet yetişməsi"
-
-#~ msgid "Status:"
-#~ msgstr "Vəziyyət:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametrlər"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Təfsilatsız"
diff --git a/po/be.po b/po/be.po
index 4b484fb..3746965 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2000-09-24 12:30 +0100\n"
 "Last-Translator: Alexander Bokovoy <ab@avilink.net>\n"
 "Language-Team: be\n"
@@ -25,14 +25,16 @@ msgid "Interface"
 msgstr "Інтэрфэйс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP адрас"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Пратакол"
@@ -68,23 +70,27 @@ msgid "Configure Local Area Network..."
 msgstr "Настройка сеткі"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Дапамога"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Применить"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Адмена"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ок"
@@ -94,7 +100,8 @@ msgstr "Ок"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -103,7 +110,7 @@ msgstr "Ок"
 msgid "Please wait"
 msgstr "Калі ласка, пачакайце"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, fuzzy, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Праверка параметраў настройкі"
@@ -137,6 +144,7 @@ msgstr ""
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Маска сеткі"
@@ -152,6 +160,7 @@ msgid "Started on boot"
 msgstr ""
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr ""
@@ -164,17 +173,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Пазначце сеткавы інтэрфейс"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr ""
@@ -227,12 +238,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Выключыць"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Уключыць"
@@ -247,8 +258,8 @@ msgstr "Настроіць панэль"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Прылада"
@@ -316,7 +327,11 @@ msgstr ""
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -600,13 +615,14 @@ msgstr "Дадаць карыстальніка"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Знойдзена сістэма сеткавай бяспекі (firewall)!"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Немагчыма адчыніць файл %s\n"
@@ -616,12 +632,12 @@ msgstr "Немагчыма адчыніць файл %s\n"
 msgid "Log"
 msgstr "Рэгістрацыя"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Усё"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, fuzzy, c-format
 msgid "Block"
 msgstr "Заблякавана"
@@ -648,12 +664,12 @@ msgstr "Дрэнны файл рэзервовай копіі"
 msgid "Clear logs"
 msgstr "Ачысціць усё"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -801,7 +817,7 @@ msgstr "Рэжым"
 msgid "Enabled"
 msgstr "Уключыць"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Апісанне"
@@ -843,9 +859,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Увага!"
@@ -2303,12 +2319,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Далучаны"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Адлучаны"
@@ -2373,7 +2389,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "абмежаванне"
@@ -2413,19 +2429,22 @@ msgstr "Рэжым прайгравання"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Аўтэнтыфікацыя"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Імя для ўваходу (імя карыстальніку)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Пароль для ўваходу"
@@ -2548,13 +2567,15 @@ msgstr ""
 "Кожны пункт павінен быць запоўнены як IP адрас ў дзесяткова-кропкавай \n"
 "натацыі (напрыклад, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Шлюз"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "IP сэервера SMB"
@@ -2580,21 +2601,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Настройка далучэння да Інтэрнэту"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "Імя машыны"
@@ -2605,11 +2630,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP адрас павінен быць у фармаце 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "IP адрас павінен быць у фармаце 1.2.3.4"
@@ -2628,6 +2655,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2649,6 +2677,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Сетка"
@@ -2717,27 +2746,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "на аснове скрыпту"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "на аснове тэрміналу"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, fuzzy, c-format
 msgid "PAP/CHAP"
 msgstr "CHAP"
@@ -3896,90 +3930,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Канфігурацыя"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Рэжым злучэння"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Мэнэджэр файлаў"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Прайгравальнік дыскаў"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Цыклічна"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Падпарадкаваны"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Аўтаматычна"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Пароль"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Імя для ўваходу (імя карыстальніку)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3987,12 +4024,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Пароль"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4011,12 +4048,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Сэртыфікат"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4025,32 +4062,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Сетка"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, fuzzy, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Бітрэйт: %d kb/s"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4064,17 +4106,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Аўтэнтыфікацыя"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4085,12 +4129,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4102,12 +4147,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4125,107 +4171,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Пратакол"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Аўтаматычнае вызначэнне"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Рэжым"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4233,12 +4279,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4247,12 +4293,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Сэртыфікат"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4262,12 +4308,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4277,12 +4323,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4300,50 +4346,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4485,6 +4531,280 @@ msgstr "Далучэньне"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Ні водны ethernet сеткавы адаптар у вашай сістэме не вызначаны. Калі ласка, "
+"скарыстайце канфігурацыйны інструмэнт."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Пазначце сеткавы інтэрфейс"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Пазначце сеткавы інтэрфейс"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Размеркаванне"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Прылада:"
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Канфігурацыя"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "CDDB сервакі"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS Domain"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "няма"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Антарктыка"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Аўтаматычны"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Рэжым злучэння"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, fuzzy, c-format
+msgid "Connection speed"
+msgstr "Імя злучэння"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, fuzzy, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Настройка далучэння да Інтэрнэту"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Нумар тэлефону правайдара"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "Кантроль гуку"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Памеры і арыентацыя"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Запісаць гукавы кліп"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Абярыце файл"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Калі ласка, пачакайце"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Запісаць гукавы кліп"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ карты"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Адрасы памяці карты (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO карты"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 карты"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, fuzzy, c-format
+msgid "Vendor"
+msgstr "Рэдактары"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Назва файла"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Адрасная кніга"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Прац."
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "IP адрас павінен быць у фармаце 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Шлюз:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Інтэрфэйс:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Настройка далучэння да Інтэрнэту"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Імя машыны"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, fuzzy, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Канфігурацыя сістэмных сэрвісаў"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Канфігурацыя сістэмных сэрвісаў"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Настройка далучэння да Інтэрнэту"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Інтэрфэйс"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Імя злучэння"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Стан:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Парамэтры"
+
 #: ../lib/network/drakfirewall.pm:14
 #, fuzzy, c-format
 msgid "Web Server"
@@ -4676,11 +4996,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Няма значкі"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Прылада:"
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4903,6 +5218,103 @@ msgstr "Усталяванне сістэмы"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Кіраваньне сэрвісамі"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Знойдзена сістэма сеткавай бяспекі (firewall)!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Вы жадаеце скончыць гульню?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Падрабязнасці"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Укласьці файл(ы)"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Сеткавы інтэрфейс: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Тып: "
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Пратакол: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP адрас"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Адбыўся збой пад час атрыманьня назвы вузла: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Кіраваньне сэрвісамі"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Порт:"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Порт:"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ігнараваць"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Знойдзена сістэма сеткавай бяспекі (firewall)!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Канфігурацыя"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Ці жадаеце пратэсціраваць настройкі?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Запомніць гэты пароль"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4946,18 +5358,6 @@ msgstr "Унутраная ISDN карта"
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5006,11 +5406,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr ""
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5031,11 +5426,6 @@ msgstr "Ваш асабісты тэлефонны нумар"
 msgid "Provider name (ex provider.net)"
 msgstr "Імя правайдару, напрыклад правайдар.net"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Нумар тэлефону правайдара"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5046,41 +5436,6 @@ msgstr "Опцыі прынтэру"
 msgid "Provider DNS 2 (optional)"
 msgstr "Опцыі прынтэру"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Рэжым злучэння"
-
-#: ../lib/network/netconnect.pm:353
-#, fuzzy, c-format
-msgid "Connection speed"
-msgstr "Імя злучэння"
-
-#: ../lib/network/netconnect.pm:354
-#, fuzzy, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Настройка далучэння да Інтэрнэту"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ карты"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Адрасы памяці карты (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO карты"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 карты"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5242,16 +5597,6 @@ msgstr ""
 msgid "Domain name"
 msgstr "Імя дамену"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:652
-#, fuzzy, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Канфігурацыя сістэмных сэрвісаў"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5528,11 +5873,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "IP адрас павінен быць у фармаце 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "IP адрас павінен быць у фармаце 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5939,17 +6279,6 @@ msgstr ""
 #~ msgid "Clone"
 #~ msgstr "Клянаваньне"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Ні водны ethernet сеткавы адаптар у вашай сістэме не вызначаны. Калі "
-#~ "ласка, скарыстайце канфігурацыйны інструмэнт."
-
-#, fuzzy
-#~ msgid "Connection type: "
-#~ msgstr "Імя злучэння"
-
 #, fuzzy
 #~ msgid "%s already in use\n"
 #~ msgstr "%s ужо знойдзены "
@@ -5982,9 +6311,6 @@ msgstr ""
 #~ msgid "Direction"
 #~ msgstr "Накірунак"
 
-#~ msgid "none"
-#~ msgstr "няма"
-
 #~ msgid "Level"
 #~ msgstr "Узровень"
 
@@ -5992,154 +6318,10 @@ msgstr ""
 #~ msgstr "Па дамаўленню"
 
 #, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Кіраваньне сэрвісамі"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Знойдзена сістэма сеткавай бяспекі (firewall)!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Вы жадаеце скончыць гульню?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Падрабязнасці"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Укласьці файл(ы)"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Сеткавы інтэрфейс: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Тып: "
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Пратакол: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP адрас"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Адбыўся збой пад час атрыманьня назвы вузла: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Кіраваньне сэрвісамі"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Порт:"
-
-#~ msgid "Ignore"
-#~ msgstr "Ігнараваць"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Знойдзена сістэма сеткавай бяспекі (firewall)!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Канфігурацыя"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Ці жадаеце пратэсціраваць настройкі?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Запомніць гэты пароль"
-
-#~ msgid "Gateway:"
-#~ msgstr "Шлюз:"
-
-#~ msgid "Interface:"
-#~ msgstr "Інтэрфэйс:"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "Канфігурацыя"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "CDDB сервакі"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS Domain"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "Антарктыка"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "Кантроль гуку"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Памеры і арыентацыя"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Абярыце файл"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Калі ласка, пачакайце"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Запісаць гукавы кліп"
-
-#, fuzzy
-#~ msgid "Vendor"
-#~ msgstr "Рэдактары"
-
-#, fuzzy
-#~ msgid "Module name"
-#~ msgstr "Назва файла"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "Адрасная кніга"
-
-#~ msgid "Bus"
-#~ msgstr "Прац."
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Пазначце сеткавы інтэрфейс"
-
-#, fuzzy
 #~ msgid "Connect..."
 #~ msgstr "Настройка IDE"
 
 #, fuzzy
-#~ msgid "Internet connection configuration"
-#~ msgstr "Настройка далучэння да Інтэрнэту"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Імя машыны"
-
-#, fuzzy
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Настройка далучэння да Інтэрнэту"
-
-#~ msgid "Status:"
-#~ msgstr "Стан:"
-
-#~ msgid "Parameters"
-#~ msgstr "Парамэтры"
-
-#, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Падрабязнасці"
 
diff --git a/po/bg.po b/po/bg.po
index 17b83c8..0f0cc7b 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-bg\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-03-19 00:24+0200\n"
 "Last-Translator: Kolio Kolev <kolio_kolev@biotronica.net>\n"
 "Language-Team: Mageia User Group - Bulgaria <mandriva-bg@googlegroups.com>\n"
@@ -32,14 +32,16 @@ msgid "Interface"
 msgstr "Интерфейс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP адрес"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
@@ -75,23 +77,27 @@ msgid "Configure Local Area Network..."
 msgstr "Настойка на локална мрежа ..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Помощ"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Приложи"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Отказ"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Да"
@@ -101,7 +107,8 @@ msgstr "Да"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -110,7 +117,7 @@ msgstr "Да"
 msgid "Please wait"
 msgstr "Моля изчакайте"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Моля, почакайте ... Прилагане на настройките"
@@ -146,6 +153,7 @@ msgstr "Адаптер %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Мрежова маска"
@@ -161,6 +169,7 @@ msgid "Started on boot"
 msgstr ""
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP клиент"
@@ -175,17 +184,19 @@ msgstr ""
 "Създайте такава, като цъкнете на 'Настрой'"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Настройване на мрежов интерфейс (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Няма IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Няма мрежова маска"
@@ -255,12 +266,12 @@ msgstr ""
 "\n"
 "Какво искате да направите ?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Изключване"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Включване"
@@ -275,8 +286,8 @@ msgstr "Преконфигуриране"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Моля, изберете мрежов интефейс, който е директно свързан с интернет."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Мрежово у-во"
@@ -343,7 +354,11 @@ msgstr "Вътрешно име на домейн"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -635,13 +650,14 @@ msgstr "Позволени адреси"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Интерактивна Защитна стена"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Невъзможна е връзка с услуга"
@@ -651,12 +667,12 @@ msgstr "Невъзможна е връзка с услуга"
 msgid "Log"
 msgstr "Журнал"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Позволи"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Блокирай"
@@ -683,12 +699,12 @@ msgstr "Блокирани услуги"
 msgid "Clear logs"
 msgstr "Изчистване на журнала"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Blacklist"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Whitelist"
@@ -836,7 +852,7 @@ msgstr "Режим"
 msgid "Enabled"
 msgstr "Включване"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Описание"
@@ -878,9 +894,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Предупреждение"
@@ -2348,12 +2364,12 @@ msgstr ""
 "Внимание, друга връзка за Интернет беше открита, може би ползваща вашата "
 "мрежа"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Свързана"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Не е свързана"
@@ -2418,7 +2434,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Метрика"
@@ -2458,19 +2474,22 @@ msgstr "Кабелен модем"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Идентификация"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Име на акаунта (потебителско име)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Парола на акаунта"
@@ -2595,13 +2614,15 @@ msgstr ""
 "Всяко поле трябва да бъде въведено като IP адрес\n"
 "с точково-десетична нотация (например, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Шлюз"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Получи DNS сървърите от DHCP"
@@ -2628,21 +2649,25 @@ msgstr ""
 "По подразбиране, домейнът за търсене ще бъде извлечен от пълното хост име"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP таймоут (в секунди)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Получи YP сървъри от DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Получи NTPD сървъри от DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Име на DHCP сървър"
@@ -2653,11 +2678,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP адресът трябва да бъде във формат 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Мрежовата маска трябва да е във формат 255.255.224.0"
@@ -2676,6 +2703,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Получаване на хост име от DHCP"
@@ -2697,6 +2725,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Конфигуриране при включване (Hotplug)"
@@ -2765,27 +2794,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Аналогов телефонен модем (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Базирана на скрипт"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Базирана на терминал"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3944,12 +3978,12 @@ msgstr "WPA/WPA2 Pre-Shared Key"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows драйвер"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -3958,78 +3992,81 @@ msgstr ""
 "Вашата безжична карата е изключена, моля, включете първо безжичната карта "
 "(от бутона за превключване)"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Настроийка на безжична връзка"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Работен режим"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Управляем"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Главен"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Повторител"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Вторичен"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Автоматично"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Мрежово име (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Криптиращ протокол"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Криптиращ ключ"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Парола"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP вход/потребител"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4037,12 +4074,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP парола"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4061,12 +4098,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4075,32 +4112,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Мрежа"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4114,17 +4156,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Игрална станция"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4135,12 +4179,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4152,12 +4197,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4175,107 +4221,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Протокол"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Автоматично засичане"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Режим"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4283,12 +4329,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4297,12 +4343,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4312,12 +4358,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4327,12 +4373,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4350,50 +4396,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4535,6 +4581,289 @@ msgstr "Свързване"
 msgid "Hostname changed to \"%s\""
 msgstr "Хост името беше променено на \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"В системата не е открит ethernet мрежов адаптер. Моля, стартирайте "
+"инструмента за настройка на хардуер."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Изберете мрежов интерфейс"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Изберете мрежов интерфейс:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Изникна проблем при рестартирането на мрежата:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"Поздравления, мрежовата и интернет настройката е завършена.\n"
+"\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Настройка на връзките"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Устройство: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS конфигурация"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS сървър"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS домейн"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "няма"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Автоматичен IP адрес"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Изпълнение при стартиране"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Режим на набиране"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Скорост на връзката"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Timeout на връзката (в сек)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Телефонен номер на доставчика"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Контрол на трансфера"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Интернет станция"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Шел време за достъп"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Изберете файл"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Кувейт"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Модем"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ на картата"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Памет (DMA) на картата"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO на картата"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 на картата"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Протокол Европа (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Протокол за останалия свят\n"
+" без D-Канал (наета линия)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Производител"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Клас носител"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Име на модул"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Broadcast адрес:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Шина"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway адреса трябва да бъде във формат 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Интерфейс:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Настройка на Интернет връзка"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Нямате Internet връзка.\n"
+"Създайте такава, като цъкнете на 'Настрой'"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Първи DNS сървър (по избор)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Първи DNS сървър (по избор)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Втори DNS сървър (по избор)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Първи DNS сървър (по избор)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Настройка на Интернет връзка"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Интернет достъп"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Тип на връзката: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Състояние:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Изпробване на връзката ..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Параметри"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4736,11 +5065,6 @@ msgstr "Интерактивна Защитна стена"
 msgid "No device found"
 msgstr "Не беше открито устройство"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Устройство: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4969,6 +5293,103 @@ msgstr "Инсталиране на нов драйвер"
 msgid "Select a device:"
 msgstr "Изберете устройство:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "_Тип услуга:"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Открита е настройка на Защитна Стена !"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Искате ли да завършите играта?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Без подробности"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Действие:%s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Мрежов интерфейс: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "тип: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Протокол: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Статичен IP адрес"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Установявам име на хост %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "_Тип услуга:"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Игнориране"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Открита е настройка на Защитна Стена !"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Безжична връзка"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Искате ли да тествате настройките?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Запомня тази парола"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5014,20 +5435,6 @@ msgstr "Вътрешна ISDN карта"
 msgid "Protocol for the rest of the world"
 msgstr "Протокол за останалия свят"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Протокол Европа (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Протокол за останалия свят\n"
-" без D-Канал (наета линия)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5078,11 +5485,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Контрол над връзката"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Изпробване на връзката ..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5103,11 +5505,6 @@ msgstr "Личния ви телефонен номер"
 msgid "Provider name (ex provider.net)"
 msgstr "Име на доставчика (напр. provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Телефонен номер на доставчика"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5118,41 +5515,6 @@ msgstr "1-ви DNS на доставчика (по желание)"
 msgid "Provider DNS 2 (optional)"
 msgstr "2-ри DNS на доставчика (по желание)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Режим на набиране"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Скорост на връзката"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Timeout на връзката (в сек)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ на картата"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Памет (DMA) на картата"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO на картата"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 на картата"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5315,16 +5677,6 @@ msgstr "Домейн"
 msgid "Domain name"
 msgstr "Име на домейна"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Първи DNS сървър (по избор)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Втори DNS сървър (по избор)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5629,11 +5981,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS сървъра трябва да бъде във формат 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway адреса трябва да бъде във формат 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6089,16 +6436,6 @@ msgstr ""
 #~ "\n"
 #~ "Смятам да установя локалната ви мрежа на този адаптер."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "В системата не е открит ethernet мрежов адаптер. Моля, стартирайте "
-#~ "инструмента за настройка на хардуер."
-
-#~ msgid "Connection type: "
-#~ msgstr "Тип на връзката: "
-
 #~ msgid "disable"
 #~ msgstr "изключи"
 
@@ -6155,193 +6492,18 @@ msgstr ""
 #~ msgid "Direction"
 #~ msgstr "Посока"
 
-#~ msgid "none"
-#~ msgstr "няма"
-
 #~ msgid "Level"
 #~ msgstr "Ниво"
 
 #~ msgid "default"
 #~ msgstr "по подрабиране"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "_Тип услуга:"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Открита е настройка на Защитна Стена !"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Искате ли да завършите играта?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Без подробности"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Действие:%s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Мрежов интерфейс: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "тип: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Протокол: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Статичен IP адрес"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Установявам име на хост %s: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "_Тип услуга:"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Порт: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Игнориране"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Открита е настройка на Защитна Стена !"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Безжична връзка"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Искате ли да тествате настройките?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Запомня тази парола"
-
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Интерфейс:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Настройка на връзките"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS конфигурация"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS сървър"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS домейн"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "Автоматичен IP адрес"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Изпълнение при стартиране"
-
-#~ msgid "Flow control"
-#~ msgstr "Контрол на трансфера"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Интернет станция"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Шел време за достъп"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Изберете файл"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Кувейт"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Модем"
-
-#~ msgid "Vendor"
-#~ msgstr "Производител"
-
-#~ msgid "Media class"
-#~ msgstr "Клас носител"
-
-#~ msgid "Module name"
-#~ msgstr "Име на модул"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "Broadcast адрес:"
-
-#~ msgid "Bus"
-#~ msgstr "Шина"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Изберете мрежов интерфейс"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Изникна проблем при рестартирането на мрежата:\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Отвързване ..."
 
 #~ msgid "Connect..."
 #~ msgstr "Свързване ..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Настройка на Интернет връзка"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Първи DNS сървър (по избор)"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Първи DNS сървър (по избор)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Настройка на Интернет връзка"
-
-#~ msgid "Internet access"
-#~ msgstr "Интернет достъп"
-
-#~ msgid "Status:"
-#~ msgstr "Състояние:"
-
-#~ msgid "Parameters"
-#~ msgstr "Параметри"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Без подробности"
diff --git a/po/bn.po b/po/bn.po
index 42aed2a..eb92de9 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -28,14 +28,16 @@ msgid "Interface"
 msgstr "ইন্টারফেস"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP ঠিকানাসমূহ"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "প্রটোকল"
@@ -71,23 +73,27 @@ msgid "Configure Local Area Network..."
 msgstr "স্থানীয় নেটওয়ার্ক কনফিগার করো..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "সাহায্য"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "প্রয়োগ"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "বাতিল"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "ঠিক আছে"
@@ -97,7 +103,8 @@ msgstr "ঠিক আছে"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -106,7 +113,7 @@ msgstr "ঠিক আছে"
 msgid "Please wait"
 msgstr "অনুগ্রহ করে অপেক্ষা করুন"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "অনুগ্রহ করে অপেক্ষা করুন.... কনফিগারেশন প্রস্তাব করা হচ্ছে"
@@ -142,6 +149,7 @@ msgstr "অ্যাডাপ্টার %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "নেটমাস্ক"
@@ -157,6 +165,7 @@ msgid "Started on boot"
 msgstr "বুট হওয়ার সময় সচল হয়"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP ক্লায়েন্ট"
@@ -171,17 +180,19 @@ msgstr ""
 "ম্যান্ড্রিব লিনাক্স নিয়ন্ত্রক কেন্দ্র থেকে সহকারী \"ইন্টারফেস যুক্ত করো\" চালান"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "নতুন নেটওয়ার্ক ইন্টারফেস সেট আপ করুন (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "কোন আই.পি. নেই"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "কোন মাস্ক (Mask) নেই"
@@ -251,12 +262,12 @@ msgstr ""
 "\n"
 "আপনি এখন কি করতে চান?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "নিষ্ক্রিয়"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "সক্রিয়"
@@ -271,8 +282,8 @@ msgstr "পুনরায়-কনফিগার "
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "নেট ডিভাইস"
@@ -341,7 +352,11 @@ msgstr "অন্তঃস্থ ডোমেইন নাম"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -633,13 +648,14 @@ msgstr "সব ব্যবহারকারীদের গ্রহণ কর
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "ফায়ারওয়াল"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "%s মিররের সাথে সংযুক্ত হওয়া গেলনা"
@@ -649,12 +665,12 @@ msgstr "%s মিররের সাথে সংযুক্ত হওয়া �
 msgid "Log"
 msgstr "লগ"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "সকল"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -681,12 +697,12 @@ msgstr "ব্যবহারকারীর ফাইলের ব্যাক-
 msgid "Clear logs"
 msgstr "সব বন্ধ করো"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -835,7 +851,7 @@ msgstr "মোড"
 msgid "Enabled"
 msgstr "সক্রিয়"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "বর্ণনা"
@@ -878,9 +894,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "নোটিশ"
@@ -2352,12 +2368,12 @@ msgid ""
 msgstr ""
 "ঘোষনা, আরেকটি ইন্টারনেট সংযোগ সনাক্ত হয়েছে, হয়তোবা আপনার নেটওয়ার্ক ব্যবহার করছে"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "সংযুক্ত"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "সংযোগহীন"
@@ -2423,7 +2439,7 @@ msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
 # সাম: পরিমাপক বা মেট্রিক (as in metric system)
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "মেট্রিক"
@@ -2464,19 +2480,22 @@ msgstr "কার্ড মডেল:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin ব্যবহার করুন (Telstra এর জন্য প্রয়োজন)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "অনুমোদন"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "একাউন্ট লগইন (ইউজারনেম)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "একাউন্ট পাসওয়ার্ড"
@@ -2601,13 +2620,15 @@ msgstr ""
 "প্রত্যেক আইটেম একটি আই-পি অ্যাড্রেস হিসেবে dotted-decimal নোটেশনে দিতে \n"
 "হবে (উদাহরণস্বরুপ, 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "গেটওয়ে"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DHCP থেকে DNS সার্ভারগুলো দেখাও  "
@@ -2634,23 +2655,27 @@ msgstr "ডিফল্টভাবে ডোমেইন সন্ধান য
 
 # sam
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP টাইমআউট (সেকেন্ডে)"
 
 # সাম
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "DHCP থেকে YP সার্ভারগুলো দেখাও  "
 
 # সাম
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "DHCP থেকে NTPD সার্ভারগুলো দেখাও  "
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP হোস্টের নাম"
@@ -2661,12 +2686,14 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP ঠিকানা 1.2.3.4-এর মত হতে হবে"
 
 # সাম
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "নেটমাস্ক 255.255.224.0 এই ফরম্যাটে হতে হবে"
@@ -2685,6 +2712,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "DHCP ঠিকানা থেকে পাওয়া হোস্টের নাম"
@@ -2706,6 +2734,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "নেটওয়ার্ক Hotplugging"
@@ -2774,27 +2803,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "স্ক্রিপ্ট-ভিত্তিক"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "টার্মিনাল-ভিত্তিক"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3954,90 +3988,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "ওয়্যারলেস সংযোগ"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "কার্যকারিতার ধরন"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Echo request (ping)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "ব্যবস্থা হয়েছে"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "মাষ্টার"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "রিপিটার"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "মাধ্যমিক"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "সয়ংক্রিয়"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "নেটওয়ার্কের নাম (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "এনক্রিপশন কী"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "পাসওয়ার্ড"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "একাউন্ট লগইন (ইউজারনেম)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4045,12 +4082,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "পাসওয়ার্ড"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4069,12 +4106,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "সার্টফাইলের নাম"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4083,34 +4120,39 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "নেটওয়ার্ক ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "কার্যকারিতার ফ্রিকুয়েন্সি"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "প্রতিক্রিয়াশীল থ্রেশল্ড"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "বিটরেট (b/s-এ)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
 # sam=
 # parameter has been translated as প্যারামিটার
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4134,17 +4176,19 @@ msgstr ""
 "হয়ে যায়। আপনি এই প্যারামিটারটি স্বয়ংক্রিয়, নির্ধারিত, বা বন্ধও সেট\n"
 "করতে পারেন।"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "ফ্রাগমেন্টেশন"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Iwকন্‌ফিগ কমান্ড অতিরিক্ত আর্গুমেন্ট"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4161,12 +4205,13 @@ msgstr ""
 
 #  -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Iwস্পাই কমান্ড অতিরিক্ত আর্গুমেন্ট"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, fuzzy, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4181,12 +4226,13 @@ msgstr ""
 "তালিকা সেট করা এবং তার প্রতিটির সংযোগ এর মান সংক্রান্ত তথ্য পড়ার জন্য।\n"
 "\n"
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv কমান্ড অতিরিক্ত আর্গুমেন্ট"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4204,28 +4250,28 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "প্রটোকল"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "সয়ং-সনাক্ত"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4233,79 +4279,79 @@ msgid ""
 msgstr ""
 
 # ##বাতিল
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "মোড"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4313,12 +4359,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4327,12 +4373,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "সার্টিফিকেটের ধরণ"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4342,12 +4388,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4357,12 +4403,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4380,26 +4426,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4408,7 +4454,7 @@ msgstr ""
 "ফ্রিকোয়েন্সির শেষে k, M বা G থাকতে হবে (উদাহরণস্বরুপ,২.৪৬ গিগাহার্জ ফ্রিকোয়েন্সীর "
 "জন্য \"2.46G\"),অথবা অনেকগুলো '0' (শূণ্য) যোগ করুন।"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4417,17 +4463,17 @@ msgstr ""
 "ফ্রিকোয়েন্সির শেষে k, M বা G থাকতে হবে (উদাহরণস্বরুপ,১১M এর জন্য \"11M\"),অথবা "
 "অনেকগুলো '0' (শূণ্য) যোগ করুন।"
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4574,6 +4620,287 @@ msgstr "সংযোগ স্থাপন করো"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"আপনার কম্পিউটারে কোন ইথারনেট নেটওয়ার্ক অ্যাডাপ্টার সনাক্ত করা যায় নি।  অনুগ্রহপূর্বক "
+"হার্ডওয়ার কনফিগারেশন সফটওয়ারটি চালান।"
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "নেটওয়ার্ক ইন্টারফেস অপসারণ করো"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "কনফিগার করার জন্য নেটওয়ার্কের ইন্টারফেস পছন্দ করুন:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"\"%s\" নেটওয়ার্ক ইন্টারফেস অপসারণের সময় সমস্যা হয়েছে:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "অভিনন্দন, \"%s\" নেটওয়ার্ক ইন্টারফেসটি সফলভাবে অপসারণ করা গিয়েছে"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "সংযোগ ব্যবস্থাপনা"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "ডিভাইস:"
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "আই.পি. কনফিগারেশন"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "ডি.এন.এস. সার্ভার"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "অনুসন্ধান ক্ষেত্র (Domain)"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "না"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "স্থির"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "ডি.এইচ.সি.পি."
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "বুটের সময় চালু হবে"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "ডায়েলের ধরণ"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "সংযোগের গতি"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "সংযোগের টাইমআউট (সেকেন্ডে)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "পরিবেশকের ফোন নম্বর"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "ফ্লো কনট্রোল"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "লাইন টার্মিনেশন"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "মডেম টাইম-আউট"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "লক (Lock) ফাইল ব্যবহার করো"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "ডায়াল করার পূর্বে ডায়াল টোনের জন্য অপেক্ষা করো"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "ব্যস্ততার অপেক্ষা"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "মডেমের শব্দ"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "কার্ডের IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "কার্ড মেম (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "কার্ডের IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "কার্ডের IO_০"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "ইউরোপীয় প্রটোকল (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"বাকী বিশ্বের জন্য প্রটকোল\n"
+"কোন D-Channel ছাড়াই (ভাড়া নেয়া লাইনসমূহ)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "পরিবেশক"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "মিডিয়া শ্রেণী"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "মডিউলের নাম"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "ম্যাক (Mac) ঠিকানা"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "বাস"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "বাস-এ অবস্থান"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "গেটওয়ে ঠিকানা 1.2.3.4-এর মত হতে হবে"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "গেটওয়ে:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "ইন্টারফেস:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "ইন্টারনেট সংযোগ কনফিগারেশন"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"আপনার সিস্টেমে কোন ইন্টারনেট সংযোগ কনফিগার করা নেই।\n"
+"অনুগ্রহপূর্বক Mageia নিয়ন্ত্রণকেন্দ্র থেকে \"%s\" চালান।"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "হোস্টের নাম (ঐচ্ছিক)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "প্রথম DNS সার্ভার (ঐচ্ছিক)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "দ্বিতীয় DNS সার্ভার (ঐচ্ছিক)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "তৃতীয় DNS সার্ভার (ঐচ্ছিক)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "ইন্টারনেট সংযোগ কনফিগারেশন"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "ইন্টারনেট ব্যবহার"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "সংযোগের ধরন: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "অবস্থা:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "আপনার কানেকশন পরীক্ষা করা হচ্ছে..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "প্যারামিটার"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4778,11 +5105,6 @@ msgstr ""
 msgid "No device found"
 msgstr "কোন ডিভাইস পাওয়া যায় নি"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "ডিভাইস:"
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5013,6 +5335,107 @@ msgstr "একটি নতুন ড্রাইভার ইনস্টল �
 msgid "Select a device:"
 msgstr ""
 
+# সাম
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "আক্রান্ত সার্ভিস: %s"
+
+# সাম: not sure
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "সক্রিয় ফায়ারওয়াল: অনধিকার প্রবেশ সনাক্ত হয়েছে!"
+
+# সাম
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "আপনি কি আক্রমনকারীকে কালো তালিকাভুক্ত করতে চান?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "আক্রমনের বিস্তারিত"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "আক্রমনের সময়: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "নেটওয়ার্ক ইন্টারফেস: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "আক্রমনের ধরণ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "প্রোটোকল: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "আক্রমনকারীর IP অ্যাড্রেস: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "আক্রমনকারীর হোস্টনেম: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "আক্রান্ত সার্ভিস: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "আক্রান্ত পোর্ট: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "ICMP আক্রমনের ধরণ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "সবসময় কালো তালিকাভুক্ত করো (আর কখনো প্রশ্ন করবে না)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "অগ্রাহ্য"
+
+# সাম: not sure
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "সক্রিয় ফায়ারওয়াল: অনধিকার প্রবেশ সনাক্ত হয়েছে!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "ওয়্যারলেস সংযোগ"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "আপনি কি এক্ষুনি কনফিগার করতে চান?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "এই পাসওয়ার্ডটি মনে রাখবে"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5056,20 +5479,6 @@ msgstr "ইন্টার্নাল ISDN কার্ড"
 msgid "Protocol for the rest of the world"
 msgstr "বাকী বিশ্বের জন্য প্রটোকল"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "ইউরোপীয় প্রটোকল (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"বাকী বিশ্বের জন্য প্রটকোল\n"
-"কোন D-Channel ছাড়াই (ভাড়া নেয়া লাইনসমূহ)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5118,11 +5527,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "আপনার কানেকশন পরীক্ষা করা হচ্ছে..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5143,11 +5547,6 @@ msgstr "আপনার ব্যক্তিগত ফোন নম্বর"
 msgid "Provider name (ex provider.net)"
 msgstr "পরিবেশকের নাম (যেমন provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "পরিবেশকের ফোন নম্বর"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5158,41 +5557,6 @@ msgstr "পরিবেশকের DNS ১ (ঐচ্ছিক)"
 msgid "Provider DNS 2 (optional)"
 msgstr "পরিবেশকের DNS ২ (ঐচ্ছিক)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "ডায়েলের ধরণ"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "সংযোগের গতি"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "সংযোগের টাইমআউট (সেকেন্ডে)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "কার্ডের IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "কার্ড মেম (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "কার্ডের IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "কার্ডের IO_০"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5358,16 +5722,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "ডোমেইন নেম"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "প্রথম DNS সার্ভার (ঐচ্ছিক)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "দ্বিতীয় DNS সার্ভার (ঐচ্ছিক)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5679,11 +6033,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS সার্ভারের ঠিকানা 1.2.3.4-এর মত হতে হবে"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "গেটওয়ে ঠিকানা 1.2.3.4-এর মত হতে হবে"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6133,16 +6482,6 @@ msgstr ""
 #~ "\n"
 #~ "আমি আপনার স্থানীয় এরিয়ার নেটওয়ার্ক সেই এডাপ্টরের সাথে করতে যাচ্ছি।"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "আপনার কম্পিউটারে কোন ইথারনেট নেটওয়ার্ক অ্যাডাপ্টার সনাক্ত করা যায় নি।  "
-#~ "অনুগ্রহপূর্বক হার্ডওয়ার কনফিগারেশন সফটওয়ারটি চালান।"
-
-#~ msgid "Connection type: "
-#~ msgstr "সংযোগের ধরন: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s ইতিমধ্যেই ব্যবহৃত হচ্ছে\n"
 
@@ -7054,9 +7393,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "অপ্রোজনীয়"
 
-#~ msgid "none"
-#~ msgstr "না"
-
 #~ msgid "tunnel"
 #~ msgstr "টানেল"
 
@@ -7085,184 +7421,12 @@ msgstr ""
 #~ msgstr ""
 #~ "পরিবর্তন কার্যকর করার পূর্বে আপনাকে লগ-আউট করে তারপর পুণরায় লগ-ইন করতে হবে"
 
-# সাম
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "আক্রান্ত সার্ভিস: %s"
-
-# সাম: not sure
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "সক্রিয় ফায়ারওয়াল: অনধিকার প্রবেশ সনাক্ত হয়েছে!"
-
-# সাম
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "আপনি কি আক্রমনকারীকে কালো তালিকাভুক্ত করতে চান?"
-
-#~ msgid "Attack details"
-#~ msgstr "আক্রমনের বিস্তারিত"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "আক্রমনের সময়: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "নেটওয়ার্ক ইন্টারফেস: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "আক্রমনের ধরণ: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "প্রোটোকল: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "আক্রমনকারীর IP অ্যাড্রেস: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "আক্রমনকারীর হোস্টনেম: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "আক্রান্ত সার্ভিস: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "আক্রান্ত পোর্ট: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "ICMP আক্রমনের ধরণ: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "সবসময় কালো তালিকাভুক্ত করো (আর কখনো প্রশ্ন করবে না)"
-
-#~ msgid "Ignore"
-#~ msgstr "অগ্রাহ্য"
-
-# সাম: not sure
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "সক্রিয় ফায়ারওয়াল: অনধিকার প্রবেশ সনাক্ত হয়েছে!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "ওয়্যারলেস সংযোগ"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "আপনি কি এক্ষুনি কনফিগার করতে চান?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "এই পাসওয়ার্ডটি মনে রাখবে"
-
-#~ msgid "Gateway:"
-#~ msgstr "গেটওয়ে:"
-
-#~ msgid "Interface:"
-#~ msgstr "ইন্টারফেস:"
-
-#~ msgid "Manage connections"
-#~ msgstr "সংযোগ ব্যবস্থাপনা"
-
-#~ msgid "IP configuration"
-#~ msgstr "আই.পি. কনফিগারেশন"
-
-#~ msgid "DNS servers"
-#~ msgstr "ডি.এন.এস. সার্ভার"
-
-#~ msgid "Search Domain"
-#~ msgstr "অনুসন্ধান ক্ষেত্র (Domain)"
-
-#~ msgid "static"
-#~ msgstr "স্থির"
-
-#~ msgid "DHCP"
-#~ msgstr "ডি.এইচ.সি.পি."
-
-#~ msgid "Start at boot"
-#~ msgstr "বুটের সময় চালু হবে"
-
-#~ msgid "Flow control"
-#~ msgstr "ফ্লো কনট্রোল"
-
-#~ msgid "Line termination"
-#~ msgstr "লাইন টার্মিনেশন"
-
-#~ msgid "Modem timeout"
-#~ msgstr "মডেম টাইম-আউট"
-
-#~ msgid "Use lock file"
-#~ msgstr "লক (Lock) ফাইল ব্যবহার করো"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "ডায়াল করার পূর্বে ডায়াল টোনের জন্য অপেক্ষা করো"
-
-#~ msgid "Busy wait"
-#~ msgstr "ব্যস্ততার অপেক্ষা"
-
-#~ msgid "Modem sound"
-#~ msgstr "মডেমের শব্দ"
-
-#~ msgid "Vendor"
-#~ msgstr "পরিবেশক"
-
-#~ msgid "Media class"
-#~ msgstr "মিডিয়া শ্রেণী"
-
-#~ msgid "Module name"
-#~ msgstr "মডিউলের নাম"
-
-#~ msgid "Mac Address"
-#~ msgstr "ম্যাক (Mac) ঠিকানা"
-
-#~ msgid "Bus"
-#~ msgstr "বাস"
-
-#~ msgid "Location on the bus"
-#~ msgstr "বাস-এ অবস্থান"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "নেটওয়ার্ক ইন্টারফেস অপসারণ করো"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "\"%s\" নেটওয়ার্ক ইন্টারফেস অপসারণের সময় সমস্যা হয়েছে:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "অভিনন্দন, \"%s\" নেটওয়ার্ক ইন্টারফেসটি সফলভাবে অপসারণ করা গিয়েছে"
-
 #~ msgid "Disconnect..."
 #~ msgstr "সংযোগ বিচ্ছিন্ন করো..."
 
 #~ msgid "Connect..."
 #~ msgstr "সংযোগ স্থাপন করো..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "ইন্টারনেট সংযোগ কনফিগারেশন"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "হোস্টের নাম (ঐচ্ছিক)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "তৃতীয় DNS সার্ভার (ঐচ্ছিক)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "ইন্টারনেট সংযোগ কনফিগারেশন"
-
-#~ msgid "Internet access"
-#~ msgstr "ইন্টারনেট ব্যবহার"
-
-#~ msgid "Status:"
-#~ msgstr "অবস্থা:"
-
-#~ msgid "Parameters"
-#~ msgstr "প্যারামিটার"
-
 # সাম
 #, fuzzy
 #~ msgid "Attacker"
diff --git a/po/br.po b/po/br.po
index 21b451b..b4546df 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-04 08:12+0200\n"
 "Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
 "Language-Team: Brezhoneg <ofisk@wanadoo.fr>\n"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "C'hetal"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Chomlec'h IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Komenad"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "Kefluniañ ar rouedad takad lec'hel ..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Skoazell"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Lakaat"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Nullañ"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Mat eo"
@@ -96,7 +102,8 @@ msgstr "Mat eo"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "Mat eo"
 msgid "Please wait"
 msgstr "Gortozit mar plij"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Gortozit mar plij, o lakaat ar c'hefluniadur"
@@ -139,6 +146,7 @@ msgstr "Kartenn %s : %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Maskl rouedad"
@@ -154,6 +162,7 @@ msgid "Started on boot"
 msgstr "Loc'het pa vez loc'het an urzhiataer"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Kliant DHCP"
@@ -166,17 +175,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Kefluniañ un etrefas rouedad (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IP ebet"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Mask ebet"
@@ -229,12 +240,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Marvaat"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Bevaat"
@@ -250,8 +261,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "Mar plij dibabit an etrefas rouedad a zo kevreet en eeun d'ar genrouedad"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Trobarzhell ar rouedad"
@@ -317,7 +328,11 @@ msgstr "Anv diabarzh an domani"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -603,13 +618,14 @@ msgstr "Chomlec'hioù aotreet"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Moger tan bev"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "N'hellan ket kevreañ ouzh an diaoul"
@@ -619,12 +635,12 @@ msgstr "N'hellan ket kevreañ ouzh an diaoul"
 msgid "Log"
 msgstr "Kerzlevr"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Aotren"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Nac'h"
@@ -651,12 +667,12 @@ msgstr "Servijoù nac'het"
 msgid "Clear logs"
 msgstr "Skarañ ar c'herzlevr"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Roll zu"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Roll wenn"
@@ -804,7 +820,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Bevet"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Deskrivadur"
@@ -846,9 +862,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Ho evezh"
@@ -2310,12 +2326,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Kevreadet"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Kevreadet ebet"
@@ -2380,7 +2396,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrik"
@@ -2420,19 +2436,22 @@ msgstr "Modem fun"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Implij BPALogin (red eo evit Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Dilesadur"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Kont (anv an arveriad)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Tremenger an den"
@@ -2555,13 +2574,15 @@ msgstr ""
 "Pep mellad a zlefe bezañ skrivet evel ur chomlec'h IP e stumm\n"
 "sifroù dekvel pikoù etrezo (da skouer 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Treuzell"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Adtapout ar servijerien DNS eus DHCP"
@@ -2587,21 +2608,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Amzer-hont DHCP (eil)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Adtapout ar servijerien YP eus DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Adtapout ar servijerien NTPD eus DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Anv ostiz DHCP"
@@ -2612,11 +2637,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Er furmad 1.2.3.4 e tlefe bezañ ar chomlec'h IP"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Er furmad 255.255.224.0 e tlefe bezañ ar maskl rouedad"
@@ -2635,6 +2662,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Adtapout an anv ostiz eus ar chomlec'h DHCP"
@@ -2656,6 +2684,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
@@ -2724,27 +2753,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem pellgomz (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Diazezet war ur skrid"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Diazezet war un dermenell"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3903,90 +3937,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Kefluniadur ar rouedad hep neud"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Mod labour"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Meret"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Mestr"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Adkaser"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Eil derez"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Emgefreek"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Anv ar rouedad (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Mod enrinegadur"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Alc'hwez enrinegadur"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Kuzhat an tremenger"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Anv arveriad EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3994,12 +4031,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Tremenger EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4018,12 +4055,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Anv an testeni"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4032,32 +4069,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Niv ar rouedad"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frekañs labour"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Feur (bit/e)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4071,17 +4113,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "arventennoù ouzhpenn an urzhiad iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4092,12 +4136,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "arventennoù ouzhpenn an urzhiad iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4109,12 +4154,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "arventennoù ouzhpenn an urzhiad iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4132,107 +4178,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Komenad EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Dinoiñ dre ardivink"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Mod EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4240,12 +4286,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4254,12 +4300,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Testeni CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4269,12 +4315,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4284,12 +4330,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4307,50 +4353,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Aotreañ ar c'hevreadennoù baleantour"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4492,6 +4538,283 @@ msgstr "Kevreañ"
 msgid "Hostname changed to \"%s\""
 msgstr "Cheñchet e oa an anv ostiz da « %s »"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Lebel un etrefas rouedad"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Dibabit an etrefas rouedad a kefluniañ :"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Degouezhet ez eus ar fazi en ur lemel an etrefas rouedad « %s » :\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Gourc'hemennoù, echu eo kefluniadur ar rouedad."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Meran liammoù"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Trobarzhell : "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Kefluniadur IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Servijerioù DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Domani klask"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "hini ebet"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statik"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Loc'hañ pa vez loc'het an urzhiataer"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Mod an sifrennadur"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Tizh ar gevreadenn"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Amzer-hont a ar gevreadenn (eil)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Niverenn bellgomz ar pourchaser"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Evezhiañ ar red"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Dibenn al linennoù"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Amzer-hont ar modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Implijit ur restr prennañ"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Gortoz e-pad an ton galv goude sifrenn"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Gortoz da vat"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Son ar modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ kartenn"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memor kartenn (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO kartenn"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 kartenn"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Komenad europat (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Komenad ar broioù all\n"
+"N'eus kanol-D ebet (linennoù fermet)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Gwerzher"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Renkad ar vedia"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Anv ar mollad"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Chomlec'h MAC"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Lec'hel war ar bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Er furmad 1.2.3.4 e tlefe bezañ chomlec'h an dreuzell"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Treuzell :"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "C'hetal :"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Kefluniadur ar gevreadenn internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Anv ostiz (diret)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Servijer DNS kentañ (da zilenn)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Eil servijer DNS (da zilenn)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Servijer DNS trede (da zilenn)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Kefluniadur ar gevreadenn ar c'henrouedad"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Digor ar genrouedad"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Seurt ar gevreadenn : "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Stad :"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "O klask da lakaat ho gevradenn ..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Arventennoù"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4683,11 +5006,6 @@ msgstr "Implijit ar moger tan bev"
 msgid "No device found"
 msgstr "N'eo ket trobarzhell ebet"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Trobarzhell : "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4910,6 +5228,103 @@ msgstr "Staliañ ur sturier nevez"
 msgid "Select a device:"
 msgstr "Dibabit un drobarzhell :"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Argad ouzh ur servij"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Moger tan bev : servij nevez"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Petra e fell deoc'h d'ober gant an argader-mañ ?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Munudoù an argad"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Eur an argad : %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Etrefas rouedad: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Seurt an argad : %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Komenad: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Chomlec'h IP an argader : %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Anv ostiz an argader : %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Servij argadet : %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Porzh argadet : %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Seurt an argad ICMP : %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Tremen e-biou"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Moger tan bev : servij nevez"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Kevreadenn hep neud"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Mennout a rit digeriñ ar servij-mañ ?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Enrollañ ar respont-mañ"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4953,20 +5368,6 @@ msgstr "Kartenn ISDN diabarzh"
 msgid "Protocol for the rest of the world"
 msgstr "Komenad evit ar bed-all"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Komenad europat (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Komenad ar broioù all\n"
-"N'eus kanol-D ebet (linennoù fermet)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5015,11 +5416,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "O klask da lakaat ho gevradenn ..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5040,11 +5436,6 @@ msgstr "Ho niverenn pellgomz"
 msgid "Provider name (ex provider.net)"
 msgstr "Anv ar pourchaser (ex pourchaser.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Niverenn bellgomz ar pourchaser"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5055,41 +5446,6 @@ msgstr "DNS 1 ar pourchaser (da zilenn)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 ar pourchaser (da zilenn)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Mod an sifrennadur"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Tizh ar gevreadenn"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Amzer-hont a ar gevreadenn (eil)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ kartenn"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memor kartenn (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO kartenn"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 kartenn"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5248,16 +5604,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Anv an domani"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Servijer DNS kentañ (da zilenn)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Eil servijer DNS (da zilenn)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5551,11 +5897,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Er furmad 1.2.3.4 e tlefe bezañ chomlec'h ar servijer DNS"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Er furmad 1.2.3.4 e tlefe bezañ chomlec'h an dreuzell"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5981,9 +6322,6 @@ msgstr "Implijit ur porzh UDP ispisial"
 #~ msgid "Please select the Windows driver (.inf file)"
 #~ msgstr "Dibabit ar sturier Windows (restr .inf) mar plij"
 
-#~ msgid "Connection type: "
-#~ msgstr "Seurt ar gevreadenn : "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "implijet eo %s c'hoazh\n"
 
@@ -6171,9 +6509,6 @@ msgstr "Implijit ur porzh UDP ispisial"
 #~ msgid "discard"
 #~ msgstr "lemel"
 
-#~ msgid "none"
-#~ msgstr "hini ebet"
-
 #~ msgid "tunnel"
 #~ msgstr "tunnel"
 
@@ -6195,167 +6530,15 @@ msgstr "Implijit ur porzh UDP ispisial"
 #~ msgid "unique"
 #~ msgstr "dieil"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Argad ouzh ur servij"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Petra e fell deoc'h d'ober gant an argader-mañ ?"
-
-#~ msgid "Attack details"
-#~ msgstr "Munudoù an argad"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Eur an argad : %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Etrefas rouedad: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Seurt an argad : %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Komenad: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Chomlec'h IP an argader : %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Anv ostiz an argader : %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Servij argadet : %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Porzh argadet : %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Seurt an argad ICMP : %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Tremen e-biou"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Moger tan bev : servij nevez"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Kevreadenn hep neud"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Mennout a rit digeriñ ar servij-mañ ?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Enrollañ ar respont-mañ"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Implijit enframmadur CISCO-UDP"
 
-#~ msgid "Gateway:"
-#~ msgstr "Treuzell :"
-
-#~ msgid "Interface:"
-#~ msgstr "C'hetal :"
-
-#~ msgid "Manage connections"
-#~ msgstr "Meran liammoù"
-
-#~ msgid "IP configuration"
-#~ msgstr "Kefluniadur IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Servijerioù DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "Domani klask"
-
-#~ msgid "static"
-#~ msgstr "statik"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Loc'hañ pa vez loc'het an urzhiataer"
-
-#~ msgid "Flow control"
-#~ msgstr "Evezhiañ ar red"
-
-#~ msgid "Line termination"
-#~ msgstr "Dibenn al linennoù"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Amzer-hont ar modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Implijit ur restr prennañ"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Gortoz e-pad an ton galv goude sifrenn"
-
-#~ msgid "Busy wait"
-#~ msgstr "Gortoz da vat"
-
-#~ msgid "Modem sound"
-#~ msgstr "Son ar modem"
-
-#~ msgid "Vendor"
-#~ msgstr "Gwerzher"
-
-#~ msgid "Media class"
-#~ msgstr "Renkad ar vedia"
-
-#~ msgid "Module name"
-#~ msgstr "Anv ar mollad"
-
-#~ msgid "Mac Address"
-#~ msgstr "Chomlec'h MAC"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Lec'hel war ar bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Lebel un etrefas rouedad"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Degouezhet ez eus ar fazi en ur lemel an etrefas rouedad « %s » :\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Digevreañ ..."
 
 #~ msgid "Connect..."
 #~ msgstr "Kevreañ ..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Kefluniadur ar gevreadenn internet"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Anv ostiz (diret)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Servijer DNS trede (da zilenn)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Kefluniadur ar gevreadenn ar c'henrouedad"
-
-#~ msgid "Internet access"
-#~ msgstr "Digor ar genrouedad"
-
-#~ msgid "Status:"
-#~ msgstr "Stad :"
-
-#~ msgid "Parameters"
-#~ msgstr "Arventennoù"
-
 #~ msgid "Attacker"
 #~ msgstr "Argader"
 
diff --git a/po/bs.po b/po/bs.po
index 5db8c6d..66dd97c 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: bs\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -30,14 +30,16 @@ msgid "Interface"
 msgstr "Interfejs"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adresa"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -73,23 +75,27 @@ msgid "Configure Local Area Network..."
 msgstr "Podesi Lokalnu mrežu..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Pomoć"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Primjeni"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "U redu"
@@ -99,7 +105,8 @@ msgstr "U redu"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -108,7 +115,7 @@ msgstr "U redu"
 msgid "Please wait"
 msgstr "Molim sačekajte"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Molim sačekajte... Primjenjujem konfiguraciju"
@@ -144,6 +151,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -159,6 +167,7 @@ msgid "Started on boot"
 msgstr "Pokrenut na bootu"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klijent"
@@ -173,17 +182,19 @@ msgstr ""
 "Pokrenite asistent \"Dodaj interfejs\" iz Mageia Kontrolnog centra"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Podesite novi mrežni interfejs (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Bez IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Bez maske"
@@ -253,12 +264,12 @@ msgstr ""
 "\n"
 "Šta želite uraditi?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Isključi"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Uključi"
@@ -273,8 +284,8 @@ msgstr "Ponovo konfiguriši"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Molim izaberite mrežni interfejs koji je direktno spojen na Internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Mrežni uređaj"
@@ -341,7 +352,11 @@ msgstr "Interno domensko ime"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -634,13 +649,14 @@ msgstr "Dozvoljene adrese"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktivni firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Ne mogu pristupiti demonu"
@@ -650,12 +666,12 @@ msgstr "Ne mogu pristupiti demonu"
 msgid "Log"
 msgstr "Dnevnik"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokiraj"
@@ -682,12 +698,12 @@ msgstr "Blokirani servisi"
 msgid "Clear logs"
 msgstr "Očisti logove"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Crna lista"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Bijela lista"
@@ -837,7 +853,7 @@ msgstr "Mode"
 msgid "Enabled"
 msgstr "Uključi"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Opis"
@@ -879,9 +895,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -2412,12 +2428,12 @@ msgid ""
 msgstr ""
 "Upozorenje, otkrivena je druga Internet konekcija, možda preko vaše mreže"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Konektovan"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nije konektovan"
@@ -2482,7 +2498,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrika"
@@ -2522,19 +2538,22 @@ msgstr "Kablovski modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Koristi BPALogin (potreban za Telstra ISP)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Metod autentikacije"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Korisničko ime"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Šifra"
@@ -2660,13 +2679,15 @@ msgstr ""
 "Svaka stavka bi trebala biti unesena kao IP adresa u decimalnoj notaciji\n"
 "razdvojenoj tačkama (npr. 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Preuzmi DNS servere od DHCPa"
@@ -2693,21 +2714,25 @@ msgstr ""
 "Podrazumijeva se domena za pretragu koja je dio kvalifikovanog imena računara"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Čekanje na DHCP (u sekundama)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Preuzmi YP servere od DHCPa"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Preuzmi NTPD servere od DHCPa"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP ime računara"
@@ -2718,11 +2743,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Nemoj koristiti Zeroconf (169.254.0.0 mreža)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresa treba biti u formatu 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Netmaska treba biti u formatu 255.255.224.0"
@@ -2741,6 +2768,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Odredi ime računara iz DHCP adrese"
@@ -2762,6 +2790,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
@@ -2830,27 +2859,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analogni telefonski modem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skriptirano"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4009,12 +4043,12 @@ msgstr "WPA Pre-Shared Key"
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4023,78 +4057,81 @@ msgstr ""
 "Vaša wireless kartica je isključena, molimo najprije aktivirajte wireless "
 "prekidač (RF kill switch)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Postavke bežične veze"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Režim rada"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundarni"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Ime mreže (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Režim šifrovanja"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Ključ enkripcije"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Šifra"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Korisničko ime"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4102,12 +4139,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Šifra"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4126,12 +4163,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Naziv certifikata"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4140,32 +4177,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID mreže"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frekvencija"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Prag osjetljivosti"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Brzina veze (u b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4189,17 +4231,19 @@ msgstr ""
 "procedura\n"
 "je isključena. Takođe možete podesiti ovaj parametar na auto, fixed ili off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentacija"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Dodatni parametri naredbe iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4215,12 +4259,13 @@ msgstr ""
 "Pogledajte man stranicu iwconfig(8) za dodatne informacije."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Dodatni parametri naredbe iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4239,12 +4284,13 @@ msgstr ""
 "\n"
 "Pogledajte man stranicu iwspy(8) za više informacija."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Dodatni parametri naredbe iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4274,107 +4320,107 @@ msgstr ""
 "\n"
 "Pogledajte man stranicu iwpriv(8) za daljnje informacije."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Auto prepoznavanje"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Mode"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4382,12 +4428,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4396,12 +4442,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Certifikat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4411,12 +4457,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4426,12 +4472,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4449,26 +4495,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Potreban je ključ za šifrovanje."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4477,7 +4523,7 @@ msgstr ""
 "Frekvencija bi trebala imati završetak k, M ili G (na primjer, \"2.46G\" za "
 "frekvenciju 2.46 GHz) ili dodajte odgovarajući broj nula (0)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4486,17 +4532,17 @@ msgstr ""
 "Brzina bi trebala imati završetak k, M ili G (na primjer, \"11M\" za 11M) "
 "ili dodajte odgovarajući broj nula (0)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Dozvoli promjenu access pointa"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Pridružen na bežičnu mrežu \"%s\" na interfejsu %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Izgubljena veza sa bežičnom mrežom na interfejsu %s"
@@ -4642,6 +4688,287 @@ msgstr "Spoji se"
 msgid "Hostname changed to \"%s\""
 msgstr "Ime računara promijenjeno u \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Na vašem sistemu nije pronađen nijedan ethernet mrežni adapter. Molim "
+"pokrenite alat za podešavanje hardware-a."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Uklonite mrežni interfejs"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Izaberite mrežni interface koji želite podesiti:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Došlo je do greške prilikom brisanja interfejsa \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Čestitamo, mrežni interfejs \"%s\" je uspješno obrisan"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Upravljajte vezama"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Uređaj: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Podešavanje IPa"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS serveri"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Domene za pretragu"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "nijedan"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statička"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Pokreni na bootu"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Način biranja broja"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Brzina konekcije"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Timeout konekcije (u sek.)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Broj telefona provajdera"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Kontrola toka"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Prekid linije"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Istek vremena modema"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Koristi lock datoteku"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Čekaj zvuk slobodne linije prije biranja"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Busy wait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Zvuk modema"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ kartice"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memorija kartice (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO kartice"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 kartice"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Evropski protokol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol za ostatak svijeta \n"
+" bez D-kanala (iznajmljene linije)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Proizvođač"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Klasa medija"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Naziv modula"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "MAC adresa"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Sabirnica"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Lokacija na sabirnici"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway adresa treba biti u formatu 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfejs:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Podešavanje Internet konekcije"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Niste podesili nijednu Internet konekciju.\n"
+"Pokrenite asistent \"%s\" iz Mageia Kontrolnog centra"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Ime računara (opcionalno)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Prvi DNS server (opcionalno)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Drugi DNS server (opcionalno)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Treći DNS server (opcionalno)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Podešavanje Internet konekcije"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Pristup Internetu"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tip konekcije: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Status:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Probavam vašu konekciju..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametri"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4849,11 +5176,6 @@ msgstr "Koristi Interaktivni firewall"
 msgid "No device found"
 msgstr "Nije pronađen nijedan uređaj"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Uređaj: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5083,6 +5405,103 @@ msgstr "Instaliraj novi drajver"
 msgid "Select a device:"
 msgstr "Izaberite uređaj:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Napad na servis"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interaktivni firewall: otkriven pokušaj upada"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Šta želite uraditi sa napadačem?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Detalji napada"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Vrijeme napada: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Mrežni interfejs: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Vrsta napada: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP adresa napadača: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Ime računara napadača: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Napadnuti servis: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Napadnuti port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Vrsta ICMP napada: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Uvijek stavljaj na listu (bez pitanja)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignoriši"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktivni firewall: novi servis"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Bežična veza"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Želite li dozvoliti pristup servisu?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Zapamti odgovor"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5126,20 +5545,6 @@ msgstr "Interna ISDN kartica"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol za ostatak svijeta"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Evropski protokol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol za ostatak svijeta \n"
-" bez D-kanala (iznajmljene linije)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5190,11 +5595,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Kontrola veze"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Probavam vašu konekciju..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5215,11 +5615,6 @@ msgstr "Vaš lični broj telefona"
 msgid "Provider name (ex provider.net)"
 msgstr "Naziv provajdera (npr. provajder.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Broj telefona provajdera"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5230,41 +5625,6 @@ msgstr "Provider DNS 1 (opcionalno)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provider DNS 2 (opcionalno)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Način biranja broja"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Brzina konekcije"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Timeout konekcije (u sek.)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ kartice"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memorija kartice (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO kartice"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 kartice"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5431,16 +5791,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Ime domena"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Prvi DNS server (opcionalno)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Drugi DNS server (opcionalno)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5751,11 +6101,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Adresa DNS servera treba biti u formatu 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway adresa treba biti u formatu 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6228,16 +6573,6 @@ msgstr "Koristi navedeni UDP port"
 #~ "\n"
 #~ "Sada ću podesiti vašu Lokalnu mrežu sa ovim adapterom."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Na vašem sistemu nije pronađen nijedan ethernet mrežni adapter. Molim "
-#~ "pokrenite alat za podešavanje hardware-a."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tip konekcije: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s je već u upotrebi\n"
 
@@ -7227,9 +7562,6 @@ msgstr "Koristi navedeni UDP port"
 #~ msgid "discard"
 #~ msgstr "poništi"
 
-#~ msgid "none"
-#~ msgstr "nijedan"
-
 #~ msgid "tunnel"
 #~ msgstr "tunel"
 
@@ -7259,178 +7591,15 @@ msgstr "Koristi navedeni UDP port"
 #~ "Trebate se odjaviti i ponovo prijaviti na sistem kako bi izmjene stupile "
 #~ "na snagu"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Napad na servis"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Interaktivni firewall: otkriven pokušaj upada"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Šta želite uraditi sa napadačem?"
-
-#~ msgid "Attack details"
-#~ msgstr "Detalji napada"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Vrijeme napada: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Mrežni interfejs: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Vrsta napada: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP adresa napadača: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Ime računara napadača: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Napadnuti servis: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Napadnuti port: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Vrsta ICMP napada: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Uvijek stavljaj na listu (bez pitanja)"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignoriši"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Interaktivni firewall: novi servis"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Bežična veza"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Želite li dozvoliti pristup servisu?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Zapamti odgovor"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Koristi Cisco-UDP enkapsulaciju"
 
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfejs:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Upravljajte vezama"
-
-#~ msgid "IP configuration"
-#~ msgstr "Podešavanje IPa"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS serveri"
-
-#~ msgid "Search Domain"
-#~ msgstr "Domene za pretragu"
-
-#~ msgid "static"
-#~ msgstr "statička"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Pokreni na bootu"
-
-#~ msgid "Flow control"
-#~ msgstr "Kontrola toka"
-
-#~ msgid "Line termination"
-#~ msgstr "Prekid linije"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Istek vremena modema"
-
-#~ msgid "Use lock file"
-#~ msgstr "Koristi lock datoteku"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Čekaj zvuk slobodne linije prije biranja"
-
-#~ msgid "Busy wait"
-#~ msgstr "Busy wait"
-
-#~ msgid "Modem sound"
-#~ msgstr "Zvuk modema"
-
-#~ msgid "Vendor"
-#~ msgstr "Proizvođač"
-
-#~ msgid "Media class"
-#~ msgstr "Klasa medija"
-
-#~ msgid "Module name"
-#~ msgstr "Naziv modula"
-
-#~ msgid "Mac Address"
-#~ msgstr "MAC adresa"
-
-#~ msgid "Bus"
-#~ msgstr "Sabirnica"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Lokacija na sabirnici"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Uklonite mrežni interfejs"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Došlo je do greške prilikom brisanja interfejsa \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Čestitamo, mrežni interfejs \"%s\" je uspješno obrisan"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Prekini konekciju..."
 
 #~ msgid "Connect..."
 #~ msgstr "Konektuj se..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Podešavanje Internet konekcije"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Ime računara (opcionalno)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Treći DNS server (opcionalno)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Podešavanje Internet konekcije"
-
-#~ msgid "Internet access"
-#~ msgstr "Pristup Internetu"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametri"
-
 #~ msgid "Attacker"
 #~ msgstr "Napadač"
 
diff --git a/po/ca.po b/po/ca.po
index f7ce148..6dac8a3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ca\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -29,14 +29,16 @@ msgid "Interface"
 msgstr "Interfície"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Adreça IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
@@ -73,23 +75,27 @@ msgstr "Configura la xarxa d'àrea local..."
 
 #
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Aplica"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Cancel·la"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "D'acord"
@@ -99,7 +105,8 @@ msgstr "D'acord"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -108,7 +115,7 @@ msgstr "D'acord"
 msgid "Please wait"
 msgstr "Espereu si us plau"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Espereu si us plau... s'està aplicant la configuració"
@@ -144,6 +151,7 @@ msgstr "Adaptador %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Submàscara de xarxa"
@@ -159,6 +167,7 @@ msgid "Started on boot"
 msgstr "Iniciat en l'arrencada"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Client DHCP"
@@ -174,17 +183,19 @@ msgstr ""
 "Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Estableix una nova interfície de xarxa  (LAN, XDSI, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Sense IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Sense màscara"
@@ -254,12 +265,12 @@ msgstr ""
 "\n"
 "Què voleu fer?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Inhabilita"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Habilita"
@@ -274,8 +285,8 @@ msgstr "Torna a configurar"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Dispositiu de xarxa"
@@ -343,7 +354,11 @@ msgstr "Nom intern de domini"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -645,13 +660,14 @@ msgstr "Adreces permeses"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Tallafocs interactiu"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "No es pot contactar amb la rèplica: %s"
@@ -661,12 +677,12 @@ msgstr "No es pot contactar amb la rèplica: %s"
 msgid "Log"
 msgstr "Bitàcola"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Tots"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -695,12 +711,12 @@ msgstr "Còpia de seguretat dels fitxers d'usuari"
 msgid "Clear logs"
 msgstr "Buida-ho tot"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Llista negra"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Llista blanca"
@@ -849,7 +865,7 @@ msgstr "Mode"
 msgid "Enabled"
 msgstr "Habilita"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descripció"
@@ -891,9 +907,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Advertència"
@@ -2376,12 +2392,12 @@ msgstr ""
 "Avís: s'ha detectat una altra connexió a Internet, potser utilitzant la "
 "vostra xarxa"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Connectat"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Sense connexió"
@@ -2446,7 +2462,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Mètrica"
@@ -2486,19 +2502,22 @@ msgstr "Model de la targeta:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autenticació"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Entrada del compte (nom d'usuari)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Contrasenya del compte"
@@ -2625,7 +2644,8 @@ msgstr ""
 "S'ha d'introduir cada element com una adreça IP en notació decimal amb\n"
 "punts (per exemple, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
@@ -2633,6 +2653,7 @@ msgstr "Passarel·la"
 
 #
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Obté els servidors DNS per DHCP"
@@ -2658,21 +2679,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Temps màxim per connectar (en seg)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Obté els servidors NTPD per DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nom DHCP de l'ordinador"
@@ -2683,11 +2708,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "L'adreça IP ha d'estar en format 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "La màscara de xarxa hauria d'estar en el format 255.255.224.0"
@@ -2707,6 +2734,7 @@ msgstr ""
 
 #
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Assigna un nom d'ordinador a partir de l'adreça DHCP"
@@ -2728,6 +2756,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "\"Hotplugging\" de xarxa"
@@ -2796,27 +2825,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Basat en script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Basat en terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3982,91 +4016,94 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Connexió sense fils"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Mode de funcionament"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Gestionat"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Mestre"
 
 #
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repetidor"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secundari"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automàtic"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nom de la xarxa (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Mode de xifrat"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Clau de xifratge"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Contrasenya"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Entrada del compte (nom d'usuari)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4074,12 +4111,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Contrasenya"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4098,12 +4135,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Nom del certificat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4113,32 +4150,37 @@ msgid ""
 msgstr ""
 
 #
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID de xarxa"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Freqüència de funcionament"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Taxa de bits (en b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4152,17 +4194,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentació"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Arguments extra per a lwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4173,12 +4217,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Arguments extra per a lwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4190,12 +4235,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Arguments extra per a lwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4213,108 +4259,108 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protocol"
 
 #
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Detecció automàtica"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Mode"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4322,12 +4368,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4336,12 +4382,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Nom del certificat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4351,12 +4397,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4366,12 +4412,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4389,26 +4435,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4417,7 +4463,7 @@ msgstr ""
 "La freqüència ha de tenir el sufix k, M o G (per exemple, \"2,46G\" per a la "
 "freqüència de 2,46 GHz), or afegir prou '0' (zeros)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4426,17 +4472,17 @@ msgstr ""
 "La velocitat ha de tenir el sufix k, M o G (per exemple, \"11M\" per a 11M), "
 "o afegir prou '0' (zeros)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4584,6 +4630,291 @@ msgstr "Connecta"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"No s'ha detectat cap adaptador de xarxa ethernet al sistema. Si us plau, "
+"executeu l'eina de configuració de maquinari."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Esborra una interfície de xarxa"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Escolliu la interfície de xarxa a configurar:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"S'ha produït un problema en esborrar la interfície de xarxa \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Felicitats, la interfície de xarxa \"%s\" s'ha esborrat amb èxit"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Gestiona connexions"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Dispositiu: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Configuració IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Servidors DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Domini de cerca"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "cap"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "estàtica"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Inicia en l'arrencada"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Mode de marcatge"
+
+#
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Velocitat de la connexió"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Temps màxim per connectar (en seg)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Número de telèfon del proveïdor"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Control de fluxe"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Terminació de línia"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Temps màxim d'espera per al mòdem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Usa fitxer de bloqueig"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Espera el to abans de marcar"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Espera activa"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "So del mòdem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ de la targeta"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Targeta de memòria (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "E/S de la Targeta"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "E/S_0 de la Targeta"
+
+#
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocol europeu (EDSS1)"
+
+#
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocol per a la resta del món\n"
+"Cap canal D (línies punt a punt)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Venedor"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Tipus de mitjà"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Nom del mòdul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Adreça Mac"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Ubicació en el bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "L'adreça de la passarel·la ha d'estar en format 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Passarel·la:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Intefície:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Configuració de la connexió a Internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Aquesta interfície encara no s'ha configurat.\n"
+"Executeu l'auxiliar \"%s\" del Centre de Control de Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Nom de l'ordinador (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primer servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Segon servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Tercer servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configuració de la connexió a Internet"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Accés a Internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tipus de connexió: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Estat:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "S'està comprovant la vostra connexió..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Paràmetres"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4792,11 +5123,6 @@ msgstr ""
 msgid "No device found"
 msgstr "No s'ha trobat cap dispositiu"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Dispositiu: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5022,6 +5348,104 @@ msgstr "Instal·la un nou controlador"
 msgid "Select a device:"
 msgstr "Escolliu un dispositiu:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Atac a un servei"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Tallafocs actiu: intrusió detectada"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Voleu finalitzar el joc?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Detalls de l'atac"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Tipus d'atac: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Interfície de la xarxa: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Tipus d'atac: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protocol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Adreça IP de l'atacant: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Nom d'equip de l'atacant: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Servei atacat: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Port atacat: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Tipus d'atac ICMP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignora"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Tallafocs actiu: intrusió detectada"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Connexió sense fils"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Voleu configurar-ho ara?"
+
+#
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Recorda aquesta contrasenya"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5066,22 +5490,6 @@ msgstr "Targeta XDSI interna"
 msgid "Protocol for the rest of the world"
 msgstr "Protocol per a la resta del món"
 
-#
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocol europeu (EDSS1)"
-
-#
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocol per a la resta del món\n"
-"Cap canal D (línies punt a punt)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5132,11 +5540,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "S'està comprovant la vostra connexió..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5157,11 +5560,6 @@ msgstr "El vostre telèfon particular"
 msgid "Provider name (ex provider.net)"
 msgstr "Nom del proveïdor (p.ex. proveïdor.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Número de telèfon del proveïdor"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5172,42 +5570,6 @@ msgstr "DNS 1 del proveïdor (opcional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 del proveïdor (opcional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Mode de marcatge"
-
-#
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Velocitat de la connexió"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Temps màxim per connectar (en seg)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ de la targeta"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Targeta de memòria (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "E/S de la Targeta"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "E/S_0 de la Targeta"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5375,16 +5737,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nom de domini"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primer servidor DNS (opcional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Segon servidor DNS (opcional)"
-
 #
 #: ../lib/network/netconnect.pm:653
 #, c-format
@@ -5692,11 +6044,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "L'adreça del servidor DNS ha d'estar en format 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "L'adreça de la passarel·la ha d'estar en format 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6150,16 +6497,6 @@ msgstr ""
 #~ "\n"
 #~ "Ara es configurarà la vostra xarxa d'àrea local amb aquest adaptador."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "No s'ha detectat cap adaptador de xarxa ethernet al sistema. Si us plau, "
-#~ "executeu l'eina de configuració de maquinari."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tipus de connexió: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s ja és en ús\n"
 
@@ -6323,9 +6660,6 @@ msgstr ""
 #~ msgid "ipsec"
 #~ msgstr "ipsec"
 
-#~ msgid "none"
-#~ msgstr "cap"
-
 #~ msgid "Source/destination"
 #~ msgstr "Font/destí"
 
@@ -6339,175 +6673,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Heu de sortir i tornar a entrar per tal que els canvis tinguin efecte"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Atac a un servei"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Tallafocs actiu: intrusió detectada"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Voleu finalitzar el joc?"
-
-#~ msgid "Attack details"
-#~ msgstr "Detalls de l'atac"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Interfície de la xarxa: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Tipus d'atac: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protocol: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Adreça IP de l'atacant: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Nom d'equip de l'atacant: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Servei atacat: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Port atacat: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Tipus d'atac ICMP: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignora"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Tallafocs actiu: intrusió detectada"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Connexió sense fils"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Voleu configurar-ho ara?"
-
-#
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Recorda aquesta contrasenya"
-
-#~ msgid "Gateway:"
-#~ msgstr "Passarel·la:"
-
-#~ msgid "Interface:"
-#~ msgstr "Intefície:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Gestiona connexions"
-
-#~ msgid "IP configuration"
-#~ msgstr "Configuració IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Servidors DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "Domini de cerca"
-
-#~ msgid "static"
-#~ msgstr "estàtica"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#
-#~ msgid "Start at boot"
-#~ msgstr "Inicia en l'arrencada"
-
-#~ msgid "Flow control"
-#~ msgstr "Control de fluxe"
-
-#~ msgid "Line termination"
-#~ msgstr "Terminació de línia"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Temps màxim d'espera per al mòdem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Usa fitxer de bloqueig"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Espera el to abans de marcar"
-
-#~ msgid "Busy wait"
-#~ msgstr "Espera activa"
-
-#~ msgid "Modem sound"
-#~ msgstr "So del mòdem"
-
-#~ msgid "Vendor"
-#~ msgstr "Venedor"
-
-#~ msgid "Media class"
-#~ msgstr "Tipus de mitjà"
-
-#~ msgid "Module name"
-#~ msgstr "Nom del mòdul"
-
-#~ msgid "Mac Address"
-#~ msgstr "Adreça Mac"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Ubicació en el bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Esborra una interfície de xarxa"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "S'ha produït un problema en esborrar la interfície de xarxa \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Felicitats, la interfície de xarxa \"%s\" s'ha esborrat amb èxit"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Desconnecta..."
 
 #~ msgid "Connect..."
 #~ msgstr "Connecta..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Configuració de la connexió a Internet"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Nom de l'ordinador (opcional)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Tercer servidor DNS (opcional)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Configuració de la connexió a Internet"
-
-#~ msgid "Internet access"
-#~ msgstr "Accés a Internet"
-
-#~ msgid "Status:"
-#~ msgstr "Estat:"
-
-#~ msgid "Parameters"
-#~ msgstr "Paràmetres"
-
 #~ msgid "Attacker"
 #~ msgstr "Atacant"
 
diff --git a/po/cs.po b/po/cs.po
index af96a28..2fff068 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,18 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-24 12:45+0000\n"
 "Last-Translator: Petos Safarik <petos@mandrivalinux.cz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
 #: ../bin/drakconnect-old:45
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Rozhraní"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adresa"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "Nastavit lokální síť..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Nápověda"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Použít"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Zrušit"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -95,16 +101,17 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Prosím počkejte"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Čekejte prosím... Aktivuji nastavení"
@@ -140,6 +147,7 @@ msgstr "Adaptér %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Maska sítě"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "Spustit při startu"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klient"
@@ -169,17 +178,19 @@ msgstr ""
 "Spusťte asistenta \"%s\" z Ovládacího centra Mageia Linuxu."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Nastavit nové síťové rozhraní (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Bez IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Bez masky"
@@ -203,17 +214,24 @@ msgstr "Sdílet internetové připojení"
 #, 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). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
 "Chystáte se nastavit Váš počítač tak, aby sdílel své připojení k internetu.\n"
-"S touto funkcí se budou ostatní počítače ve Vaší síti moci připojit k síti Internet prostřednictvím tohoto počítače.\n"
+"S touto funkcí se budou ostatní počítače ve Vaší síti moci připojit k síti "
+"Internet prostřednictvím tohoto počítače.\n"
 "\n"
 "\n"
-"Pozn.: ke sdílení připojení k Internetu pořebujete vyhrazený síťový adaptér, kterým se připojíte ke své LAN. Nezapomeňte prosím na tomto rozhraní vypnout firewall než budete pokračovat."
+"Pozn.: ke sdílení připojení k Internetu pořebujete vyhrazený síťový adaptér, "
+"kterým se připojíte ke své LAN. Nezapomeňte prosím na tomto rozhraní vypnout "
+"firewall než budete pokračovat."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -241,12 +259,12 @@ msgstr ""
 "\n"
 "Co chcete dále dělat?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Zakázat"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Povolit"
@@ -261,8 +279,8 @@ msgstr "Přenastavit"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Vyberte prosím síťové rozhraní přímo připojené k internetu."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Síťové zařízení"
@@ -270,7 +288,8 @@ msgstr "Síťové zařízení"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one network adapter on your system configured for LAN connections:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
@@ -280,7 +299,8 @@ msgid ""
 "disable the firewall protection on it using drakfirewall before\n"
 "configuring Internet Connection sharing."
 msgstr ""
-"Na vašem systému je pouze jeden síťový adaptér nastavený pro připojení k LAN:\n"
+"Na vašem systému je pouze jeden síťový adaptér nastavený pro připojení k "
+"LAN:\n"
 "\n"
 "%s\n"
 "\n"
@@ -292,7 +312,9 @@ msgstr ""
 
 #: ../bin/drakgw:156
 #, 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 "Vyberte prosím, které síťové zařízení je spojením do lokální sítě."
 
 #: ../bin/drakgw:177
@@ -334,7 +356,11 @@ msgstr "Interní doménové jméno"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -349,9 +375,7 @@ msgstr "Chyba"
 
 #: ../bin/drakgw:188
 #, c-format
-msgid ""
-"Potential LAN address conflict found in current config of %s!\n"
-""
+msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Nalezen možný konflikt v současném nastavení LAN adresy pro %s!\n"
 
 #: ../bin/drakgw:204
@@ -445,13 +469,17 @@ msgstr "Vysílat informace o tiskárně"
 #: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter configured for LAN has been detected on your system.\n"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that "
+"the Mageia firewall is not enabled for network adapter connected to your LAN "
+"network."
 msgstr ""
 "V systému nebyla nalezena žádný ethernetový adaptér nastavený pro LAN.\n"
 "\n"
-"K jeho konfiguraci prosím spusťte průvodce nastavením hardwaru  a zajistěte, aby nebylo toto rozhraní do LAN chráněno Mageia firewallem."
+"K jeho konfiguraci prosím spusťte průvodce nastavením hardwaru  a zajistěte, "
+"aby nebylo toto rozhraní do LAN chráněno Mageia firewallem."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -467,11 +495,13 @@ msgstr "Sdílení internetového připojení je nyní vypnuto."
 #, 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 ""
 "Vše se podařilo nastavit.\n"
-"Nyní lze použít tento počítač pro sdílení připojení k internetu pro vaši lokální síť, která používá automatickou konfiguraci sítě (DHCP) a\n"
+"Nyní lze použít tento počítač pro sdílení připojení k internetu pro vaši "
+"lokální síť, která používá automatickou konfiguraci sítě (DHCP) a\n"
 "transparentní proxy a cache server (Squid)."
 
 #: ../bin/drakgw:351
@@ -486,8 +516,12 @@ msgstr "Nalezeno existující nastavení firewallu!"
 
 #: ../bin/drakgw:366
 #, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
-msgstr "Varování! Bylo nalezeno existující nastavení firewallu. Po instalaci může být zapotřebí nějaká ruční úprava."
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+"Varování! Bylo nalezeno existující nastavení firewallu. Po instalaci může "
+"být zapotřebí nějaká ruční úprava."
 
 #: ../bin/drakgw:371
 #, c-format
@@ -622,13 +656,14 @@ msgstr "Povolené adresy"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktivní firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Nelze kontaktovat démona"
@@ -638,12 +673,12 @@ msgstr "Nelze kontaktovat démona"
 msgid "Log"
 msgstr "Záznam"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Povolit"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokovat"
@@ -670,12 +705,12 @@ msgstr "Blokované služby"
 msgid "Clear logs"
 msgstr "Smazat záznamy"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Černá listina"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Bílá listina"
@@ -757,8 +792,12 @@ msgstr "Je vyžadováno heslo."
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "Tento nástroj umožňuje nastavit záložní síťová rozhraní a replikaci firewallu."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
+msgstr ""
+"Tento nástroj umožňuje nastavit záložní síťová rozhraní a replikaci "
+"firewallu."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -821,7 +860,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Povolen"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Popis"
@@ -838,8 +877,15 @@ msgstr "Nový profil..."
 
 #: ../bin/draknetprofile:155
 #, c-format
-msgid "Please specify the name of the new network profile to be created (e.g., work, home, roaming, ..). This new profile will be created based on current settings, and you'll be able to configure your system configuration as usual afterwards."
-msgstr "Zadejte prosím název nově vytvářeného síťového profilu (např. práce, domov, roaming, …). Tento nový profil bude vytvořen na základě současných nastavení a poté budete mít možnost toto nastavení změnit."
+msgid ""
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
+"settings, and you'll be able to configure your system configuration as usual "
+"afterwards."
+msgstr ""
+"Zadejte prosím název nově vytvářeného síťového profilu (např. práce, domov, "
+"roaming, …). Tento nový profil bude vytvořen na základě současných nastavení "
+"a poté budete mít možnost toto nastavení změnit."
 
 #: ../bin/draknetprofile:166
 #, c-format
@@ -853,12 +899,17 @@ msgstr "Nový profil vytvořen"
 
 #: ../bin/draknetprofile:172
 #, c-format
-msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
-msgstr "Nyní používáte síťový profil %s. Můžete nastavit váš systém jako obvykle a odteď budou všechna vaše síťová nastavení ukládána do tohoto profilu."
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+"Nyní používáte síťový profil %s. Můžete nastavit váš systém jako obvykle a "
+"odteď budou všechna vaše síťová nastavení ukládána do tohoto profilu."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Varování"
@@ -870,7 +921,9 @@ msgstr "Jste si jisti, že chcete smazat výchozí síťový profil?"
 
 #: ../bin/draknetprofile:186
 #, c-format
-msgid "You can not delete the current profile. Please switch to a different profile first."
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
 msgstr "Nelze smazat současný profil. Nejprve prosím přepněte na jiný profil."
 
 #: ../bin/draknetprofile:194 ../bin/draknfs:356
@@ -993,34 +1046,49 @@ msgstr "Mělo by se jednat o adresář."
 #: ../bin/draknfs:146
 #, 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\">Klienty NFS</span> lze zadat několika způsoby:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">jediný počítač:</span> počítač s krátkým názvem, který dokáže server rozpoznat, plně kvalifikovaný doménový název nebo IP adresa\n"
+"<span foreground=\"royalblue3\">jediný počítač:</span> počítač s krátkým "
+"názvem, který dokáže server rozpoznat, plně kvalifikovaný doménový název "
+"nebo IP adresa\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">síťové skupiny:</span> síťové skupiny NIS lze zadat jako @skupinu.\n"
+"<span foreground=\"royalblue3\">síťové skupiny:</span> síťové skupiny NIS "
+"lze zadat jako @skupinu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">divoké karty:</span> názvy počítačů mohou obsahovat divoké karty (znaky) * a ?. Například: *.cs.foo.edu odpovídá všem počítačům v doméně cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">divoké karty:</span> názvy počítačů mohou "
+"obsahovat divoké karty (znaky) * a ?. Například: *.cs.foo.edu odpovídá všem "
+"počítačům v doméně cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">IP sítě:</span> můžete také exportovat adresáře všem počítačům na IP (pod)síti najednou. Buď `/255.255.252.0' nebo `/22'  připojené k základní síťové adrese bude mít stejný výsledek.\n"
+"<span foreground=\"royalblue3\">IP sítě:</span> můžete také exportovat "
+"adresáře všem počítačům na IP (pod)síti najednou. Buď `/255.255.252.0' nebo "
+"`/22'  připojené k základní síťové adrese bude mít stejný výsledek.\n"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1028,31 +1096,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\">Volby pro ID uživatele</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">mapovat správce jako anonymního:</span> mapuje požadavky z uid/gid 0 na anonymní uid/gid (root_squash).\n"
+"<span foreground=\"royalblue3\">mapovat správce jako anonymního:</span> "
+"mapuje požadavky z uid/gid 0 na anonymní uid/gid (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">povolit skutečný vzdálený přístup správci:</span> vypne mapování uživatele root. Tato volba je zejména užitečná pro bezdiskové stanice (no_root_squash).\n"
+"<span foreground=\"royalblue3\">povolit skutečný vzdálený přístup správci:</"
+"span> vypne mapování uživatele root. Tato volba je zejména užitečná pro "
+"bezdiskové stanice (no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">mapovat všechny uživatele jako anonymní:</span> mapuje všechna uid a gid na anonymního uživatele (all_squash). Užitečné pro FTP adresáře exportované pomocí NFS, adresáře s diskusními skupinami, atd. Opačná volba je vypnutí mapování UID (no_all_squash), což je výchozí nastavení.\n"
+"<span foreground=\"royalblue3\">mapovat všechny uživatele jako anonymní:</"
+"span> mapuje všechna uid a gid na anonymního uživatele (all_squash). "
+"Užitečné pro FTP adresáře exportované pomocí NFS, adresáře s diskusními "
+"skupinami, atd. Opačná volba je vypnutí mapování UID (no_all_squash), což je "
+"výchozí nastavení.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid a anongid:</span> explicitně nastavuje uid a gid anonymního účtu.\n"
+"<span foreground=\"royalblue3\">anonuid a anongid:</span> explicitně "
+"nastavuje uid a gid anonymního účtu.\n"
 
 #: ../bin/draknfs:177
 #, c-format
@@ -1081,23 +1164,49 @@ msgstr "Rozšířené volby"
 
 #: ../bin/draknfs:183
 #, 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> tato volba vyžaduje, aby požadavky pocházely z internetového portu nižšího než IPPORT_RESERVED (1024). Tato volba je ve výchozím stavu zapnuta."
+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> tato volba vyžaduje, aby požadavky "
+"pocházely z internetového portu nižšího než IPPORT_RESERVED (1024). Tato "
+"volba je ve výchozím stavu zapnuta."
 
 #: ../bin/draknfs:184
 #, 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> povolí přístup pro požadavky buď jen pro čtení, nebo pro čtení i zápis na tomto NFS svazku. Výchozí stav zakazuje jakékoli požadavky, které mění systém. To lze rovněž vyjádřit explicitně použitím této volby."
+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> povolí přístup pro požadavky buď "
+"jen pro čtení, nebo pro čtení i zápis na tomto NFS svazku. Výchozí stav "
+"zakazuje jakékoli požadavky, které mění systém. To lze rovněž vyjádřit "
+"explicitně použitím této volby."
 
 #: ../bin/draknfs:185
 #, 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> zakazuje NFS serveru porušovat NFS protokol a odpovídat na požadavky předtím, než byly změny pocházející z požadavku zapsány na stabilní disk (např. pevný disk)."
+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> zakazuje NFS serveru porušovat NFS "
+"protokol a odpovídat na požadavky předtím, než byly změny pocházející z "
+"požadavku zapsány na stabilní disk (např. pevný disk)."
 
 #: ../bin/draknfs:186
 #, 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> povolí kontrolu podstromu, která může v některých případech zlepšit zabezpečení, ale může snížit spolehlivost. Více informací viz manuálové stránky 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> povolí kontrolu podstromu, která "
+"může v některých případech zlepšit zabezpečení, ale může snížit "
+"spolehlivost. Více informací viz manuálové stránky exports(5)."
 
 #: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
@@ -1460,13 +1569,10 @@ msgstr "Toto je jednoduchý nástroj určený pro snadnou správu protokolu Samb
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
-msgid ""
-"_: Translator(s) name(s) & email(s)\n"
-""
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Michal Bukovjan, bukm@centrum.cz\n"
 "Vlastimil Ott, vlastimil@e-ott.info\n"
@@ -1510,8 +1616,12 @@ msgstr "Komentář:"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
-msgstr "Sdílení se stejným názvem již existuje nebo je název sdílení prázdný, vyberte prosím jiný název."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+"Sdílení se stejným názvem již existuje nebo je název sdílení prázdný, "
+"vyberte prosím jiný název."
 
 #: ../bin/draksambashare:400
 #, c-format
@@ -1541,8 +1651,11 @@ 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."
-msgstr "Cílem tohoto průvodce je snadné vytvoření nového sdílení Samba se speciální tiskárnou."
+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."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -1567,7 +1680,8 @@ msgstr "Průvodce úspěšně přidal sdílení Samba"
 #: ../bin/draksambashare:552
 #, 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:570
 #, c-format
@@ -1681,8 +1795,11 @@ msgstr "Veřejné:"
 
 #: ../bin/draksambashare:795
 #, c-format
-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."
+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."
 
 #: ../bin/draksambashare:803
 #, c-format
@@ -1731,8 +1848,12 @@ msgstr "Průvodce nastavením serveru Samba"
 
 #: ../bin/draksambashare:1057
 #, c-format
-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."
+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."
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1741,18 +1862,28 @@ msgstr "PDC server: primární řadič domény"
 
 #: ../bin/draksambashare:1073
 #, c-format
-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."
+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."
 
 #: ../bin/draksambashare:1073
 #, c-format
-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"
+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"
 
 #: ../bin/draksambashare:1073
 #, 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 způsobí, že server zaregistruje svůj název NetBIOS <pdc name>. Tento název bude rozpoznán ostatními servery."
+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 způsobí, že server zaregistruje svůj název NetBIOS <pdc "
+"name>. Tento název bude rozpoznán ostatními servery."
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -1776,8 +1907,17 @@ msgstr "Úroveň OS:"
 
 #: ../bin/draksambashare:1092
 #, 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 "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"
+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 ""
+"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"
 
 #: ../bin/draksambashare:1096
 #, c-format
@@ -1816,8 +1956,12 @@ msgstr "Bezpečnostní režim"
 
 #: ../bin/draksambashare:1122
 #, c-format
-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."
+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."
 
 #: ../bin/draksambashare:1122
 #, c-format
@@ -1826,8 +1970,14 @@ msgstr "Úroveň sdílení: klient se ověřuje zvlášť pro každé sdílení"
 
 #: ../bin/draksambashare:1122
 #, 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 "Ú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."
+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 ""
+"Ú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:1133
 #, c-format
@@ -1841,8 +1991,12 @@ msgstr "Popis serveru."
 
 #: ../bin/draksambashare:1138
 #, c-format
-msgid "The banner is the way this server will be described in the Windows workstations."
-msgstr "Jedná se o způsob, jakým bude tento server popsán pracovním stanicím s Windows."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"Jedná se o způsob, jakým bude tento server popsán pracovním stanicím s "
+"Windows."
 
 #: ../bin/draksambashare:1143
 #, c-format
@@ -1861,18 +2015,26 @@ msgstr "Záznamy Samba"
 
 #: ../bin/draksambashare:1154
 #, c-format
-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č"
+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č"
 
 #: ../bin/draksambashare:1154
 #, 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:1154
 #, 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:1161 ../bin/draksambashare:1179
 #, c-format
@@ -1896,13 +2058,21 @@ msgstr "Průvodce sestavil následující parametry pro nastavení protokolu Sam
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
-msgstr "Chcete-li přijmout tyto hodnoty a nastavit server, pokračujte stiskem tlačítka Další nebo se vraťte zpět a hodnoty opravte."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Chcete-li přijmout tyto hodnoty a nastavit server, pokračujte stiskem "
+"tlačítka Další nebo se vraťte zpět a hodnoty opravte."
 
 #: ../bin/draksambashare:1168
 #, c-format
-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 sdílení v tomto nastavení. Upravte je spuštěním 'drakwizard sambashare'."
+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 sdílení v tomto "
+"nastavení. Upravte je spuštěním 'drakwizard sambashare'."
 
 #: ../bin/draksambashare:1176
 #, c-format
@@ -2293,15 +2463,19 @@ msgstr "Lokální měřítko"
 
 #: ../bin/net_monitor:512
 #, c-format
-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 lokální síť"
+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 "
+"lokální síť"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Připojeno"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nepřipojeno"
@@ -2366,7 +2540,7 @@ msgstr "Povolit počítání provozu"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Rozhraní bude spravováno pomocí Network Manageru."
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrika"
@@ -2379,7 +2553,9 @@ msgstr "MTU"
 #: ../lib/network/connection.pm:253
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
-msgstr "Maximální velikost síṫové zprávy (MTU). Ponechte prázdné, pokud si nejste jisti."
+msgstr ""
+"Maximální velikost síṫové zprávy (MTU). Ponechte prázdné, pokud si nejste "
+"jisti."
 
 #: ../lib/network/connection.pm:333
 #, c-format
@@ -2406,19 +2582,22 @@ msgstr "Kabelový modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Použít přihlášení BPALogin (nutné pro poskytovatele Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Ověření"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Váš účet (uživatelské jméno)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Heslo vašeho účtu"
@@ -2515,7 +2694,8 @@ msgstr "Virtuální rozhraní"
 #: ../lib/network/connection/ethernet.pm:60
 #, 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:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
@@ -2543,13 +2723,15 @@ msgstr ""
 "Každá položka musí být zadána jako IP adresa v 'desetinné' formě\n"
 "(například 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Brána(gateway)"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Získat adresy DNS serverů z DHCP"
@@ -2575,21 +2757,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "Prohledávaná doména bude nastavena podle názvu počítače"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Prodleva DHCP (sekundy)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Získat adresy YP serverů z DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Získat adresy NTPD serverů z DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Název počítače z DHCP"
@@ -2600,11 +2786,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Nepoužít výchozí nastavení Zeroconf (síť 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresa musí být ve formátu 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Síťová maska by měla být ve formátu 255.255.224.0"
@@ -2616,25 +2804,45 @@ msgstr "Varování: IP adresa %s je obyčejně rezervována!"
 
 #: ../lib/network/connection/ethernet.pm:195
 #, c-format
-msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
-msgstr "%s je již použita připojením, které se spouští při startu počítače (%s). Chcete-li použít tuto adresu s tímto připojením, vypněte nejprve všechna ostatní zařízení, která ji používají, nebo je nastavte tak, aby se nespouštěla při startu"
+msgid ""
+"%s is already used by a connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start at boot"
+msgstr ""
+"%s je již použita připojením, které se spouští při startu počítače (%s). "
+"Chcete-li použít tuto adresu s tímto připojením, vypněte nejprve všechna "
+"ostatní zařízení, která ji používají, nebo je nastavte tak, aby se "
+"nespouštěla při startu"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Přiřadit název počítače z DHCP serveru (nebo generovat unikátní)"
 
 #: ../lib/network/connection/ethernet.pm:223
 #, c-format
-msgid "This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically."
-msgstr "Toto umožní serveru přiřadit název tomuto počítači. Pokud server neposkytne platný název počítače, bude název vygenerován automaticky."
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+"Toto umožní serveru přiřadit název tomuto počítači. Pokud server neposkytne "
+"platný název počítače, bude název vygenerován automaticky."
 
 #: ../lib/network/connection/ethernet.pm:226
 #, c-format
-msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
-msgstr "Tento počítač by měl mít definovaný název, který jej bude identifikovat. Mějte na paměti, že tento název bude sdílený všemi síťovými připojeními. Pokud bude ponechán prázdný, použije se „localhost.localdomain”."
+msgid ""
+"You should define a hostname for this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections.  If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+"Tento počítač by měl mít definovaný název, který jej bude identifikovat. "
+"Mějte na paměti, že tento název bude sdílený všemi síťovými připojeními. "
+"Pokud bude ponechán prázdný, použije se „localhost.localdomain”."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Rychlé připojení do sítě"
@@ -2703,27 +2911,32 @@ msgstr "Jednoduché staré telefonní služby (POTS)"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analogový telefonní modem"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Podle skriptu"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Pomocí terminálu"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3882,88 +4095,95 @@ msgstr "WPA/WPA2 předsdílený klíč"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Ovladač z Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
-msgstr "Vaše bezdrátová karta je vypnuta, zapněte prosím nejprve přepínač pro bezdrátové vysílání (přepínač RF kill)."
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
+msgstr ""
+"Vaše bezdrátová karta je vypnuta, zapněte prosím nejprve přepínač pro "
+"bezdrátové vysílání (přepínač RF kill)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Nastavení bezdrátového připojení"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Operační režim"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Spravované"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Primární"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundární"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Název sítě (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Režim šifrování"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Šifrovací klíč"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Skrýt heslo"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Vynutit použití tohoto klíče jako ASCII řetězec (např. pro Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Přihlášení EAP/Uživatel"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3974,12 +4194,12 @@ msgstr ""
 "text. Potřebujete-li zadat doménu, zkuste netestovanou\n"
 "syntaxi DOMÉNA\\uživatel"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Heslo EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4012,12 +4232,12 @@ msgstr ""
 "  Režim TLS je zcela založen na certifikátech a může\n"
 "ignorovat uživatelské jméno a heslo zde zadané."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Klientský certifikát EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4031,79 +4251,95 @@ msgstr ""
 " Poznámka: další související nastavení jsou k dispozici na\n"
 "stránce pro pokročilé."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID sítě"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Operační frekvence"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Práh citlivosti"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitová rychlost (b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, 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 ""
 "RTS/CTS přidává dodatečnou komunikaci před přenosem každého paketu, která\n"
-"zajišťuje, že je kanál volný. To je sice dodatečná zátěž, ale v případě skrytých uzlů\n"
-"nebo velkého počtu aktivních uzlů může zvýšit výkon. Tento parametr nastavuje velikost\n"
-"nejmenšího paketu, pro kterou uzel posílá RTS, hodnota rovná maximální velikosti\n"
-"paketu tuto funkci vypne. Lze také nastavit tento parametr na automatický, pevný nebo\n"
+"zajišťuje, že je kanál volný. To je sice dodatečná zátěž, ale v případě "
+"skrytých uzlů\n"
+"nebo velkého počtu aktivních uzlů může zvýšit výkon. Tento parametr "
+"nastavuje velikost\n"
+"nejmenšího paketu, pro kterou uzel posílá RTS, hodnota rovná maximální "
+"velikosti\n"
+"paketu tuto funkci vypne. Lze také nastavit tento parametr na automatický, "
+"pevný nebo\n"
 "jej vypnout."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentace"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "dodatečné parametry příkazu iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 ""
 "Zde můžete nastavit dodatečné parametry pro bezdrátové připojení jako:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (nick je již nastaveno jako hostname).\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick je již nastaveno "
+"jako hostname).\n"
 "\n"
 "Více informací viz manuálová stránka iwconfig(8)."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "dodatečné parametry příkazu lwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4122,21 +4358,25 @@ msgstr ""
 "\n"
 "Více informací viz manuálová stránka iwpspy(8)."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "dodatečné parametry příkazu lwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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."
@@ -4144,36 +4384,38 @@ msgstr ""
 "Příkaz lwpriv umožňuje nastavit volitelné (privátní) parametry rozhraní\n"
 "bezdrátové sítě.\n"
 "\n"
-"Příkaz lwpriv nakládá s parametry a nastavením specifickými pro každý ovladač\n"
+"Příkaz lwpriv nakládá s parametry a nastavením specifickými pro každý "
+"ovladač\n"
 "(na rozdíl od příkazu iwconfig který nakládá s obecnými parametry).\n"
 "\n"
-"Teoreticky by měly být informace o příkazech specifických pro jednotlivá rozhraní\n"
+"Teoreticky by měly být informace o příkazech specifických pro jednotlivá "
+"rozhraní\n"
 "dostupné v dokumentaci pro každý z ovladačů.\n"
 "\n"
 "Více informací viz manuálová stránka iwpriv(8)."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protokol EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Autodetekce"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4182,67 +4424,67 @@ msgstr ""
 "Autodetekce je doporučena, jelikož nejprve zkouší WPA verze 2\n"
 "a v případě neúspěchu WPA verze 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Režim EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP správa_klíčů"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4251,12 +4493,12 @@ msgstr ""
 "seznam přípustných protokolů pro správu ověřených klíčů.\n"
 "možné hodnoty jsou WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Vnější identita EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4267,12 +4509,12 @@ msgstr ""
 "jako nešifrovaná identita u typů EAP, které podporují\n"
 "odlišnou tunelovanou identitu, např. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fáze2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4285,12 +4527,12 @@ msgstr ""
 "auth=MSCHAPV2 pro PEAP nebo\n"
 "autheap=MSCHAPV2 autheap=MD5 pro TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Certifikát EAP CA"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4305,12 +4547,12 @@ msgstr ""
 "Pokud je to možné, měl by být důvěryhodný certifikát CA vždy\n"
 "nastaven při použití TLS, TTLS nebo PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Hledání v subjektu EAP certifikátu"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4325,12 +4567,12 @@ msgstr ""
 "tento řetězec v subjektu. Část řetězce je tomto formátu:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Další direktivy"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4361,42 +4603,57 @@ msgstr ""
 "\tOstatní jako key_mgmt, eap lze použít pro vynucení\n"
 "\tzvláštních nastavení odlišných od nastavení z UI."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Je vyžadován šifrovací klíč."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
-msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
-msgstr "Předsdílený klíč by měl mít 8 až 63 ASCII znaků nebo 64 hexadecimálních znaků."
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+"Předsdílený klíč by měl mít 8 až 63 ASCII znaků nebo 64 hexadecimálních "
+"znaků."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
-msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
-msgstr "WEP klíč by měl mít nejvýše %d ASCII znaků nebo %d hexadecimálních znaků."
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+"WEP klíč by měl mít nejvýše %d ASCII znaků nebo %d hexadecimálních znaků."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 "Frekvence má povolené přípony k, M nebo G (například \"2,46G\" pro frekvenci 2,46 GHz) nebo přidejte dostatek '0' (nul)."
+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 ""
+"Frekvence má povolené přípony k, M nebo G (například \"2,46G\" pro frekvenci "
+"2,46 GHz) nebo přidejte dostatek '0' (nul)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "Intenzita má povolené přípony k, M nebo G (např. \"11M\" nebo 11M) nebo přidejte dostatečný počet '0' (nul)."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Intenzita má povolené přípony k, M nebo G (např. \"11M\" nebo 11M) nebo "
+"přidejte dostatečný počet '0' (nul)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Povolit stěhování přístupového bodu"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Bezdrátová síť \"%s\" přiřazena k rozhraní %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Ztraceno přiřazení k bezdrátové síti na rozhraní %s"
@@ -4414,18 +4671,24 @@ msgstr "Modem Alcatel Speedtouch USB"
 #: ../lib/network/connection/xdsl.pm:125
 #, 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 ""
-"Modem ECI Hi-Focus nelze podporovat díky problémům se šířením binárních ovladačů.\n"
+"Modem ECI Hi-Focus nelze podporovat díky problémům se šířením binárních "
+"ovladačů.\n"
 "\n"
 "Ovladač pro tento modem lze nalézt na adrese http://eciadsl.flashtux.org/"
 
 #: ../lib/network/connection/xdsl.pm:185
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
-msgstr "Modemy používající čipsety Conexant AccessRunner nemohou být podporovány kvůli problémům s šířením binárního firmware."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
+msgstr ""
+"Modemy používající čipsety Conexant AccessRunner nemohou být podporovány "
+"kvůli problémům s šířením binárního firmware."
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4538,6 +4801,285 @@ msgstr "Připojit"
 msgid "Hostname changed to \"%s\""
 msgstr "Název počítače změněn na \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Síťové rozhraní"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Vyberte síťové rozhraní pro nastavení:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Vyskytl se problém při restartu sítě: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Gratulujeme, nastavení sítě je ukončeno."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Správa VPN připojení"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Zařízení: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Nastavení VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS server 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Prohledávaná doména"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automaticky"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Spustit při startu"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Typ vytáčení"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Rychlost připojení"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Prodleva připojení (vteřiny)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telefonní číslo poskytovatele"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>K"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modemové připojení"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Zvolit soubor"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuvajt"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ karty"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "DMA karty"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO karty"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 karty"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Evropský protokol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol použitý ve zbytku světa \n"
+" žádný D-kanál (leased lines)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Skutečná adresa"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Bělorusko"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Adresa brány by měla být ve tvaru 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Brána(gateway)"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Rozhraní"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Žádné připojení k internetu není nastaveno"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Nemáte nastaveno žádné internetové připojení.\n"
+"Spusťte \"%s\" asistenta z Ovládacího centra Mageia Linuxu."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "První DNS server (nepovinný)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "První DNS server (nepovinný)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Druhý DNS server (nepovinný)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "První DNS server (nepovinný)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Nastavení připojení"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Přístup k tiskárně"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Doba spojení: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Stav"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testuji připojení k internetu..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP parametry"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4729,10 +5271,12 @@ msgstr "Zapisovat zprávy firewallu do systémových záznamů"
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
-"Může se vám dostat varování, pokud se někdo pokusí přistupovat k vaší službě nebo proniknout do vašeho počítače.\n"
+"Může se vám dostat varování, pokud se někdo pokusí přistupovat k vaší službě "
+"nebo proniknout do vašeho počítače.\n"
 "Vyberte prosím, které síťové aktivity by měly být sledovány."
 
 #: ../lib/network/drakfirewall.pm:316
@@ -4745,11 +5289,6 @@ msgstr "Použít interaktivní firewall"
 msgid "No device found"
 msgstr "Žádné zařízení nenalezeno"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Zařízení: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4825,14 +5364,16 @@ msgstr "Chcete spustit připojení nyní?"
 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 ""
 "Připojení VPN je nyní nastaveno.\n"
 "\n"
 "Toto připojení VPN může být automaticky spuštěno spolu s připojením k síti.\n"
-"Lze jej takto nastavit pomocí přenastavení připojení k síti a výběru tohoto připojení VPN.\n"
+"Lze jej takto nastavit pomocí přenastavení připojení k síti a výběru tohoto "
+"připojení VPN.\n"
 
 #: ../lib/network/ifw.pm:132
 #, c-format
@@ -4886,11 +5427,12 @@ msgstr "Došlo k pokusu o útok \"%s\" ze strany %s"
 
 #: ../lib/network/ifw.pm:151
 #, 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 "Aplikace \"%s\" se snaží o zpřístupnění služby (%s) na síti."
 
-#. -PO: this should be kept lowercase since the expression is meant to be used
-#. between brackets
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -4926,8 +5468,14 @@ msgstr "Vyberte prosím správný ovladač"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver description (.inf) file, or corresponding driver file (.dll or .o files). Note that only drivers up to Windows XP are supported."
-msgstr "Vyberte prosím soubor s popisem ovladače pro Windows (.inf) nebo odpovídající soubor s ovladačem (soubor .dll nebo .o). Mějte na paměti, že jsou podporovány pouze ovladače do Windows XP a starší."
+msgid ""
+"Please select the Windows driver description (.inf) file, or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
+"Vyberte prosím soubor s popisem ovladače pro Windows (.inf) nebo "
+"odpovídající soubor s ovladačem (soubor .dll nebo .o). Mějte na paměti, že "
+"jsou podporovány pouze ovladače do Windows XP a starší."
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4973,6 +5521,103 @@ msgstr "Instalovat nový ovladač"
 msgid "Select a device:"
 msgstr "Vyberte zařízení:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Napadení služby"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Automatický režim interaktivního firewallu"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Jak chcete vytáčet toto spojení?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Síťové rozhraní"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokol"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP adresa: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Napadení služby"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktivní firewall"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Bezdrátové připojení"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Jak chcete vytáčet toto spojení?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5016,20 +5661,6 @@ msgstr "Interní ISDN karta"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol použitý ve zbytku světa"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Evropský protokol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol použitý ve zbytku světa \n"
-" žádný D-kanál (leased lines)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5080,11 +5711,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Ovládání připojení"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testuji připojení k internetu..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5105,11 +5731,6 @@ msgstr "Vaše osobní telefonní číslo"
 msgid "Provider name (ex provider.net)"
 msgstr "Jméno poskytovatele (např. provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telefonní číslo poskytovatele"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5120,41 +5741,6 @@ msgstr "DNS poskytovatele č. 1 (volitelné)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS poskytovatele č. 2 (volitelné)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Typ vytáčení"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Rychlost připojení"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Prodleva připojení (vteřiny)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ karty"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "DMA karty"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO karty"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 karty"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5188,11 +5774,12 @@ 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"
-"Jestli máte ISA kartu, měly by být hodnoty na následující obrazovce správné.\n"
+"Jestli máte ISA kartu, měly by být hodnoty na následující obrazovce "
+"správné.\n"
 "\n"
 "Jestli máte PCMCIA kartu, musíte znát její IRQ a IO.\n"
 
@@ -5213,8 +5800,14 @@ msgstr "Kterou z těchto ISDN karet máte?"
 
 #: ../lib/network/netconnect.pm:461
 #, 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 "Pro tento modem je k dispozici ovladač CAPI. Tento ovladač poskytuje více možností než volně dostupný ovladač (např. posílání faxů). Který z ovladačů chcete použít?"
+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 ""
+"Pro tento modem je k dispozici ovladač CAPI. Tento ovladač poskytuje více "
+"možností než volně dostupný ovladač (např. posílání faxů). Který z ovladačů "
+"chcete použít?"
 
 #: ../lib/network/netconnect.pm:475
 #, c-format
@@ -5314,16 +5907,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Název domény"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "První DNS server (nepovinný)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Druhý DNS server (nepovinný)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5385,12 +5968,18 @@ msgstr "Při testu spojení na síti se vyskytly problémy."
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
-msgid "This can be caused by invalid network configuration, or problems with your modem or router."
-msgstr "To může být způsobeno neplatným nastavením sítě nebo problémy na vašem modemu nebo směrovači."
+msgid ""
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+"To může být způsobeno neplatným nastavením sítě nebo problémy na vašem "
+"modemu nebo směrovači."
 
 #: ../lib/network/netconnect.pm:772
 #, c-format
-msgid "You might want to relaunch the configuration to verify the connection settings."
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
 msgstr "Můžete zkusit znovu spustit nastavení a ověřit volby pro připojení."
 
 #: ../lib/network/netconnect.pm:775
@@ -5400,12 +5989,19 @@ msgstr "Gratulujeme, nastavení sítě je ukončeno."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
-msgid "However, the Internet connectivity test failed. You should test your connection manually, and verify your Internet modem or router."
-msgstr "Test připojení k Internetu nicméně selhal. Měli byste zkontrolovat vaše připojení ručně a zkontrolovat váš modem pro připojení k Internetu nebo směrovač."
+msgid ""
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
+msgstr ""
+"Test připojení k Internetu nicméně selhal. Měli byste zkontrolovat vaše "
+"připojení ručně a zkontrolovat váš modem pro připojení k Internetu nebo "
+"směrovač."
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
-msgid "If your connection does not work, you might want to relaunch the configuration."
+msgid ""
+"If your connection does not work, you might want to relaunch the "
+"configuration."
 msgstr "Pokud vaše připojení nefunguje, zkuste spustit znovu nastavení."
 
 #: ../lib/network/netconnect.pm:778
@@ -5415,7 +6011,9 @@ msgstr "Gratulujeme, nastavení sítě a Internetu je ukončeno."
 
 #: ../lib/network/netconnect.pm:779
 #, 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 ""
 "Doporučujeme po tomto kroku restartovat X Window,\n"
 "aby se předešlo problémům se změnou názvu počítače."
@@ -5517,12 +6115,14 @@ msgstr "Název počítače pro Zeroconf nemůže obsahovat tečku."
 #: ../lib/network/netconnect.pm:813
 #, 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 ""
 "Protože provádíte instalaci po síti, je již síť nastavena.\n"
-"Klepněte na Ok pro zachování nastavení nebo klepněte na Zrušit pro nové nastavení připojení internetu a k síti.\n"
+"Klepněte na Ok pro zachování nastavení nebo klepněte na Zrušit pro nové "
+"nastavení připojení internetu a k síti.\n"
 
 #: ../lib/network/netconnect.pm:816
 #, c-format
@@ -5564,7 +6164,6 @@ msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
-""
 msgstr ""
 "Máte nastaveno více způsobů, jak se připojit k internetu.\n"
 "Vyberte si jeden, který chcete použít.\n"
@@ -5582,8 +6181,12 @@ msgstr "Nastavuji síťové zařízení %s (ovladač %s)"
 
 #: ../lib/network/netconnect.pm:824
 #, c-format
-msgid "The following protocols can be used to configure a LAN connection. Please choose the one you want to use."
-msgstr "Následující protokoly lze použít pro nastavení připojení k LAN. Vyberte prosím ten, který chcete použít."
+msgid ""
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use."
+msgstr ""
+"Následující protokoly lze použít pro nastavení připojení k LAN. Vyberte "
+"prosím ten, který chcete použít."
 
 #: ../lib/network/netconnect.pm:825
 #, c-format
@@ -5607,11 +6210,6 @@ msgstr "Jedním z posledních kroků je vložení IP adresy pro DNS server(y)."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Adresa serveru DNS by měla být ve tvaru 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Adresa brány by měla být ve tvaru 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5633,8 +6231,12 @@ msgstr "Pokročilá nastavení sítě"
 
 #: ../lib/network/network.pm:524
 #, c-format
-msgid "Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."
-msgstr "Zde můžete nastavit pokročilá nastavení sítě. Chcete-li, aby se změny staly aktivní, budete muset restartovat počítač."
+msgid ""
+"Here you can configure advanced network settings. Please note that you have "
+"to reboot the machine for changes to take effect."
+msgstr ""
+"Zde můžete nastavit pokročilá nastavení sítě. Chcete-li, aby se změny staly "
+"aktivní, budete muset restartovat počítač."
 
 #: ../lib/network/network.pm:526
 #, c-format
@@ -5693,8 +6295,11 @@ msgstr "Nastavení proxy"
 
 #: ../lib/network/network.pm:549
 #, c-format
-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)"
+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)"
 
 #: ../lib/network/network.pm:550
 #, c-format
@@ -5748,7 +6353,6 @@ msgid ""
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
-""
 msgstr ""
 "Prosím vyberte, která rozhraní budou chráněna firewallem.\n"
 "\n"
@@ -5785,7 +6389,8 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:144
 #, 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:145
 #, c-format
@@ -5796,8 +6401,10 @@ msgstr "Jsou vyžadovány některé balíčky (%s), ale nejsou k dispozici."
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
-msgstr "Tyto balíčky můžete nalézt v %s nebo v oficiálních zdrojích softwaru %s ."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
+msgstr ""
+"Tyto balíčky můžete nalézt v %s nebo v oficiálních zdrojích softwaru %s ."
 
 #: ../lib/network/thirdparty.pm:152
 #, c-format
@@ -5855,8 +6462,12 @@ msgstr "Vložte disketu"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
-msgstr "Vložte disketu formátovanou systémem FAT do disketové jednotky %s s %s v kořenovém adresáři a stiskněte %s"
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
+msgstr ""
+"Vložte disketu formátovanou systémem FAT do disketové jednotky %s s %s v "
+"kořenovém adresáři a stiskněte %s"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
diff --git a/po/cy.po b/po/cy.po
index 15aa88b..0d6f676 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia drakx-net.cy\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-01 20:10-0000\n"
 "Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
 "Language-Team: Cymraeg <post@meddal.com>\n"
@@ -28,14 +28,16 @@ msgid "Interface"
 msgstr "Rhyngwyneb"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Cyfeiriad IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
@@ -71,23 +73,27 @@ msgid "Configure Local Area Network..."
 msgstr "Ffurfweddu'r Rhwydwaith Lleol..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Cymorth"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Gosod"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Diddymu"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Iawn"
@@ -97,7 +103,8 @@ msgstr "Iawn"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -106,7 +113,7 @@ msgstr "Iawn"
 msgid "Please wait"
 msgstr "Arhoswch"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Arhoswch...Gosod y ffurfweddiad"
@@ -143,6 +150,7 @@ msgstr "Addasydd %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -158,6 +166,7 @@ msgid "Started on boot"
 msgstr "Cychwyn y peiriant"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Cleient DHCP"
@@ -172,17 +181,19 @@ msgstr ""
 "Cychwynnwch y cynorthwyydd \"%s\" o Ganolfan Rheoli Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Gosod rhygnwyneb rhwydwaith newydd (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Dim IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Dim Mask"
@@ -253,12 +264,12 @@ msgstr ""
 "\n"
 "Beth hoffech ei wneud?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Analluogi"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Galluogi"
@@ -275,8 +286,8 @@ msgstr ""
 "Dewiswch y rhyngwyneb rhwydwaith sydd wedi ei gysylltu'n uniongyrchol â'r "
 "rhyngrwyd."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Dyfais Rhyngrwyd"
@@ -355,7 +366,11 @@ msgstr "Enw'r parth mewnol"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -654,13 +669,14 @@ msgstr "Cyfeiriadau caniatawyd"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Mur Cadarn Rhyngweithiol"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Methu cysylltu â daemon"
@@ -670,12 +686,12 @@ msgstr "Methu cysylltu â daemon"
 msgid "Log"
 msgstr "Cofnodion"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Caniatáu"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Rhwystro"
@@ -702,12 +718,12 @@ msgstr "Gwasanaethau rhwystrwyd"
 msgid "Clear logs"
 msgstr "Clirio cofnodion"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Rhestr Atal"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Rhestr Caniatáu"
@@ -859,7 +875,7 @@ msgstr "Modiwl"
 msgid "Enabled"
 msgstr "Galluogi"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Disgrifiad"
@@ -908,9 +924,9 @@ msgstr ""
 "ôl yr arfer a bydd eich gosodiadau rhwydwaith yn cael eu cadw i'r proffil "
 "hwn o hyn ymlaen."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Rhybudd"
@@ -2463,12 +2479,12 @@ msgstr ""
 "Rhybudd, mae cysylltiad arall gyda'r rhyngrwyd wedi ei ganfod, efallai'n "
 "defnyddio eich rhwydwaith."
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Wedi cysylltu"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Heb gysylltu"
@@ -2533,7 +2549,7 @@ msgstr "Caniatau cyfrifo defnydd"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrig"
@@ -2573,19 +2589,22 @@ msgstr "Modem cebl"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Defnyddiwch BPALogin (ar gyfer Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Dilysu"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Mewngofnod Cyfrif (enw defnyddiwr)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Cyfrinair y Cyfrif"
@@ -2712,13 +2731,15 @@ msgstr ""
 "Dylai pob eitem ei roi fel cyfeiriad IP nodiant collnod degymol\n"
 "(e.e.1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Mynedfa"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Estyn gweinyddion DNS o DHCP"
@@ -2745,21 +2766,25 @@ msgstr ""
 "Drwy ragosodiad bydd y parch chwilio'n cae ei osod o enw gwesteiwr cymwys"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Amser allan DHCP (mewn eiliadau)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Estyn gweinyddion YP o DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Estyn gwenyddion NTPD o DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Enw gwesteiwr DHCP"
@@ -2770,11 +2795,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Peidiwch dychwelyd i Zeroconf (rhwydwaith 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "dylai cyfeiriad IP fod mewn fformat  1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Dylai Netmask fod ar fformat 255.255.224.0"
@@ -2797,6 +2824,7 @@ msgstr ""
 "cychwyn wrth i'r cyfrifiadur gychwyn."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Rhowch enw'r gwesteiwr o'r cyfeiriad DHCP (neu gynhyrchu un unigryw)"
@@ -2824,6 +2852,7 @@ msgstr ""
 "localdomain' yn cael ei ddefnyddio."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Plygio byw'r Rhwydwaith"
@@ -2892,27 +2921,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem teleffon analog (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Seiliedig ar sgript"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Seiliedig ar derfynell"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4071,12 +4105,12 @@ msgstr "Allwedd Cyn Rhannu WEP/WAP2"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Gyrrwr Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4085,78 +4119,81 @@ msgstr ""
 "Mae eich cerdyn diwyfr wedi ei anablu, galluogwch y switch diwyfr(switch "
 "diffodd RF) yn gyntaf."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Gosodiadau diwyfr"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Modd Gweithredu"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Rheolwyd"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Meistr"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Eilydd"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Eilradd"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Awtomatig"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Enw'r rhwydwaith (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Modd Amgryptiedig"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Allwedd amgryptio"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Cuddio cyfrinair"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Gorfodi defnyddio'r allwedd hwn fel llinyn ASCII (e.e. Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Mewngofnod EAP/Enw defnyddiwr"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4167,12 +4204,12 @@ msgstr ""
 "Os oes angen pennu parth yna defnyddiwch y cystrawen dibrawf\n"
 "  DOMAIN\\username"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Cyfrinair EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4205,12 +4242,12 @@ msgstr ""
 "  TLS mode is completely certificate based and may ignore\n"
 "the username and password values specified here."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Tystysgrif cleient EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4223,32 +4260,37 @@ msgstr ""
 " fel dull arall i gyfuniad enw defnyddiwr/cyfrinair.\n"
 "Sylwer: mae gosodiadau eraill i'w gweld ar dudalen Uwch"
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Enw Rhwydwaith"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Amledd gweithredu"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Trothwy sensitifrwydd"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Didradd (mewn b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4271,17 +4313,19 @@ msgstr ""
 "i awto,\n"
 "gosodedig  neu ddiffodd"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Darniad"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4297,12 +4341,13 @@ msgstr ""
 "Gw. tudalen iwpriv(8) man am ragor o wybodaeth"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn lwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4321,12 +4366,13 @@ msgstr ""
 "\n"
 "Gw. tudalennau man iwpspy(8) am ragor o wybodaeth. "
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "ymresymiadau ychwanegol gorchymyn iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4354,28 +4400,28 @@ msgstr ""
 "\n"
 "Gw. tudalen iwpriv(8) man am ragor o wybodaeth."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protocol EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Awtoganfod"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4384,67 +4430,67 @@ msgstr ""
 "Mae awtoganfod yn cael ei argymell gan ei fod yn defnyddio WPA \n"
 "fersiwn 2 gan ddisgyn nôl ar fersiwn 1."
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Modd EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4453,12 +4499,12 @@ msgstr ""
 "rhestr o brotocolau rheoli allweddi dilysu derbyniol.\n"
 "gwerthoedd posib yw WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "enw allanol EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4468,12 +4514,12 @@ msgstr ""
 "Llinyn enw dienw ar gyfer EAP: gall gael ei ddefnyddio fel enw "
 "anamgryptiedig gyda mathau EAP sy'n cynnal enwau twneli gwahanol, e.e. TTLS."
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4486,12 +4532,12 @@ msgstr ""
 "auth=MSCHAPV2 ar gyfer PEAP neu\n"
 "autheap=MSCHAPV2 autheap=MD5 ar gyfer TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Tystysgrif CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4506,12 +4552,12 @@ msgstr ""
 "Os yn bosibl, dylai tystysgrif CA dibynadwy gael ei ffurfweddu bob\n"
 "tro pan yn defnyddio TLS neu TTLS neu PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "cydweddiad pwnc tystysgrif EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4526,12 +4572,12 @@ msgstr ""
 "fformat canlynol:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Cyfarwyddid ychwanegol"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4562,12 +4608,12 @@ msgstr ""
 "\tOthers such as key_mgmt, eap maybe used to force\n"
 "\tspecial settings different from the U.I settings."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Mae angen allwedd amgryptio."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4575,14 +4621,14 @@ msgid ""
 msgstr ""
 "Dylai'r allwedd cyn-rannu fod a rhwng 8 a 63 nod, neu 64 nod hecsidegol."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr "Dylai allwedd WEP fod ag uchafwm o %d nod ASCII neu %d nod hecsidegol"
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4591,7 +4637,7 @@ msgstr ""
 "Dylai Frqu gael rhagosodiad k, M neu G (ee \"2.46G\" am donfedd 2.46 GHz ), "
 "neu ychwanegu '0' (sero)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4600,17 +4646,17 @@ msgstr ""
 "Dylai'r raddfa gael rhagosodiad K, M neu G (e.e.\"11M\" am 11M),  neu "
 "ychwanegi '0' (sero)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Caniatáu crwydro pwynt mynediad"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Wedi ei gysylltu â rhwydwaith diwyfr \"%s\" ar ryngwyneb %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Wedi colli'r cysylltiad â'r rhwydwaith diwyfr ar ryngwyneb %s"
@@ -4757,6 +4803,287 @@ msgstr "Cysylltu"
 msgid "Hostname changed to \"%s\""
 msgstr "Newidiodd enw'r gwestai i \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nid oes addasydd rhwydwaith ethernet wedi ei ganfod ar eich system. Rhedwch "
+"yr offeryn ffurfweddu caledwedd."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Tynnu rhyngwyneb rhwydwaith"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Dewis y rhyngwyneb rhwydwaith i'w ffurfweddu:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Digwyddodd gwall wrth ddileu rhyngwyneb rhwydwaith \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Llongyfarchiadau, dilëwyd rhyngwyneb \"%s\" yn llwyddiannus"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Rheoli cysylltiadau"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Dyfais: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Ffurfweddiad IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Gweinydd DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Chwilio Parth"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "dim"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statig"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Cychwyn y peiriant"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Modd deialu"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Cyflymder y cysylltiad"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Oediad yn y cysylltiad (mewn eiliadau)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Rhif ffôn y darparwr"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Rheolwr llif"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Terfyn llinell"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Goramser modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Dewiswch ffeil clo"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Arhoswch am y tôn deialu cyn deialu"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Prysur arhoswch"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Sain modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ y cerdyn"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Cof Cerdyn (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO'r Cerdyn"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_O y cerdyn"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocol Ewropeaidd (EDSSI)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocol ar gyfer gweddill y byd\n"
+" dim D-Channel (llinell les)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Gwerthwr"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Dosbarth y cyfrwng"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Enw'r modiwl"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Cyfeiriad Mac"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bws"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Lleoliad ar y bws"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Dylai cyfeiriad mynedfa fod mewn fformat  1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Mynedfa:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Rhyngwyneb:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Ffurfweddiad cysylltiad â'r Rhyngrwyd"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Nid oes gennych gyswllt wedi ei ffurfweddu â'r Rhyngrwyd.\n"
+"Cychwynnwch gynorthwy-ydd \"%s\" o Ganolfan Rheoli Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Enw gwesteiwr (dewisol)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Gweinydd DNS Cyntaf (dewisol)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Ail Wasanaethwr DNS (dewisol)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Trydydd gweinydd DNS (dewisol)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Ffurfweddu Cysylltiad â'r Rhyngrwyd"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Mynediad i'r Rhyngrwyd"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Math o gyswllt:"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Statws:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Profi eich cysylltiad..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Paramedrau"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4964,11 +5291,6 @@ msgstr "Defnyddio Mur Cadarn Rhyngweithiol"
 msgid "No device found"
 msgstr "Heb ganfod dyfais"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Dyfais: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5202,6 +5524,103 @@ msgstr "Gosod gyrrwr newydd"
 msgid "Select a device:"
 msgstr "Dewis dyfais:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr "Ymosodiad proses"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Mur Cadarn Rhyngweithiol: canfod ymwthiad"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Beth hoffech wneud gyda'r ymosodwr?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Manylion yr ymosodiad"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Amser yr ymosodiad: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Rhyngwynebau rhwydwaith: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Math o ymosodiad:  %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protocol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Cyfeiriad IP yr ymosodwr: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Enw gwesteiwr yr ymosodwr: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Ymosodwyd ar wasanaeth: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Ymosodwyd ar borth: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Math o ymosodiad ICMP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Rhestr gwahardd (peidiwch gofyn eto)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Anwybyddu"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Mur Cadarn Rhyngweithiol: gwasanaeth newydd"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, c-format
+msgid "Process connection"
+msgstr "Cysylltiad proses"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Hoffech chi agor y gwasanaeth"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Cofiwch yr ateb"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5245,20 +5664,6 @@ msgstr "Cerdyn ISDN mewnol"
 msgid "Protocol for the rest of the world"
 msgstr "Protocol ar gyfer gweddill y byd"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocol Ewropeaidd (EDSSI)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocol ar gyfer gweddill y byd\n"
-" dim D-Channel (llinell les)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5309,11 +5714,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Rheolydd cysylltu"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Profi eich cysylltiad..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5334,11 +5734,6 @@ msgstr "Eich rhif ffôn personol"
 msgid "Provider name (ex provider.net)"
 msgstr "Enw darparwr (eng. darparwr.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Rhif ffôn y darparwr"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5349,41 +5744,6 @@ msgstr "Darparwr DNS 1 (dewisol)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Darparwr DNS 2 (dewisol)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Modd deialu"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Cyflymder y cysylltiad"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Oediad yn y cysylltiad (mewn eiliadau)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ y cerdyn"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Cof Cerdyn (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO'r Cerdyn"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_O y cerdyn"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5551,16 +5911,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Enw parth"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Gweinydd DNS Cyntaf (dewisol)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Ail Wasanaethwr DNS (dewisol)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5872,11 +6222,6 @@ msgstr "Yn olaf mae modd i chi deipio cyfeiriadau IP eich gweinydd DNS."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Dylai cyfeiriad DNS fod mewn fformat  1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Dylai cyfeiriad mynedfa fod mewn fformat  1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6359,16 +6704,6 @@ msgstr "Defnyddio porth UDP penodol"
 #~ "\n"
 #~ "Rwyf ar fin gosod eich Rhwydwaith Lleol gyda'r addasydd hwnnw.."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Nid oes addasydd rhwydwaith ethernet wedi ei ganfod ar eich system. "
-#~ "Rhedwch yr offeryn ffurfweddu caledwedd."
-
-#~ msgid "Connection type: "
-#~ msgstr "Math o gyswllt:"
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s yn cael ei ddefnyddio eisoes\n"
 
@@ -7362,9 +7697,6 @@ msgstr "Defnyddio porth UDP penodol"
 #~ msgid "discard"
 #~ msgstr "dileu"
 
-#~ msgid "none"
-#~ msgstr "dim"
-
 #~ msgid "tunnel"
 #~ msgstr "twnel"
 
@@ -7392,176 +7724,15 @@ msgstr "Defnyddio porth UDP penodol"
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "Rhaid allgofnodi ac i mewn eto i newidiadau ddigwydd."
 
-#~ msgid "Process attack"
-#~ msgstr "Ymosodiad proses"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Mur Cadarn Rhyngweithiol: canfod ymwthiad"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Beth hoffech wneud gyda'r ymosodwr?"
-
-#~ msgid "Attack details"
-#~ msgstr "Manylion yr ymosodiad"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Amser yr ymosodiad: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Rhyngwynebau rhwydwaith: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Math o ymosodiad:  %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protocol: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Cyfeiriad IP yr ymosodwr: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Enw gwesteiwr yr ymosodwr: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Ymosodwyd ar wasanaeth: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Ymosodwyd ar borth: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Math o ymosodiad ICMP: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Rhestr gwahardd (peidiwch gofyn eto)"
-
-#~ msgid "Ignore"
-#~ msgstr "Anwybyddu"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Mur Cadarn Rhyngweithiol: gwasanaeth newydd"
-
-#~ msgid "Process connection"
-#~ msgstr "Cysylltiad proses"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Hoffech chi agor y gwasanaeth"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Cofiwch yr ateb"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Defnyddio mewngapsiwleiddio Cisco-UDP"
 
-#~ msgid "Gateway:"
-#~ msgstr "Mynedfa:"
-
-#~ msgid "Interface:"
-#~ msgstr "Rhyngwyneb:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Rheoli cysylltiadau"
-
-#~ msgid "IP configuration"
-#~ msgstr "Ffurfweddiad IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Gweinydd DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "Chwilio Parth"
-
-#~ msgid "static"
-#~ msgstr "statig"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Cychwyn y peiriant"
-
-#~ msgid "Flow control"
-#~ msgstr "Rheolwr llif"
-
-#~ msgid "Line termination"
-#~ msgstr "Terfyn llinell"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Goramser modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Dewiswch ffeil clo"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Arhoswch am y tôn deialu cyn deialu"
-
-#~ msgid "Busy wait"
-#~ msgstr "Prysur arhoswch"
-
-#~ msgid "Modem sound"
-#~ msgstr "Sain modem"
-
-#~ msgid "Vendor"
-#~ msgstr "Gwerthwr"
-
-#~ msgid "Media class"
-#~ msgstr "Dosbarth y cyfrwng"
-
-#~ msgid "Module name"
-#~ msgstr "Enw'r modiwl"
-
-#~ msgid "Mac Address"
-#~ msgstr "Cyfeiriad Mac"
-
-#~ msgid "Bus"
-#~ msgstr "Bws"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Lleoliad ar y bws"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Tynnu rhyngwyneb rhwydwaith"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Digwyddodd gwall wrth ddileu rhyngwyneb rhwydwaith \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Llongyfarchiadau, dilëwyd rhyngwyneb \"%s\" yn llwyddiannus"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Datgysylltu..."
 
 #~ msgid "Connect..."
 #~ msgstr "Cysylltu..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Ffurfweddiad cysylltiad â'r Rhyngrwyd"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Enw gwesteiwr (dewisol)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Trydydd gweinydd DNS (dewisol)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Ffurfweddu Cysylltiad â'r Rhyngrwyd"
-
-#~ msgid "Internet access"
-#~ msgstr "Mynediad i'r Rhyngrwyd"
-
-#~ msgid "Status:"
-#~ msgstr "Statws:"
-
-#~ msgid "Parameters"
-#~ msgstr "Paramedrau"
-
 #~ msgid "Attacker"
 #~ msgstr "Ymosodwr"
 
diff --git a/po/da.po b/po/da.po
index dad4971..4ef31a3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: da\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-22 12:59+0200\n"
 "Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -31,14 +31,16 @@ msgid "Interface"
 msgstr "Grænseflade"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-adresse"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -74,23 +76,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfigurér lokalnetværk..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Hjælp"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Anvend"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Annullér"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "O.k."
@@ -100,7 +106,8 @@ msgstr "O.k."
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -109,7 +116,7 @@ msgstr "O.k."
 msgid "Please wait"
 msgstr "Vent venligst"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Vent venligst... Sætter konfigurationen i anvendelse"
@@ -145,6 +152,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmaske"
@@ -160,6 +168,7 @@ msgid "Started on boot"
 msgstr "Startede med opstart"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-klient"
@@ -174,17 +183,19 @@ msgstr ""
 "Kør '%s'-hjælperen fra Mageia Kontrolcentret"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Opsætning af et nyt netværkgrænsesnit (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Ingen IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Ingen maske"
@@ -254,12 +265,12 @@ msgstr ""
 "Den er de-aktiveret for nærværende\n"
 "Hvad ønsker du at gøre?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Deaktivér"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Aktivér"
@@ -274,8 +285,8 @@ msgstr "Genkonfigurér"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Vælg netværksgrænsesnittet som er direkte forbundet til internettet"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Net-enhed"
@@ -351,7 +362,11 @@ msgstr "Det interne domænenavn"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -651,13 +666,14 @@ msgstr "Tilladte adresser"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiv brandmur"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Kan ikke kontakte dæmon"
@@ -667,12 +683,12 @@ msgstr "Kan ikke kontakte dæmon"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Tillad"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blok"
@@ -699,12 +715,12 @@ msgstr "Blokerede tjenester"
 msgid "Clear logs"
 msgstr "Nulstíl logger"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Sortliste"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Hvidliste"
@@ -854,7 +870,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Beskrivelse"
@@ -903,9 +919,9 @@ msgstr ""
 "sædvanligt, og alle dine netværksindstillinger vil fra nu af blive gemt i "
 "denne profil."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
@@ -2468,12 +2484,12 @@ msgstr ""
 "Advarsel, en anden internetforbindelse er blevet fundet, der måske bruger "
 "dit netværk"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Ikke tilsluttet"
@@ -2538,7 +2554,7 @@ msgstr "Aktivér trafikkontering"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrisk"
@@ -2579,19 +2595,22 @@ msgstr "Kabel-modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Brug BPALogin (nødvendigt for Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Identifikation"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Konto-login (brugernavn)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Adgangskode for konto"
@@ -2716,13 +2735,15 @@ msgstr ""
 "Indtast IP konfigurationen for denne maskine. Hvert felt skal udfyldes\n"
 "med en IP adresse i `dotted-decimal' notation (for eksempel 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Få DNS-servere fra DHCP"
@@ -2749,21 +2770,25 @@ msgstr ""
 "Som standard vil søge-domænet blive sat ud fra det fuldt angivne værtsnavn"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP-tidsudløb (i sekunder)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Få YP-servere fra DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Få NTPD-servere fra DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-værtsnavn"
@@ -2774,11 +2799,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Fald ikke tilbage til Zeroconf (169.254.0.0-netværk)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresse bør have formatet 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Netmaske bør have formatet 255.255.224.0"
@@ -2801,6 +2828,7 @@ msgstr ""
 "opstart"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Tildel værtsnavn fra DHCP-adresse (eller lav et unikt)"
@@ -2828,6 +2856,7 @@ msgstr ""
 "det ikke sættes til noget, vil 'localhost.localdomain' blive brugt."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hotplugging af netværk"
@@ -2896,27 +2925,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analogt telefonmodem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skript-baseret"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal-baseret"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4075,12 +4109,12 @@ msgstr "WPA/WPA2 forud-delt nøgle"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 firmaudgave"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows driver"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4089,78 +4123,81 @@ msgstr ""
 "Dit trådløse netværkskort er deaktiveret, venligst aktivér den trådløse "
 "afbryder (RF kill switch) først."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Indstillinger for trådløst"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Udførelsestilstand"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Administreret (managed)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Forlænger (repeater)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Netværksnavn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Krypteringstilstand"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnøgle"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Skjul adgangskode"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Gennemtving brug af denne nøgle som ASCII streng (fx for Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP login/brugernavn"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4171,12 +4208,12 @@ msgstr ""
 "specificere domænet, så prøv den utestede syntaks\n"
 "  DOMÆNE\\brugernavn"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP-adgangskode"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4209,12 +4246,12 @@ msgstr ""
 "  TLS-tilstand er fuldstændig certifikatbaseret, og kan ignorere\n"
 "brugernavnet og adgangskoden angivet her."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP klientcertifikat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4227,32 +4264,37 @@ msgstr ""
 "alternativ til brug af brugernavn og adgangskode.\n"
 "Bemærk: Andre relevante indstillinger vises på \"Avanceret\"-siden."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Netværks-ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Operationsfrekvens"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Følsomhedstærskel"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (i bit/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4276,17 +4318,19 @@ msgstr ""
 "parameter til auto, fixed\n"
 "eller off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentation"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "ekstra argumenter til iwconfig kommando"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4302,12 +4346,13 @@ msgstr ""
 "Se iwconfig(8) man-siden for yderligere information."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "ekstra argumenter til iwspy-kommando"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4328,12 +4373,13 @@ msgstr ""
 "\n"
 "Se iwpspy(8) man-side for yderligere information."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "ekstra argumenter til iwpriv-kommando"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4363,28 +4409,28 @@ msgstr ""
 "\n"
 "Se iwpriv(8) man-side for yderligere information."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP-protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Automatisk detektion"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4393,67 +4439,67 @@ msgstr ""
 "Automatisk søgning anbefales da den først prøver WPA version 2 og\n"
 "dernæst WPA version 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP-tilstand"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4462,12 +4508,12 @@ msgstr ""
 "liste med accepterede autentificerede protokoller til nøglehåndtering.\n"
 "mulige værdier er WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP ydre identitet"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4478,12 +4524,12 @@ msgstr ""
 "den ukrypterede identitet med EAP-typer som støtter\n"
 "forskellige tunellerede identiteter, som TTLS."
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4496,12 +4542,12 @@ msgstr ""
 "auth=MSCHAPV2 for PEAP eller\n"
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA certifikat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4516,12 +4562,12 @@ msgstr ""
 "muligt bør et tiltroet CA-certifikat altid sættes op ved\n"
 "brug af TLS, TTLS eller PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "\"Subject\"-overensstemmelse for EAP-certifikat"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4536,12 +4582,12 @@ msgstr ""
 "\"Subject\"-teksten har følgende format:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Ekstra direktiver"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4573,12 +4619,12 @@ msgstr ""
 "\tAndre, såsom key_mgmt, eap kan bruges til at tvinge\n"
 "\tspecielle indstillinger som er forskellige fra UI-indstillingerne."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "En krypteringsnøgle kræves"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4587,14 +4633,14 @@ msgstr ""
 "The forud-delte nøgle bør have mellem 8 og 63 ASCII-tegn, or 64 "
 "heksadecimale tegn."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr "WEP nøglen bør have højst %d ASCII tegn eller %d heksadecimale tegn."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4603,7 +4649,7 @@ msgstr ""
 "Frek bør have endelsen k, M or G (for eksempel, \"2.46G\" for 2.46 GHz "
 "frekvens), eller tilføj nok '0'."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4612,17 +4658,17 @@ msgstr ""
 "Hastighed bør have endelsen k, M or G (for eksempel, \"11M\" for 11M), eller "
 "tilføj nok '0'."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Tillad viderestilling af adgangspunkt"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Tilknyttet trådløst netværk '%s' på grænseflade %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Tabte det associerede trådløse netværk på grænseflade %s"
@@ -4770,6 +4816,285 @@ msgstr "Forbind"
 msgid "Hostname changed to \"%s\""
 msgstr "Værtsnavn ændret til \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Netværksgrænsesnit"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Vælg netværksgrænsesnit, der skal konfigureres:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Et problem opstod ved genstart af netværket: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Tillykke, netværkskonfigurationen er færdig."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Administrér VPN-forbindelser"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Enhed: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN-konfiguration"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS-server 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "domæne der søges i"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatisk"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Startede med opstart"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Opringningsmåde"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Opkoblingshastighed"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Opkoblingens tidsudløb (i sekunder)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Udbyders telefonnummer"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modem-forbindelse"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Vælg fil"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kort IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kort mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kort IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kort IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protokol for Europa (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol for resten af verden \n"
+" ingen D-kanal (lejet linje)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Egentlig adresse"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Hviderusland"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway-adresse skal have formatet 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Grænseflade"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Ingen konfiguration af Internetforbindelse"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Du har ikke konfigureret nogen internetforbindelser.\n"
+"Kør '%s'-hjælperen fra Mageia Kontrolcentret"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Første DNS-server (valgfri)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Første DNS-server (valgfri)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Anden DNS-server (valgfri)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Første DNS-server (valgfri)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Forbindelses-konfiguration"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Printeradgang"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Tilslutningstid: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Status"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Tester din forbindelse..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP-parametre"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4976,11 +5301,6 @@ msgstr "Brug interaktiv brandmur"
 msgid "No device found"
 msgstr "Ingen enheder fundet"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Enhed: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5214,6 +5534,103 @@ msgstr "Installér en ny driver"
 msgid "Select a device:"
 msgstr "Vælg en enhed:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Angreb på tjeneste"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Automatisk tilstand for interaktiv brandmur"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Hvordan ønsker du at kalde denne forbindelse op?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Netværksgrænsesnit"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokol"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP-adresse: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Angreb på tjeneste"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktiv brandmur"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Trådløs forbindelse"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Hvordan ønsker du at kalde denne forbindelse op?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5257,20 +5674,6 @@ msgstr "Internt ISDN-kort"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol for resten af verden"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protokol for Europa (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol for resten af verden \n"
-" ingen D-kanal (lejet linje)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5321,11 +5724,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Opkoblingskontrol"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Tester din forbindelse..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5346,11 +5744,6 @@ msgstr "Dit personlige telefonnummer"
 msgid "Provider name (ex provider.net)"
 msgstr "Navn på udbyder (f.eks. udbyder.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Udbyders telefonnummer"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5361,41 +5754,6 @@ msgstr "Udbyder DNS 1 (valgfri)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Udbyder DNS 2 (valgfri)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Opringningsmåde"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Opkoblingshastighed"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Opkoblingens tidsudløb (i sekunder)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kort IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kort mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kort IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kort IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5561,16 +5919,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domænenavn"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Første DNS-server (valgfri)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Anden DNS-server (valgfri)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5878,11 +6226,6 @@ msgstr "Sidst, men ikke mindst, indtast din DNS-servers IP-adresser."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Adresse på DNS-server skal have formatet 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway-adresse skal have formatet 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/de.po b/po/de.po
index 3eca3c1..02b18c7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -25,14 +25,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-18 22:19+0200\n"
 "Last-Translator: Thorsten van Lil <i18n-de@ml.mageia.org>\n"
 "Language-Team: German <i18n-de@ml.mageia.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Lokalize 1.1\n"
 
@@ -47,14 +47,16 @@ msgid "Interface"
 msgstr "Schnittstelle"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-Adresse"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
@@ -90,23 +92,27 @@ msgid "Configure Local Area Network..."
 msgstr "Lokales Netzwerk konfigurieren..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Hilfe"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Anwenden"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -116,16 +122,17 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Bitte warten"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Bitte warten ... die Konfiguration wird gespeichert"
@@ -162,6 +169,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netzmaske"
@@ -177,6 +185,7 @@ msgid "Started on boot"
 msgstr "Beim Hochfahren gestartet"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-Client"
@@ -186,20 +195,24 @@ msgstr "DHCP-Client"
 msgid ""
 "This interface has not been configured yet.\n"
 "Run the \"%s\" assistant from the Mageia Linux Control Center"
-msgstr "Diese Schnittstelle ist noch nicht konfiguriert. Führen Sie den \"%s\" Assistenten im Mageia-Linux Kontroll-Zentrum aus"
+msgstr ""
+"Diese Schnittstelle ist noch nicht konfiguriert. Führen Sie den \"%s\" "
+"Assistenten im Mageia-Linux Kontroll-Zentrum aus"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Eine Netzwerkschnittstelle erstellen (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Keine lP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Keine Maske"
@@ -223,20 +236,27 @@ msgstr "Teilen der Internet-Verbindung"
 #, 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). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
-"Sie sind dabei, Ihren Rechner so zu konfigurieren, dass er die eingerichtete \n"
+"Sie sind dabei, Ihren Rechner so zu konfigurieren, dass er die "
+"eingerichtete \n"
 "Internetverbindung mit anderen Computern in Ihrem lokalen Netzwerk teilt.\n"
 "\n"
 "Stellen Sie sicher, dass Sie Ihre Netzwerk-/Internetverbindung\n"
 "mit DrakConnect eingerichtet haben, bevor Sie fortfahren.\n"
 "\n"
 "Anmerkung: Sie benötigen eine Netzwerkkarte, mit deren Hilfe Sie ein \n"
-"lokales Netz (LAN) aufsetzen können. Bitte deaktivieren sie die Mageia Firewall für die Netzwerkkarte die mit dem LAN verbunden ist, bevor Sie fortfahren."
+"lokales Netz (LAN) aufsetzen können. Bitte deaktivieren sie die Mageia "
+"Firewall für die Netzwerkkarte die mit dem LAN verbunden ist, bevor Sie "
+"fortfahren."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -259,17 +279,18 @@ msgid ""
 "\n"
 "What would you like to do?"
 msgstr ""
-"Die Einrichtung einer gemeinsamen Internet-Verbindung wurde bereits durchgeführt.\n"
+"Die Einrichtung einer gemeinsamen Internet-Verbindung wurde bereits "
+"durchgeführt.\n"
 "Momentan ist sie deaktiviert.\n"
 "\n"
 "Was wollen Sie tun?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Aktivieren"
@@ -282,10 +303,12 @@ msgstr "Rekonfigurieren"
 #: ../bin/drakgw:122
 #, c-format
 msgid "Please select the network interface directly connected to the internet."
-msgstr "Bitte wählen Sie eine Netzwerkschnittstelle aus, welche eine direkte Verbindung zum Internet hat."
+msgstr ""
+"Bitte wählen Sie eine Netzwerkschnittstelle aus, welche eine direkte "
+"Verbindung zum Internet hat."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Netz-Gerät:"
@@ -293,7 +316,8 @@ msgstr "Netz-Gerät:"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one network adapter on your system configured for LAN connections:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
@@ -303,19 +327,23 @@ msgid ""
 "disable the firewall protection on it using drakfirewall before\n"
 "configuring Internet Connection sharing."
 msgstr ""
-"Es ist nur eine Netzwerkkarte in ihrem System für LAN Verbindungen eingerichtet:\\ \n"
+"Es ist nur eine Netzwerkkarte in ihrem System für LAN Verbindungen "
+"eingerichtet:\\ \n"
 "%s\n"
 "\n"
 "Ich werden Ihr lokalen Netzwerk (LAN)  mit diesem Gerät aufsetzten.\n"
 "\n"
-"Falls Sie weitere Geräte mit dem LAN verbunden haben, deaktivieren Sie den Firewall-Schutz von diesen mit\n"
+"Falls Sie weitere Geräte mit dem LAN verbunden haben, deaktivieren Sie den "
+"Firewall-Schutz von diesen mit\n"
 "Hilfe von Drakfirewall, bevor Sie mit der\n"
 "Konfiguration zum Teilen der Internetverbindung\n"
 "fortfahren."
 
 #: ../bin/drakgw:156
 #, 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 ""
 "Bitte wählen Sie die Netzwerkkarte, die mit Ihrem lokalen Netzwerk \n"
 "verbunden ist."
@@ -359,7 +387,11 @@ msgstr "Der interne Domänen-Name"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -404,8 +436,10 @@ msgid ""
 msgstr ""
 "DHCP Server Konfiguration.\n"
 "\n"
-"Hier können Sie verschiedene Optionen für die DHCP Server-Konfiguration wählen.\n"
-"Wenn Sie die Bedeutung einer Option nicht verstehen, lassen Sie sie so wie sie ist."
+"Hier können Sie verschiedene Optionen für die DHCP Server-Konfiguration "
+"wählen.\n"
+"Wenn Sie die Bedeutung einer Option nicht verstehen, lassen Sie sie so wie "
+"sie ist."
 
 #: ../bin/drakgw:243
 #, c-format
@@ -470,13 +504,19 @@ msgstr "Druckerinformationen senden"
 #: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter configured for LAN has been detected on your system.\n"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that "
+"the Mageia firewall is not enabled for network adapter connected to your LAN "
+"network."
 msgstr ""
-"Keine für ein LAN konfigurierte Netzwerkkarte wurde in Ihrem System gefunden.\n"
+"Keine für ein LAN konfigurierte Netzwerkkarte wurde in Ihrem System "
+"gefunden.\n"
 "\n"
-"Starten Sie bitte das Hardware Konfigurationswerkzeug um sie zu konfigurieren und stellen Sie sicher, dass die Mageia Firewall für die Karte welche mit dem LAN verbunden ist nicht aktiviert ist."
+"Starten Sie bitte das Hardware Konfigurationswerkzeug um sie zu "
+"konfigurieren und stellen Sie sicher, dass die Mageia Firewall für die Karte "
+"welche mit dem LAN verbunden ist nicht aktiviert ist."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -492,11 +532,14 @@ msgstr "Die Internetverbindungsfreigabe ist nun abgeschaltet."
 #, 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 ""
 "Es wurde alles eingerichtet.\n"
-"Sie können Ihre Internetverbindung nun mit anderen Rechnern in Ihrem lokalen Netz mittels automatischer Netzwerk-Konfiguration (DHCP) und einem transparenten Proxy Cache Server (SQUID) teilen."
+"Sie können Ihre Internetverbindung nun mit anderen Rechnern in Ihrem lokalen "
+"Netz mittels automatischer Netzwerk-Konfiguration (DHCP) und einem "
+"transparenten Proxy Cache Server (SQUID) teilen."
 
 #: ../bin/drakgw:351
 #, c-format
@@ -510,7 +553,9 @@ msgstr "Es wurde eine Firewall-Konfiguration gefunden!"
 
 #: ../bin/drakgw:366
 #, 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 ""
 "WARNUNG: Eine existierende Firewall-Konfiguration wurde gefunden. \n"
 "Möglicherweise müssen Sie nach der Installation einige Einstellungen \n"
@@ -649,13 +694,14 @@ msgstr "Erlaubte Adressen"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktive Firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Dämon nicht erreichbar"
@@ -665,12 +711,12 @@ msgstr "Dämon nicht erreichbar"
 msgid "Log"
 msgstr "Protokoll"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Erlauben"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blocken"
@@ -697,12 +743,12 @@ msgstr "Geblockte Dienste"
 msgid "Clear logs"
 msgstr "Protokolle löschen"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Schwarze Liste"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Weiße Liste"
@@ -784,13 +830,18 @@ msgstr "Ein Passwort ist nötig."
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "Dieses Werkzeug erlaubt das konfigurieren einer ausfallsicheren Netzwerkschnittstelle und einer Firewall Duplizierung."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
+msgstr ""
+"Dieses Werkzeug erlaubt das konfigurieren einer ausfallsicheren "
+"Netzwerkschnittstelle und einer Firewall Duplizierung."
 
 #: ../bin/drakinvictus:102
 #, c-format
 msgid "Network redundancy (leave empty if interface is not used)"
-msgstr "Netzwerkredundanz (wenn die Schnittstelle nicht verwendet wird, leer lassen)"
+msgstr ""
+"Netzwerkredundanz (wenn die Schnittstelle nicht verwendet wird, leer lassen)"
 
 #: ../bin/drakinvictus:105
 #, c-format
@@ -848,7 +899,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Beschreibung"
@@ -865,8 +916,16 @@ msgstr "Neues Profil..."
 
 #: ../bin/draknetprofile:155
 #, c-format
-msgid "Please specify the name of the new network profile to be created (e.g., work, home, roaming, ..). This new profile will be created based on current settings, and you'll be able to configure your system configuration as usual afterwards."
-msgstr "Bitte legen Sie einen Namen für das zu erstellende Netzwerkprofil fest (z. B. Arbeit, Zuhause, ...). Das neue Profil wird mit den aktuellen Einstellungen erstellt, Sie können später jederzeit die Systemkonfiguration ändern. "
+msgid ""
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
+"settings, and you'll be able to configure your system configuration as usual "
+"afterwards."
+msgstr ""
+"Bitte legen Sie einen Namen für das zu erstellende Netzwerkprofil fest (z. "
+"B. Arbeit, Zuhause, ...). Das neue Profil wird mit den aktuellen "
+"Einstellungen erstellt, Sie können später jederzeit die Systemkonfiguration "
+"ändern. "
 
 #: ../bin/draknetprofile:166
 #, c-format
@@ -880,12 +939,18 @@ msgstr "Neues Profil erstellt"
 
 #: ../bin/draknetprofile:172
 #, c-format
-msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
-msgstr "Sie verwenden jetzt das Netzwerk-Profil %s. Sie können Ihr System wie gewohnt konfigurieren und alle Ihre Netzwerk-Einstellungen werden von nun an in diesem Profil gespeichert."
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+"Sie verwenden jetzt das Netzwerk-Profil %s. Sie können Ihr System wie "
+"gewohnt konfigurieren und alle Ihre Netzwerk-Einstellungen werden von nun an "
+"in diesem Profil gespeichert."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Warnung"
@@ -897,8 +962,12 @@ msgstr "Sind Sie sicher, dass Sie das Standard-Profil löschen wollen?"
 
 #: ../bin/draknetprofile:186
 #, c-format
-msgid "You can not delete the current profile. Please switch to a different profile first."
-msgstr "Sie können das aktuelle Profil nicht löschen. Bitte wechseln Sie zunächst zu einem anderen Profil."
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
+msgstr ""
+"Sie können das aktuelle Profil nicht löschen. Bitte wechseln Sie zunächst zu "
+"einem anderen Profil."
 
 #: ../bin/draknetprofile:194 ../bin/draknfs:356
 #, c-format
@@ -913,7 +982,8 @@ msgstr "Wählen Sie die Netzprofil-Module:"
 #: ../bin/draknetprofile:211
 #, c-format
 msgid "This tool allows you to control network profiles."
-msgstr "Dieses Programm erlaubt es Ihnen die Netzwerk-Profile zu kontrollieren."
+msgstr ""
+"Dieses Programm erlaubt es Ihnen die Netzwerk-Profile zu kontrollieren."
 
 #: ../bin/draknetprofile:212
 #, c-format
@@ -1020,33 +1090,51 @@ msgstr "Sollte ein Verzeichnis sein."
 #: ../bin/draknfs:146
 #, 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-Clients</span> können auf verschiedene Art und Weise angegeben werden:\n"
+"<span weight=\"bold\">NFS-Clients</span> können auf verschiedene Art und "
+"Weise angegeben werden:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Einzelrechner:</span> Ein Rechner, entweder durch einen Kurznamen, welcher durch die Namensauflösung erkannt wird, den vollen qualifizierten Domänennamen oder einer IP-Adresse angeben\n"
+"<span foreground=\"royalblue3\">Einzelrechner:</span> Ein Rechner, entweder "
+"durch einen Kurznamen, welcher durch die Namensauflösung erkannt wird, den "
+"vollen qualifizierten Domänennamen oder einer IP-Adresse angeben\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Netzgruppen:</span> NIS-Netzgruppen können als @Gruppe angegeben werden.\n"
+"<span foreground=\"royalblue3\">Netzgruppen:</span> NIS-Netzgruppen können "
+"als @Gruppe angegeben werden.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Platzhalter:</span> Rechnernamen können die Platzhalter „*“ und „?“ enthalten. Zum Beispiel: *.cs.foo.edu entspricht allen Rechnern in der Domäne  cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">Platzhalter:</span> Rechnernamen können die "
+"Platzhalter „*“ und „?“ enthalten. Zum Beispiel: *.cs.foo.edu entspricht "
+"allen Rechnern in der Domäne  cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">IP-Netzwerke:</span> Sie können auch Verzeichnisse für alle Rechner eines IP-(Sub)Netzwerkes gleichzeitig freigeben. Zum Beispiel durch Anhängen von `/255.255.252.0' oder `/22' an die Netzwerk-Basis-Adresse.\n"
+"<span foreground=\"royalblue3\">IP-Netzwerke:</span> Sie können auch "
+"Verzeichnisse für alle Rechner eines IP-(Sub)Netzwerkes gleichzeitig "
+"freigeben. Zum Beispiel durch Anhängen von `/255.255.252.0' oder `/22' an "
+"die Netzwerk-Basis-Adresse.\n"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1054,30 +1142,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\">Benutzer-ID Optionen</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">bilde root als anonymous ab:</span> bildet Anfragen von uid/gid 0 auf die anonymous uid/gid ab (root_squash).\n"
+"<span foreground=\"royalblue3\">bilde root als anonymous ab:</span> bildet "
+"Anfragen von uid/gid 0 auf die anonymous uid/gid ab (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">erlaube echten entfernten root-Zugriff:</span> schaltet root-squashing aus. Diese Einstellung ist hauptsächlich für festplattenlose Clients sinnvoll (no_root_squash).\n"
+"<span foreground=\"royalblue3\">erlaube echten entfernten root-Zugriff:</"
+"span> schaltet root-squashing aus. Diese Einstellung ist hauptsächlich für "
+"festplattenlose Clients sinnvoll (no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">bilde alle Benutzer als anonymous ab:</span> bilde alle uids und gids auf den Benutzer anonymous ab (all_squash). Sinnvoll für den NFS-Export von öffentlichen FTP-Verzeichnissen, News-Spool-Verzeichnissen usw. Die gegenteilige Einstellung ist „no_all_squash“ und ist die Voreinstellung.\n"
+"<span foreground=\"royalblue3\">bilde alle Benutzer als anonymous ab:</span> "
+"bilde alle uids und gids auf den Benutzer anonymous ab (all_squash). "
+"Sinnvoll für den NFS-Export von öffentlichen FTP-Verzeichnissen, News-Spool-"
+"Verzeichnissen usw. Die gegenteilige Einstellung ist „no_all_squash“ und ist "
+"die Voreinstellung.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid und anongid:</span> setzt explizit die uid und gid des anonymen Kontos.\n"
+"<span foreground=\"royalblue3\">anonuid und anongid:</span> setzt explizit "
+"die uid und gid des anonymen Kontos.\n"
 
 #: ../bin/draknfs:177
 #, c-format
@@ -1106,23 +1210,51 @@ msgstr "Fortgeschrittene Optionen"
 
 #: ../bin/draknfs:183
 #, 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> diese Option erfordert, dass Anfragen von einem Internet-Port kleiner als IPPORT_RESERVED (1024) stammen. Diese Einstellung ist standardmäßig aktiviert."
+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> diese Option erfordert, dass "
+"Anfragen von einem Internet-Port kleiner als IPPORT_RESERVED (1024) stammen. "
+"Diese Einstellung ist standardmäßig aktiviert."
 
 #: ../bin/draknfs:184
 #, 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> erlaube entweder nur lesen oder sowohl lesen und schreiben auf diesen NFS-Datenträger. Die Voreinstellung unterbindet alle Anfragen, die das Dateisystem ändern. Das kann auch explizit durch Setzen dieser Auswahl eingestellt werden."
+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> erlaube entweder nur lesen oder "
+"sowohl lesen und schreiben auf diesen NFS-Datenträger. Die Voreinstellung "
+"unterbindet alle Anfragen, die das Dateisystem ändern. Das kann auch "
+"explizit durch Setzen dieser Auswahl eingestellt werden."
 
 #: ../bin/draknfs:185
 #, 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> unterbindet das der NFS-Server gegen das NFS-Protokoll verstößt, indem er auf Anfragen reagiert, bevor irgendwelche Änderungen durch diese Anfragen auf dem Datenträger (z.B. Festplatte) vorgenommen wurden."
+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> unterbindet das der NFS-Server "
+"gegen das NFS-Protokoll verstößt, indem er auf Anfragen reagiert, bevor "
+"irgendwelche Änderungen durch diese Anfragen auf dem Datenträger (z.B. "
+"Festplatte) vorgenommen wurden."
 
 #: ../bin/draknfs:186
 #, 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> Aktiviert die Überprüfung der Unterverzeichnisse. Dies kann in manchen Fällen helfen, die Sicherheit zu verbessern, kann aber die Zuverlässigkeit verringern. Vergleiche auch die exports(5) Manpage, für weitere 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 ""
+"<span foreground=\"royalblue3\">%s</span> Aktiviert die Überprüfung der "
+"Unterverzeichnisse. Dies kann in manchen Fällen helfen, die Sicherheit zu "
+"verbessern, kann aber die Zuverlässigkeit verringern. Vergleiche auch die "
+"exports(5) Manpage, für weitere Details."
 
 #: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
@@ -1224,7 +1356,8 @@ msgstr "Bitte geben Sie ein Verzeichnis zur Freigabe an."
 #: ../bin/draknfs:533
 #, 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:548
 #, c-format
@@ -1485,8 +1618,7 @@ msgstr "Dies ist ein einfaches Werkzeug um Samba leicht zu konfigurieren."
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
@@ -1533,13 +1665,19 @@ msgstr "Kommentar:"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
-msgstr "Eine Freigabe mit dem gleichen Namen existiert bereits oder der Name der Freigabe ist leer. Bitte wählen Sie einen anderen Namen."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+"Eine Freigabe mit dem gleichen Namen existiert bereits oder der Name der "
+"Freigabe ist leer. Bitte wählen Sie einen anderen Namen."
 
 #: ../bin/draksambashare:400
 #, c-format
 msgid "Can't create the directory, please enter a correct path."
-msgstr "Kann das Verzeichnis nicht erzeugen, bitte geben Sie einen korrekten Pfad ein."
+msgstr ""
+"Kann das Verzeichnis nicht erzeugen, bitte geben Sie einen korrekten Pfad "
+"ein."
 
 #: ../bin/draksambashare:403 ../bin/draksambashare:623
 #: ../bin/draksambashare:789
@@ -1564,8 +1702,11 @@ msgstr "Hinzufügen einer speziellen Druckerfreigabe"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Ziel dieses Assistenten ist es, leicht eine neue spezielle Samba-Druckerfreigabe zu erzeugen."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Ziel dieses Assistenten ist es, leicht eine neue spezielle Samba-"
+"Druckerfreigabe zu erzeugen."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -1590,7 +1731,9 @@ msgstr "Der Assistent hat die Samba-Druckerfreigabe erfolgreich hinzugefügt"
 #: ../bin/draksambashare:552
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
-msgstr "Bitte fügen Sie einen Samba-Drucker hinzu oder wählen Sie einen aus, um ihn anpassen zu können."
+msgstr ""
+"Bitte fügen Sie einen Samba-Drucker hinzu oder wählen Sie einen aus, um ihn "
+"anpassen zu können."
 
 #: ../bin/draksambashare:570
 #, c-format
@@ -1670,7 +1813,9 @@ msgstr "DrakSamba-Eintrag"
 #: ../bin/draksambashare:695
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Bitte fügen Sie eine Samba-Freigabe hinzu oder wählen Sie ein aus, um sie ändern zu können."
+msgstr ""
+"Bitte fügen Sie eine Samba-Freigabe hinzu oder wählen Sie ein aus, um sie "
+"ändern zu können."
 
 #: ../bin/draksambashare:718
 #, c-format
@@ -1704,8 +1849,11 @@ msgstr "Öffentlich:"
 
 #: ../bin/draksambashare:795
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Erzeuger-Maske, Erzeuger-Modus und Verzeichnismaske müssen numerisch sein (z.B. 0755)."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Erzeuger-Maske, Erzeuger-Modus und Verzeichnismaske müssen numerisch sein (z."
+"B. 0755)."
 
 #: ../bin/draksambashare:803
 #, c-format
@@ -1754,8 +1902,12 @@ msgstr "Samba-Server Konfigurationsassistent"
 
 #: ../bin/draksambashare:1057
 #, c-format
-msgid "Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
-msgstr "Samba erlaubt es Ihrem Server als Datei- und Druckerserver für Arbeitsplatzrechner zu dienen, auf denen keine Linux-Systeme laufen."
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
+msgstr ""
+"Samba erlaubt es Ihrem Server als Datei- und Druckerserver für "
+"Arbeitsplatzrechner zu dienen, auf denen keine Linux-Systeme laufen."
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1764,18 +1916,29 @@ msgstr "PDC server: primärer Domänenkontroller"
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
-msgstr "Ein Server, der als PDC konfiguriert ist, übernimmt die Windows Authentifizierung in der gesamten Domain."
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+"Ein Server, der als PDC konfiguriert ist, übernimmt die Windows "
+"Authentifizierung in der gesamten Domain."
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Einzelserver-Installationen können smbpasswd oder tdbsam Passwort-Backends nutzen"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Einzelserver-Installationen können smbpasswd oder tdbsam Passwort-Backends "
+"nutzen"
 
 #: ../bin/draksambashare:1073
 #, 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 "Domänen-Master = ja, veranlasst den Server, einen NetBIOS Namen <pdc name> einzutragen. Dieser Name wird von anderen Servern erkannt werden."
+msgid ""
+"Domain master = yes, causes the server to register the NetBIOS name <pdc "
+"name>. This name will be recognized by other servers."
+msgstr ""
+"Domänen-Master = ja, veranlasst den Server, einen NetBIOS Namen <pdc name> "
+"einzutragen. Dieser Name wird von anderen Servern erkannt werden."
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -1799,8 +1962,17 @@ msgstr "OS Level:"
 
 #: ../bin/draksambashare:1092
 #, 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 "Der globale OS-Level beeinflusst den OS-Level, den Samba während der Browserauswahl angibt. Wenn Sie Samba als Master-Browser definieren wollen, sollten Sie den OS-Level höher ansetzen als den des Betriebssystems mit dem höchsten Level in Ihrem Netzwerk, also z.B. 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 ""
+"Der globale OS-Level beeinflusst den OS-Level, den Samba während der "
+"Browserauswahl angibt. Wenn Sie Samba als Master-Browser definieren wollen, "
+"sollten Sie den OS-Level höher ansetzen als den des Betriebssystems mit dem "
+"höchsten Level in Ihrem Netzwerk, also z.B. os level = 34"
 
 #: ../bin/draksambashare:1096
 #, c-format
@@ -1815,7 +1987,9 @@ msgstr "Arbeitsgruppe"
 #: ../bin/draksambashare:1103
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Samba muss die Windows Arbeitsgruppe kennen, für die es als Server dienen wird."
+msgstr ""
+"Samba muss die Windows Arbeitsgruppe kennen, für die es als Server dienen "
+"wird."
 
 #: ../bin/draksambashare:1110 ../bin/draksambashare:1177
 #, c-format
@@ -1839,18 +2013,30 @@ msgstr "Sicherheitsmodus:"
 
 #: ../bin/draksambashare:1122
 #, c-format
-msgid "User level: the client sends a session setup request directly following protocol negotiation. This request provides a username and password."
-msgstr "User Level: der Client sendet direkt nach der Protokoll-Verständigung eine Anfrage. Diese Anfrage enthält einen Usernamen und ein Passwort."
+msgid ""
+"User level: the client sends a session setup request directly following "
+"protocol negotiation. This request provides a username and password."
+msgstr ""
+"User Level: der Client sendet direkt nach der Protokoll-Verständigung eine "
+"Anfrage. Diese Anfrage enthält einen Usernamen und ein Passwort."
 
 #: ../bin/draksambashare:1122
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
-msgstr "Share Level: der Client authentifiziert sich selbst für jedes einzelne Share"
+msgstr ""
+"Share Level: der Client authentifiziert sich selbst für jedes einzelne Share"
 
 #: ../bin/draksambashare:1122
 #, 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 "Domain Level: bietet eine Funktion zum Speichern aller Gruppen- und Userkonten in einem zentralen, gemeinsam genutzten, Repositorium. Das zentrale Kontenrepositorium wird von den Domain- (Sicherheits-)Controllern gemeinsam genutzt."
+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 ""
+"Domain Level: bietet eine Funktion zum Speichern aller Gruppen- und "
+"Userkonten in einem zentralen, gemeinsam genutzten, Repositorium. Das "
+"zentrale Kontenrepositorium wird von den Domain- (Sicherheits-)Controllern "
+"gemeinsam genutzt."
 
 #: ../bin/draksambashare:1133
 #, c-format
@@ -1864,8 +2050,11 @@ msgstr "Server Banner."
 
 #: ../bin/draksambashare:1138
 #, c-format
-msgid "The banner is the way this server will be described in the Windows workstations."
-msgstr "Das Banner ist die Beschreibung dieses Servers auf den Windows-Workstations."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"Das Banner ist die Beschreibung dieses Servers auf den Windows-Workstations."
 
 #: ../bin/draksambashare:1143
 #, c-format
@@ -1884,8 +2073,12 @@ msgstr "Samba-Log"
 
 #: ../bin/draksambashare:1154
 #, c-format
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
-msgstr "Logdatei: nutze file.%m um eine eigene Logdatei für jede verbundene Maschine zu erstellen"
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
+"Logdatei: nutze file.%m um eine eigene Logdatei für jede verbundene Maschine "
+"zu erstellen"
 
 #: ../bin/draksambashare:1154
 #, c-format
@@ -1895,7 +2088,8 @@ msgstr "Logstufe: Setze den Ausführlichkeitsgrad des Logs (0<= Logstufe <=10)"
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Max. Loggröße: Setze eine ober Schranke für die Größe der Logfiles (in Kb)."
+msgstr ""
+"Max. Loggröße: Setze eine ober Schranke für die Größe der Logfiles (in Kb)."
 
 #: ../bin/draksambashare:1161 ../bin/draksambashare:1179
 #, c-format
@@ -1919,13 +2113,22 @@ msgstr "Der Assistent sammelte die folgenden Parameter, um Samba einzurichten."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
-msgstr "Um diese Werte zu akzeptieren und Ihren Server einzurichten, klicken Sie den Weiter-Knopf oder nutzen Sie den Zurück-Knopf, um die Angaben zu korrigieren."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Um diese Werte zu akzeptieren und Ihren Server einzurichten, klicken Sie den "
+"Weiter-Knopf oder nutzen Sie den Zurück-Knopf, um die Angaben zu korrigieren."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Wenn Sie bereits Freigaben eingerichtet haben, werden sie in dieser Einrichtung erscheinen. Nutzen Sie den 'Sambashare Drakwizard', um Ihre Freigaben zu verwalten."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run 'drakwizard sambashare' to manage your shares."
+msgstr ""
+"Wenn Sie bereits Freigaben eingerichtet haben, werden sie in dieser "
+"Einrichtung erscheinen. Nutzen Sie den 'Sambashare Drakwizard', um Ihre "
+"Freigaben zu verwalten."
 
 #: ../bin/draksambashare:1176
 #, c-format
@@ -2081,7 +2284,9 @@ msgstr "Netzwerk auf Schnittstelle %s ist inaktiv."
 msgid ""
 "You do not have any configured Internet connection.\n"
 "Run the \"%s\" assistant from the Mageia Linux Control Center"
-msgstr "Sie haben noch keine Internet-Verbindung konfiguriert. Führen Sie den \"%s\" Assistenten im Mageia-Linux Kontroll-Zentrum aus"
+msgstr ""
+"Sie haben noch keine Internet-Verbindung konfiguriert. Führen Sie den \"%s\" "
+"Assistenten im Mageia-Linux Kontroll-Zentrum aus"
 
 #: ../bin/net_applet:107 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2275,7 +2480,9 @@ msgstr "Verbindung hergestellt."
 msgid ""
 "Connection failed.\n"
 "Verify your configuration in the Mageia Linux Control Center."
-msgstr "Verbindung fehlgeschlagen. Überprüfen Sie Ihre Konfiguration im Mageia-Linux Kontroll-Zentrum."
+msgstr ""
+"Verbindung fehlgeschlagen. Überprüfen Sie Ihre Konfiguration im Mageia-Linux "
+"Kontroll-Zentrum."
 
 #: ../bin/net_monitor:360
 #, c-format
@@ -2314,15 +2521,19 @@ msgstr "Lokale Messung"
 
 #: ../bin/net_monitor:512
 #, c-format
-msgid "Warning, another internet connection has been detected, maybe using your network"
-msgstr "WARNUNG: Es wurde eine weitere Internetverbindung gefunden. Vielleicht nutzt diese ihr Netzwerk"
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"WARNUNG: Es wurde eine weitere Internetverbindung gefunden. Vielleicht nutzt "
+"diese ihr Netzwerk"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nicht Verbunden"
@@ -2387,7 +2598,7 @@ msgstr "Traffic-Accounting aktivieren"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Erlaubt der Schnittstelle, vom Netzwerk-Manager gesteuert zu werden."
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrisch"
@@ -2429,19 +2640,22 @@ msgstr "Kabel Modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Benutze BPALogin (Für Telstra nötig)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Authentifizierung"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Benutzername (Login)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Passwort"
@@ -2495,7 +2709,8 @@ msgid ""
 "Entering the wrong PIN code multiple times may lock your SIM card!"
 msgstr ""
 "Sie haben eine falsche PIN eingegeben.\n"
-"Wenn Sie die PIN wiederholt falsch eingeben, kann die SIM-Karte gesperrt werden!"
+"Wenn Sie die PIN wiederholt falsch eingeben, kann die SIM-Karte gesperrt "
+"werden!"
 
 #: ../lib/network/connection/dvb.pm:9
 #, c-format
@@ -2540,7 +2755,9 @@ msgstr "Virtuelle Schnittstelle"
 #: ../lib/network/connection/ethernet.pm:60
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Es ist nicht möglich, eine Netzwerkschnittstelle für das ausgewähle Gerät zu finden (verwende Treiber %s)"
+msgstr ""
+"Es ist nicht möglich, eine Netzwerkschnittstelle für das ausgewähle Gerät zu "
+"finden (verwende Treiber %s)"
 
 #: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
@@ -2568,13 +2785,15 @@ msgstr ""
 "Jeder Eintrag muss als dezimale IP-Adresse in Punktschreibweise \n"
 "angegeben werden (etwa  „192.168.1.42“)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS-Server via DHCP bekommen"
@@ -2597,24 +2816,30 @@ msgstr "Suchdomäne"
 #: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
-msgstr "Standardmäßig wird die Suchdomäne aus dem FQDN (fully qualified domain name) erzeugt."
+msgstr ""
+"Standardmäßig wird die Suchdomäne aus dem FQDN (fully qualified domain name) "
+"erzeugt."
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP-Zeitschranke (in Sekunden)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP-Server via DHCP bekommen"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD-Server via DHCP bekommen"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-Rechnername"
@@ -2625,11 +2850,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Kein zurückspringen zu Zeroconf (169.254.0.0 Netzwerk)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Die IP-Adresse sollte etwa die Form „192.168.1.42“ haben!"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Die Netzmaske sollte das Format „255.255.224.0“ haben"
@@ -2641,25 +2868,48 @@ msgstr "Warnung: IP-Adresse %s ist üblicherweise reserviert!"
 
 #: ../lib/network/connection/ethernet.pm:195
 #, c-format
-msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
-msgstr "%s wird bereits benutzt von einer Verbindung, die während des Boot-Prozesses gestartet wird (%s). Um diese Adresse mit dieser Verbindung zu benutzen, deaktivieren Sie bitte zuerst andere Geräte, die diese benutzen, oder ändern Sie die Konfiguration, so dass diese nicht beim Boot-Prozess gestartet werden. "
+msgid ""
+"%s is already used by a connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start at boot"
+msgstr ""
+"%s wird bereits benutzt von einer Verbindung, die während des Boot-Prozesses "
+"gestartet wird (%s). Um diese Adresse mit dieser Verbindung zu benutzen, "
+"deaktivieren Sie bitte zuerst andere Geräte, die diese benutzen, oder ändern "
+"Sie die Konfiguration, so dass diese nicht beim Boot-Prozess gestartet "
+"werden. "
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Name des Hosts über DHCP zuweisen"
 
 #: ../lib/network/connection/ethernet.pm:223
 #, c-format
-msgid "This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically."
-msgstr "Dies erlaubt dem Server, einen Namen für diese Maschine festzulegen. Wenn der Server keinen gültigen Host-Namen vergibt, dann wird der Name automatisch generiert. "
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+"Dies erlaubt dem Server, einen Namen für diese Maschine festzulegen. Wenn "
+"der Server keinen gültigen Host-Namen vergibt, dann wird der Name "
+"automatisch generiert. "
 
 #: ../lib/network/connection/ethernet.pm:226
 #, c-format
-msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
-msgstr "Sie sollten einen Host-Namen für diesen Computer festlegen, der diesen PC identifiziert. Dieser Host-Name wird mit allen Netzwerk-Verbingungen geteilt. Wenn Sie dieses Feld leer lassen, wird 'localhost.localdomain\" verwendet. "
+msgid ""
+"You should define a hostname for this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections.  If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+"Sie sollten einen Host-Namen für diesen Computer festlegen, der diesen PC "
+"identifiziert. Dieser Host-Name wird mit allen Netzwerk-Verbingungen "
+"geteilt. Wenn Sie dieses Feld leer lassen, wird 'localhost.localdomain\" "
+"verwendet. "
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Netzwerk Hotplugging"
@@ -2677,7 +2927,8 @@ msgstr "Link auf Schnittstelle %s erkannt"
 #: ../lib/network/connection/ethernet.pm:307
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
-msgstr "Fordere eine Netzwerkadresse für die Schnittstelle %s ( %s Protokoll) an ..."
+msgstr ""
+"Fordere eine Netzwerkadresse für die Schnittstelle %s ( %s Protokoll) an ..."
 
 #: ../lib/network/connection/ethernet.pm:308
 #, c-format
@@ -2728,27 +2979,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analoges Modem"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skript-basiert"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal-basiert"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3907,88 +4163,97 @@ msgstr "WPA/WPA2 mit verteilten Schlüsseln"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows Treiber"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
-msgstr "Ihre WLAN Karte ist deaktiviert. Bitte aktivieren Sie die WLAN Karte (RF kill switch) als erstes."
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
+msgstr ""
+"Ihre WLAN Karte ist deaktiviert. Bitte aktivieren Sie die WLAN Karte (RF "
+"kill switch) als erstes."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Wireless-Einstellungen"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Betriebsmodus"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Direkt"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Geführt"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundär"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatisch"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Netzwerkname (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Verschlüsselungsmodus"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Schlüssel"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Passwort verbergen"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
-msgstr "Erzwinge die Nutzung dieses Schlüssels als ASCII-Zeichenkette (z.B. für Livebox)"
+msgstr ""
+"Erzwinge die Nutzung dieses Schlüssels als ASCII-Zeichenkette (z.B. für "
+"Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP Login/Benutzername"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3999,12 +4264,12 @@ msgstr ""
 "eine Domain angeben müssen, dann versuchen Sie die\n"
 "ungetestete Syntax DOMAIN\\username"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP Passwort"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4035,14 +4300,15 @@ msgstr ""
 "Hinweis:\n"
 "\tDie Einstellungen MD5, MSCHAPV2, OTP und GTC\n"
 "benutzen automatisch die Modi PEAP und TTLS.\n"
-"  TLS Mode basiert allein auf Zertifikaten und wird daher definierte Usernamen und Passwörter ignorieren."
+"  TLS Mode basiert allein auf Zertifikaten und wird daher definierte "
+"Usernamen und Passwörter ignorieren."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP Client Zertifikat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4055,72 +4321,91 @@ msgstr ""
 "Das kann eine Alternative zur Username/Passwort-Kombination sein.\n"
 "Hinweis: weitere Einstellungen auf der Erweitert-Seite."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Netzwerk-ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Übertragungsfrequenz"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Empfindlichkeitsschwelle"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, 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 "RTS/CTS fügt einen Handshake vor jeder Paketübertragung ein, um sicherzustellen, dass der Kanal sauber ist. Dies erhöht den Aufwand, aber verbessert die Leistung bei versteckten Knoten oder einer großen Anzahl aktiver Knoten. Dieser Parameter setzt die Größe des kleinsten Pakets, für das der Knoten ein RTS sendet. Die Angabe der maximalen Paketgröße schaltet dieses Verfahren aus. Sie können diesen Parameter auch auf „auto“, „fest“ oder „aus“ stellen."
+msgstr ""
+"RTS/CTS fügt einen Handshake vor jeder Paketübertragung ein, um "
+"sicherzustellen, dass der Kanal sauber ist. Dies erhöht den Aufwand, aber "
+"verbessert die Leistung bei versteckten Knoten oder einer großen Anzahl "
+"aktiver Knoten. Dieser Parameter setzt die Größe des kleinsten Pakets, für "
+"das der Knoten ein RTS sendet. Die Angabe der maximalen Paketgröße schaltet "
+"dieses Verfahren aus. Sie können diesen Parameter auch auf „auto“, „fest“ "
+"oder „aus“ stellen."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentierung"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Zusätzliche Argumente für den Befehl iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 ""
 "Hier können Sie zusätzliche Parameter einstellen wie:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (Nick ist bereits als Hostname gesetzt).\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (Nick ist bereits als "
+"Hostname gesetzt).\n"
 "Die iwconfig(8) Manpages liefern weitere Informationen."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Zusätzliche Argumente für den Befehl lwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4131,133 +4416,142 @@ msgid ""
 "\n"
 "See iwpspy(8) man page for further information."
 msgstr ""
-"iwspy setzt eine Adressliste an einer drahtlosen Netzwerkschnittstelle und gibt die Verbindungsqualität für jede Adresse zurück. \n"
+"iwspy setzt eine Adressliste an einer drahtlosen Netzwerkschnittstelle und "
+"gibt die Verbindungsqualität für jede Adresse zurück. \n"
 "\n"
 "Diese Information ist identisch mit der aus /proc/net/wireless:\n"
 "Verbindungsqualität, Signalstärke und Rauschpegel.\n"
 "\n"
 "Die iwpspy(8) Manpages liefern weitere Informationen."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Extra-Argumente für den Befehl iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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 setzt optionale (private) Parameter für die drahtlose Netzwerkschnittstelle.\n"
+"iwpriv setzt optionale (private) Parameter für die drahtlose "
+"Netzwerkschnittstelle.\n"
 "\n"
-"iwpriv nimmt die zum jeweiligen Treiber gehörigen Parameter und Einstellungen vor \n"
+"iwpriv nimmt die zum jeweiligen Treiber gehörigen Parameter und "
+"Einstellungen vor \n"
 "(gegenüber iwconfig, was allgemeine Parameter behandelt).\n"
 "\n"
-"Theoretisch sollte die Dokumentation jedes Treibers die spezifischen Parameter\n"
+"Theoretisch sollte die Dokumentation jedes Treibers die spezifischen "
+"Parameter\n"
 "und deren Auswirkung erläutern.\n"
 "\n"
 "Die Manpages zu iwpriv(8) geben weitere Informationen."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP-Protokoll"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Autoerkennung"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
 "a fallback to WPA version 1"
 msgstr ""
-"Die empfohlene Einstellung ist Auto Detect. Sie probiert zuerst WPA2 mit einer \n"
+"Die empfohlene Einstellung ist Auto Detect. Sie probiert zuerst WPA2 mit "
+"einer \n"
 "Fallback-Option auf WPA1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP-Modus"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4266,12 +4560,12 @@ msgstr ""
 "Liste der akzeptierten Authentifizierungs-Protokolle.\n"
 "Mögliche Werte sind WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP äussere Identität"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4282,12 +4576,12 @@ msgstr ""
 "unverschlüsselte Identität mit EAP-Typen, die verschiedene\n"
 "getunnelte Identitäten unterstützen, z.B. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP Phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4300,12 +4594,12 @@ msgstr ""
 "auth=MSCHAPV2 für PEAP oder\n"
 "autheap=MSCHAPV2 autheap=MD5 für TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA Zertifikat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4321,12 +4615,12 @@ msgstr ""
 "TLS, TTLS oder PEAP immer ein vertrautes CA-Zertifikat\n"
 "vorhanden sein."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP-Zertifikat Titelübereinstimmung"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4336,17 +4630,18 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 " Zeichenkette, die mit dem Titel des Zertifikats des \n"
-"Authentifizierungsservers abgeglichen wird. Wenn dieser Parameter gesetzt ist, wird das Server-\n"
+"Authentifizierungsservers abgeglichen wird. Wenn dieser Parameter gesetzt "
+"ist, wird das Server-\n"
 "zertifikat nur akzeptiert, wenn es diese Zeichenfolge\n"
 "im Titel trägt.  Die Zeichenkette hat das folgende Format:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Spezielle Anweisungen"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4363,7 +4658,8 @@ msgid ""
 "\tOthers such as key_mgmt, eap maybe used to force\n"
 "\tspecial settings different from the U.I settings."
 msgstr ""
-"Hier können Sie zusätzliche Einstellungen für wpa_supplicant angeben. Das erwartete Format ist ein\n"
+"Hier können Sie zusätzliche Einstellungen für wpa_supplicant angeben. Das "
+"erwartete Format ist ein\n"
 "Paar von Zeichenketten wie Feld=Wert. Es können \n"
 "mehrere Werte gesetzt werden, wobei die Werte durch\n"
 "eine Raute(#) getrennt werden.\n"
@@ -4378,42 +4674,59 @@ msgstr ""
 "\tAndere wie key_mgmt, eap können benutzt werden um \n"
 "\tbesondere Einstellungen zu erzwingen."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Ein Schlüssel ist notwendig"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
-msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
-msgstr "Ein pre-shared Schlüssel sollte zwischen 8 und 63 ASCII-Zeichen oder 64 hexadezimale Zeichen haben."
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+"Ein pre-shared Schlüssel sollte zwischen 8 und 63 ASCII-Zeichen oder 64 "
+"hexadezimale Zeichen haben."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
-msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
-msgstr "Der WEP-Schlüssel sollte höchstens %d ASCII- oder %d hexadezimale Zeichen lang sein."
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+"Der WEP-Schlüssel sollte höchstens %d ASCII- oder %d hexadezimale Zeichen "
+"lang sein."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 "Die Frequenz sollte entweder die Einheiten ‚K‘, ‚M‘ und ‚G‘ nutzen (etwa „2.46G“ für 2,46GHz) oder die entsprechende Anzahl 0 (Nullen) angehängt werden."
+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 ""
+"Die Frequenz sollte entweder die Einheiten ‚K‘, ‚M‘ und ‚G‘ nutzen (etwa "
+"„2.46G“ für 2,46GHz) oder die entsprechende Anzahl 0 (Nullen) angehängt "
+"werden."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "Die Rate sollte entweder die Einheiten ‚K‘, ‚M‘ und ‚G‘ nutzen (etwa „11M“ für 11M) oder die entsprechende Anzahl Nullen (0) angehängt werden."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Die Rate sollte entweder die Einheiten ‚K‘, ‚M‘ und ‚G‘ nutzen (etwa „11M“ "
+"für 11M) oder die entsprechende Anzahl Nullen (0) angehängt werden."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Erlaube Access-Point-Roaming"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Verbinde die angeschlossene Schnittstelle %s mit de WLAN Netz \"%s\""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Netzwerkverbindung der Schnittstelle %s verloren"
@@ -4431,7 +4744,8 @@ msgstr "Alcatel Speedtouch USB-Modem"
 #: ../lib/network/connection/xdsl.pm:125
 #, 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 ""
@@ -4442,8 +4756,12 @@ msgstr ""
 
 #: ../lib/network/connection/xdsl.pm:185
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
-msgstr "Modems mit Conexant AccessRunner Chipsets können wegen des Distributionsproblems mit binärer Firmware nicht unterstützt werden."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
+msgstr ""
+"Modems mit Conexant AccessRunner Chipsets können wegen des "
+"Distributionsproblems mit binärer Firmware nicht unterstützt werden."
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4556,6 +4874,287 @@ msgstr "Verbinden"
 msgid "Hostname changed to \"%s\""
 msgstr "Hostname verändert zu \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Netzwerkschnittstelle"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Wählen Sie die Netzwerkkarte zum konfigurieren"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Beim Neustart des Netzwerks trat ein Fehler auf: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Herzlichen Glückwunsch, die Netzwerkeinrichtung ist beendet."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "VPN Verbindungen verwalten"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Gerät: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN Konfiguration"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS-Server 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Suchdomäne"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatisch"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Beim Hochfahren gestartet"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Wählmodus"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Verbindungsgeschwindigkeit"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Verbindungs-Timeout (in Sec)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telefonnummer des Providers"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<STRG>-Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modem-Verbindung"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Datei auswählen"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Karten-IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Karten-Mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Karten-E/A"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Karten-E/A_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europäisches Protokoll (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokoll für den Rest der Welt \n"
+"ohne D-Kanal (Leased Lines)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Echte Adresse"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Weißrussland"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Die IP-Adresse des Gateways sollte etwa die Form „192.168.1.42“ haben!"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Schnittstelle"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Keine Internetverbindung konfiguriert"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Sie haben noch keine Internet-Verbindung konfiguriert. Führen Sie den \"%s\" "
+"Assistenten im Mageia-Linux Kontroll-Zentrum aus"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Erster DNS-Server (optional)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Erster DNS-Server (optional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Zweiter DNS-Server (optional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Erster DNS-Server (optional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Verbindungskonfiguration"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Druckerzugriff"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr ""
+"Verbindungs-\n"
+"Dauer: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Status"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Ihre Verbindung wird getestet..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP-Parameter"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4747,10 +5346,12 @@ msgstr "Firewall-Meldungen in den System Logs aufzeichnen"
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
-"Sie können gewarnt werden, wenn jemand auf einen Dienst zugreift oder versucht, in Ihren Rechner einzudringen.\n"
+"Sie können gewarnt werden, wenn jemand auf einen Dienst zugreift oder "
+"versucht, in Ihren Rechner einzudringen.\n"
 "Bitte wählen Sie, welche Netzwerk-Aktivitäten beobachtet werden sollen."
 
 #: ../lib/network/drakfirewall.pm:316
@@ -4763,11 +5364,6 @@ msgstr "Interaktive-Firewall verwenden"
 msgid "No device found"
 msgstr "Keine Geräte gefunden"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Gerät: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4806,7 +5402,9 @@ msgstr "Der Verbindungstyp %s konnte nicht initialisiert werden!"
 #: ../lib/network/drakvpn.pm:60
 #, c-format
 msgid "Please select an existing VPN connection or enter a new name."
-msgstr "Wählen Sie bitte eine bestehende VPN Verbindung aus oder geben Sie einen neuen Namen ein."
+msgstr ""
+"Wählen Sie bitte eine bestehende VPN Verbindung aus oder geben Sie einen "
+"neuen Namen ein."
 
 #: ../lib/network/drakvpn.pm:64
 #, c-format
@@ -4821,7 +5419,9 @@ msgstr "Neuer Name"
 #: ../lib/network/drakvpn.pm:70
 #, c-format
 msgid "You must select an existing connection or enter a new name."
-msgstr "Sie müssen eine bestehende Verbindung auswählen oder ein neuen Namen eingeben."
+msgstr ""
+"Sie müssen eine bestehende Verbindung auswählen oder ein neuen Namen "
+"eingeben."
 
 #: ../lib/network/drakvpn.pm:81
 #, c-format
@@ -4843,13 +5443,17 @@ msgstr "Wollen Sie die Verbindung jetzt starten?"
 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 ""
 "Die VPN Verbindung ist jetzt konfiguriert.\n"
 "\n"
-"Die VPN Verbindung kann automatisch mit einer Netzwerkverbindung gestartet werden.\n"
-"Dies kann erfolgen, in dem die Netzwerkverbindung neu konfiguriert wird und die VPN Verbindung ausgewählt wird.\n"
+"Die VPN Verbindung kann automatisch mit einer Netzwerkverbindung gestartet "
+"werden.\n"
+"Dies kann erfolgen, in dem die Netzwerkverbindung neu konfiguriert wird und "
+"die VPN Verbindung ausgewählt wird.\n"
 
 #: ../lib/network/ifw.pm:132
 #, c-format
@@ -4903,11 +5507,14 @@ msgstr "Ein \"%s\"-Angriff wurde durch %s versucht"
 
 #: ../lib/network/ifw.pm:151
 #, c-format
-msgid "The \"%s\" application is trying to make a service (%s) available to the network."
-msgstr "Das Programm \"%s\" versucht den Dienst (%s) für das Netzwerk erreichbar zu machen."
+msgid ""
+"The \"%s\" application is trying to make a service (%s) available to the "
+"network."
+msgstr ""
+"Das Programm \"%s\" versucht den Dienst (%s) für das Netzwerk erreichbar zu "
+"machen."
 
-#. -PO: this should be kept lowercase since the expression is meant to be used
-#. between brackets
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -4943,8 +5550,14 @@ msgstr "Bitte wählen Sie den entsprechenden Treiber"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver description (.inf) file, or corresponding driver file (.dll or .o files). Note that only drivers up to Windows XP are supported."
-msgstr "Bitte wählen Sie die Windows-Treiber Beschreibung (.inf), oder die entsprechende Treiber-Datei (.dll oder .o Datei) aus. Beachten Sie, dass nur Treiber bis Windows XP unterstützt werden. "
+msgid ""
+"Please select the Windows driver description (.inf) file, or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
+"Bitte wählen Sie die Windows-Treiber Beschreibung (.inf), oder die "
+"entsprechende Treiber-Datei (.dll oder .o Datei) aus. Beachten Sie, dass nur "
+"Treiber bis Windows XP unterstützt werden. "
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4990,6 +5603,103 @@ msgstr "Einen neuen Treiber installieren"
 msgid "Select a device:"
 msgstr "Wählen Sie ein Gerät aus:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Dienstangriff"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Automatischer Modus der interaktiven Firewall"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Wie soll sich diese Verbindung einwählen?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Netzwerkschnittstelle"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP-Adresse: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Dienstangriff"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktive Firewall"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Wireless Verbindung"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Wie soll sich diese Verbindung einwählen?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5033,20 +5743,6 @@ msgstr "Interne ISDN-Karte"
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll für den Rest der Welt"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europäisches Protokoll (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokoll für den Rest der Welt \n"
-"ohne D-Kanal (Leased Lines)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5097,11 +5793,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Verbindungskontrolle"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Ihre Verbindung wird getestet..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5124,11 +5815,6 @@ msgstr "Ihre eigene Telefonnummer"
 msgid "Provider name (ex provider.net)"
 msgstr "Name des Providers (z.B. provider.net) "
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telefonnummer des Providers"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5139,41 +5825,6 @@ msgstr "Erster DNS des Providers (optional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Zweiter DNS des Providers (optional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Wählmodus"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Verbindungsgeschwindigkeit"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Verbindungs-Timeout (in Sec)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Karten-IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Karten-Mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Karten-E/A"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Karten-E/A_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5207,12 +5858,15 @@ 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"
-"Falls Sie eine ISA-Karte besitzen, sollten die Einstellungen auf dem nächsten Schirm korrekt sein.\n"
+"Falls Sie eine ISA-Karte besitzen, sollten die Einstellungen auf dem "
+"nächsten Schirm korrekt sein.\n"
 "\n"
-"Falls Sie eine PCMCIA-Karte besitzen, müssen Sie IRQ und E/A-Bereich Ihrer Karte kennen.\n"
+"Falls Sie eine PCMCIA-Karte besitzen, müssen Sie IRQ und E/A-Bereich Ihrer "
+"Karte kennen.\n"
 
 #: ../lib/network/netconnect.pm:437
 #, c-format
@@ -5231,8 +5885,14 @@ msgstr "Welche der folgenden ist Ihre ISDN-Karte?"
 
 #: ../lib/network/netconnect.pm:461
 #, 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 "Für dieses Modem ist ein CAPI-Treiber verfügbar. Dieser CAPI-Treiber bietet mehr Möglichkeiten als der freie Treiber (z.B. das Senden von Faxen). Welchen Treiber wollen Sie verwenden?"
+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 ""
+"Für dieses Modem ist ein CAPI-Treiber verfügbar. Dieser CAPI-Treiber bietet "
+"mehr Möglichkeiten als der freie Treiber (z.B. das Senden von Faxen). "
+"Welchen Treiber wollen Sie verwenden?"
 
 #: ../lib/network/netconnect.pm:475
 #, c-format
@@ -5332,16 +5992,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Name der Domäne"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Erster DNS-Server (optional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Zweiter DNS-Server (optional)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5403,13 +6053,21 @@ msgstr "Beim Verbindungstest des Netzwerkes trat ein Fehler auf."
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
-msgid "This can be caused by invalid network configuration, or problems with your modem or router."
-msgstr "Das kann durch eine ungültige Netzertkkonfigurationen oder durch Probleme mit Ihrem Modem bzw. Router verursacht werden"
+msgid ""
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+"Das kann durch eine ungültige Netzertkkonfigurationen oder durch Probleme "
+"mit Ihrem Modem bzw. Router verursacht werden"
 
 #: ../lib/network/netconnect.pm:772
 #, c-format
-msgid "You might want to relaunch the configuration to verify the connection settings."
-msgstr "Sie sollten vielleicht die Konfiguration erneut starten, um die Verbindungseinstellungen zu prüfen."
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
+msgstr ""
+"Sie sollten vielleicht die Konfiguration erneut starten, um die "
+"Verbindungseinstellungen zu prüfen."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
@@ -5418,23 +6076,37 @@ msgstr "Herzlichen Glückwunsch, die Netzwerkeinrichtung ist beendet."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
-msgid "However, the Internet connectivity test failed. You should test your connection manually, and verify your Internet modem or router."
-msgstr "Der Verbindungstest mit dem Internet schlug jedoch fehl. Sie sollten Ihre Verbindung und Ihr Moden bzw. Router manuell prüfen."
+msgid ""
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
+msgstr ""
+"Der Verbindungstest mit dem Internet schlug jedoch fehl. Sie sollten Ihre "
+"Verbindung und Ihr Moden bzw. Router manuell prüfen."
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
-msgid "If your connection does not work, you might want to relaunch the configuration."
-msgstr "Falls die Verbindung nicht funktioniert, sollten Sie die Konfiguration erneut starten."
+msgid ""
+"If your connection does not work, you might want to relaunch the "
+"configuration."
+msgstr ""
+"Falls die Verbindung nicht funktioniert, sollten Sie die Konfiguration "
+"erneut starten."
 
 #: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "Congratulations, the network and Internet configuration are finished."
-msgstr "Herzlichen Glückwunsch, die Netzwerk-/Internet-Einrichtung ist beendet."
+msgstr ""
+"Herzlichen Glückwunsch, die Netzwerk-/Internet-Einrichtung ist beendet."
 
 #: ../lib/network/netconnect.pm:779
 #, c-format
-msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
-msgstr "Es ist sehr empfehlenswert, im Anschluss Ihre X-Oberfläche neu zu starten, um Probleme, die durch die Änderung des Rechnernamens hervorgerufen werden, zu vermeiden."
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+"Es ist sehr empfehlenswert, im Anschluss Ihre X-Oberfläche neu zu starten, "
+"um Probleme, die durch die Änderung des Rechnernamens hervorgerufen werden, "
+"zu vermeiden."
 
 #: ../lib/network/netconnect.pm:790
 #, c-format
@@ -5534,8 +6206,10 @@ msgstr "Der Zeroconf-Rechnername darf keinen . enthalten"
 #: ../lib/network/netconnect.pm:813
 #, 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 ""
 "Da Sie eine Netzwerkinstallation durchführen, ist Ihr\n"
 "Netzwerk bereits konfiguriert. Wählen Sie „OK“, um\n"
@@ -5601,8 +6275,12 @@ msgstr "Konfiguriere Netzwerkgerät %s (Treiber %s)."
 
 #: ../lib/network/netconnect.pm:824
 #, c-format
-msgid "The following protocols can be used to configure a LAN connection. Please choose the one you want to use."
-msgstr "Die folgenden Protokolle können verwendet werden, um eine LAN-Verbindung zu konfigurieren. Bitte wählen Sie ein Protokoll aus."
+msgid ""
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use."
+msgstr ""
+"Die folgenden Protokolle können verwendet werden, um eine LAN-Verbindung zu "
+"konfigurieren. Bitte wählen Sie ein Protokoll aus."
 
 #: ../lib/network/netconnect.pm:825
 #, c-format
@@ -5625,12 +6303,8 @@ msgstr "Abschließend kann die IP-Adresse des DNS-Servers eingegeben werden."
 #: ../lib/network/netconnect.pm:831
 #, 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!"
-
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Die IP-Adresse des Gateways 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:833
 #, c-format
@@ -5653,8 +6327,12 @@ msgstr "Erweiterte Netzwerk Einstellungen"
 
 #: ../lib/network/network.pm:524
 #, c-format
-msgid "Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."
-msgstr "Hier können Sie weitere Netzwerkeinstellungen konfigurieren. Bitte beachten Sie, dass Sie den Computer neustarten müssen um die Änderungen zu übernehmen."
+msgid ""
+"Here you can configure advanced network settings. Please note that you have "
+"to reboot the machine for changes to take effect."
+msgstr ""
+"Hier können Sie weitere Netzwerkeinstellungen konfigurieren. Bitte beachten "
+"Sie, dass Sie den Computer neustarten müssen um die Änderungen zu übernehmen."
 
 #: ../lib/network/network.pm:526
 #, c-format
@@ -5713,8 +6391,12 @@ msgstr "Proxies einstellen"
 
 #: ../lib/network/network.pm:549
 #, c-format
-msgid "Here you can set up your proxies configuration (eg: http://my_caching_server:8080)"
-msgstr "Hier können Sie ihre Proxy-Konfiguration einstellen (z.B. http://my_caching_server:8080)"
+msgid ""
+"Here you can set up your proxies configuration (eg: http://"
+"my_caching_server:8080)"
+msgstr ""
+"Hier können Sie ihre Proxy-Konfiguration einstellen (z.B. http://"
+"my_caching_server:8080)"
 
 #: ../lib/network/network.pm:550
 #, c-format
@@ -5769,10 +6451,13 @@ msgid ""
 "\n"
 "Which interfaces should be protected?\n"
 msgstr ""
-"Bitte wählen Sie die Schnittstellen aus, welche durch die Firewall geschützt werden sollen.\n"
+"Bitte wählen Sie die Schnittstellen aus, welche durch die Firewall geschützt "
+"werden sollen.\n"
 "\n"
-"Alle Schnittstellen mit einer direkte Verbindung zum Internet, sollten ausgewählt werden,\n"
-"während Schnittstellen mit einer Verbindung zum lokalen Netzwerk abgewählt werden können\n"
+"Alle Schnittstellen mit einer direkte Verbindung zum Internet, sollten "
+"ausgewählt werden,\n"
+"während Schnittstellen mit einer Verbindung zum lokalen Netzwerk abgewählt "
+"werden können\n"
 "\n"
 "Welche Schnittstellen sollen geschützt werden?\n"
 
@@ -5793,14 +6478,17 @@ msgid ""
 "rules that may conflict with the configuration that has just been set up.\n"
 "What do you want to do?"
 msgstr ""
-"Ihre Firewall-Konfiguration wurde manuell verändert und enthält Regeln, welche einen Konflikt mit der\n"
+"Ihre Firewall-Konfiguration wurde manuell verändert und enthält Regeln, "
+"welche einen Konflikt mit der\n"
 "eingestellten Konfiguration verursachen kann.\n"
 "Was wollen Sie tun?"
 
 #: ../lib/network/thirdparty.pm:144
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Einige Komponenten (%s) werden benötigt, sind aber nicht für die Hardware %s erreichbar."
+msgstr ""
+"Einige Komponenten (%s) werden benötigt, sind aber nicht für die Hardware %s "
+"erreichbar."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
@@ -5811,8 +6499,10 @@ msgstr "Einige Pakete (%s) werden benötigt, sind jedoch nicht verfügbar."
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
-msgstr "Diese Pakete befinden sich in den Versionen %s oder in der %s Paketquelle."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
+msgstr ""
+"Diese Pakete befinden sich in den Versionen %s oder in der %s Paketquelle."
 
 #: ../lib/network/thirdparty.pm:152
 #, c-format
@@ -5870,8 +6560,12 @@ msgstr "Bitte Diskette einlegen"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
-msgstr "Legen Sie eine FAT-formatierte Diskette in Laufwerk %s mit %s im Wurzelverzeichnis ein und drücken Sie %s"
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
+msgstr ""
+"Legen Sie eine FAT-formatierte Diskette in Laufwerk %s mit %s im "
+"Wurzelverzeichnis ein und drücken Sie %s"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
@@ -6028,4 +6722,3 @@ msgstr "NAT-Modus"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Verwende speziellen UDP-Port"
-
diff --git a/po/drakx-net.pot b/po/drakx-net.pot
index a7823d9..5c90b09 100644
--- a/po/drakx-net.pot
+++ b/po/drakx-net.pot
@@ -2,16 +2,18 @@
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../bin/drakconnect-old:45
 #, c-format
@@ -23,12 +25,12 @@ msgstr ""
 msgid "Interface"
 msgstr ""
 
-#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187 ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633 ../lib/network/vpn/openvpn.pm:223
+#: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187 ../lib/network/connection/ethernet.pm:141 ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633 ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr ""
 
-#: ../bin/drakconnect-old:64 ../bin/drakids:261 ../lib/network/netconnect.pm:477
+#: ../bin/drakconnect-old:64 ../bin/drakids:261 ../lib/network/drakconnect/edit.pm:135 ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr ""
@@ -63,32 +65,32 @@ msgstr ""
 msgid "Configure Local Area Network..."
 msgstr ""
 
-#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217 ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr ""
 
-#: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../bin/drakconnect-old:108 ../bin/drakinvictus:140 ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr ""
 
-#: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263 ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263 ../bin/draknetprofile:159 ../bin/net_monitor:388 ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr ""
 
-#: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178 ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178 ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389 ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr ""
 
-#: ../bin/drakconnect-old:113 ../bin/drakgw:351 ../bin/draknfs:584 ../bin/draksambashare:229 ../lib/network/connection_manager.pm:74 ../lib/network/connection_manager.pm:89 ../lib/network/connection_manager.pm:206 ../lib/network/connection_manager.pm:235 ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49 ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../bin/drakconnect-old:113 ../bin/drakgw:351 ../bin/draknfs:584 ../bin/draksambashare:229 ../lib/network/connection_manager.pm:74 ../lib/network/connection_manager.pm:89 ../lib/network/connection_manager.pm:206 ../lib/network/connection_manager.pm:235 ../lib/network/connection_manager.pm:353 ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49 ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr ""
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr ""
@@ -120,7 +122,7 @@ msgstr ""
 msgid "Adapter %s: %s"
 msgstr ""
 
-#: ../bin/drakconnect-old:209 ../bin/drakgw:181 ../lib/network/connection/ethernet.pm:148
+#: ../bin/drakconnect-old:209 ../bin/drakgw:181 ../lib/network/connection/ethernet.pm:148 ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr ""
@@ -135,7 +137,7 @@ msgstr ""
 msgid "Started on boot"
 msgstr ""
 
-#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159 ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr ""
@@ -147,17 +149,17 @@ msgid ""
 "Run the \"%s\" assistant from the Mageia Linux Control Center"
 msgstr ""
 
-#: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../bin/drakconnect-old:247 ../bin/net_applet:105 ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr ""
 
-#: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305 ../lib/network/drakconnect.pm:16
+#: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305 ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
-#: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17 ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr ""
@@ -206,12 +208,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr ""
@@ -226,7 +228,7 @@ msgstr ""
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26 ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr ""
@@ -265,7 +267,7 @@ msgstr ""
 msgid "The internal domain name"
 msgstr ""
 
-#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:236 ../bin/drakhosts:243 ../bin/drakhosts:250 ../bin/drakinvictus:72 ../bin/draknetprofile:166 ../bin/draknetprofile:186 ../bin/draknfs:93 ../bin/draknfs:282 ../bin/draknfs:429 ../bin/draknfs:431 ../bin/draknfs:434 ../bin/draknfs:526 ../bin/draknfs:533 ../bin/draknfs:605 ../bin/draknfs:612 ../bin/draknfs:619 ../bin/draksambashare:393 ../bin/draksambashare:400 ../bin/draksambashare:403 ../bin/draksambashare:455 ../bin/draksambashare:479 ../bin/draksambashare:552 ../bin/draksambashare:629 ../bin/draksambashare:695 ../bin/draksambashare:795 ../bin/draksambashare:803 ../bin/draksambashare:942 ../bin/draksambashare:1096 ../bin/draksambashare:1115 ../bin/draksambashare:1147 ../bin/draksambashare:1253 ../bin/draksambashare:1355 ../bin/draksambashare:1364 ../bin/draksambashare:1386 ../bin/draksambashare:1395 ../bin/draksambashare:1414 ../bin/draksambashare:1423 ../bin/draksambashare:1435 ../lib/network/connection/xdsl.pm:361 ../lib/network/connection_manager.pm:62 ../lib/network/connection_manager.pm:68 ../lib/network/connection_manager.pm:84 ../lib/network/connection_manager.pm:92 ../lib/network/connection_manager.pm:177 ../lib/network/connection_manager.pm:181 ../lib/network/connection_manager.pm:223 ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45 ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30 ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118 ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135 ../lib/network/netconnect.pm:188 ../lib/network/netconnect.pm:234 ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:847 ../lib/network/thirdparty.pm:123 ../lib/network/thirdparty.pm:141 ../lib/network/thirdparty.pm:230 ../lib/network/thirdparty.pm:232 ../lib/network/thirdparty.pm:253
+#: ../bin/drakgw:188 ../bin/drakhosts:100 ../bin/drakhosts:236 ../bin/drakhosts:243 ../bin/drakhosts:250 ../bin/drakinvictus:72 ../bin/draknetprofile:166 ../bin/draknetprofile:186 ../bin/draknfs:93 ../bin/draknfs:282 ../bin/draknfs:429 ../bin/draknfs:431 ../bin/draknfs:434 ../bin/draknfs:526 ../bin/draknfs:533 ../bin/draknfs:605 ../bin/draknfs:612 ../bin/draknfs:619 ../bin/draksambashare:393 ../bin/draksambashare:400 ../bin/draksambashare:403 ../bin/draksambashare:455 ../bin/draksambashare:479 ../bin/draksambashare:552 ../bin/draksambashare:629 ../bin/draksambashare:695 ../bin/draksambashare:795 ../bin/draksambashare:803 ../bin/draksambashare:942 ../bin/draksambashare:1096 ../bin/draksambashare:1115 ../bin/draksambashare:1147 ../bin/draksambashare:1253 ../bin/draksambashare:1355 ../bin/draksambashare:1364 ../bin/draksambashare:1386 ../bin/draksambashare:1395 ../bin/draksambashare:1414 ../bin/draksambashare:1423 ../bin/draksambashare:1435 ../lib/network/connection/xdsl.pm:361 ../lib/network/connection_manager.pm:62 ../lib/network/connection_manager.pm:68 ../lib/network/connection_manager.pm:84 ../lib/network/connection_manager.pm:92 ../lib/network/connection_manager.pm:177 ../lib/network/connection_manager.pm:181 ../lib/network/connection_manager.pm:223 ../lib/network/connection_manager.pm:481 ../lib/network/drakconnect/delete.pm:12 ../lib/network/drakconnect/edit.pm:506 ../lib/network/drakconnect/edit.pm:510 ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45 ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30 ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118 ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135 ../lib/network/netconnect.pm:188 ../lib/network/netconnect.pm:234 ../lib/network/netconnect.pm:275 ../lib/network/netconnect.pm:847 ../lib/network/thirdparty.pm:123 ../lib/network/thirdparty.pm:141 ../lib/network/thirdparty.pm:230 ../lib/network/thirdparty.pm:232 ../lib/network/thirdparty.pm:253
 #, c-format
 msgid "Error"
 msgstr ""
@@ -522,12 +524,12 @@ msgstr ""
 msgid "Allowed addresses"
 msgstr ""
 
-#: ../bin/drakids:40 ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335 ../bin/net_applet:145 ../bin/net_applet:353 ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../bin/drakids:40 ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335 ../bin/net_applet:145 ../bin/net_applet:353 ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313 ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr ""
 
-#: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335 ../bin/net_applet:353
+#: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335 ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr ""
@@ -537,12 +539,12 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr ""
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -567,12 +569,12 @@ msgstr ""
 msgid "Clear logs"
 msgstr ""
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -717,7 +719,7 @@ msgstr ""
 msgid "Enabled"
 msgstr ""
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr ""
@@ -752,7 +754,7 @@ msgstr ""
 msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34 ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr ""
@@ -2138,12 +2140,12 @@ msgstr ""
 msgid "Warning, another internet connection has been detected, maybe using your network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr ""
@@ -2203,7 +2205,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr ""
@@ -2243,17 +2245,17 @@ msgstr ""
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45 ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22 ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22 ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23 ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23 ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr ""
@@ -2373,12 +2375,12 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665 ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
+#: ../lib/network/connection/ethernet.pm:149 ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665 ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/connection/ethernet.pm:152 ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr ""
@@ -2403,22 +2405,22 @@ msgstr ""
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/connection/ethernet.pm:160 ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/connection/ethernet.pm:161 ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/connection/ethernet.pm:162 ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/connection/ethernet.pm:163 ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr ""
@@ -2428,12 +2430,12 @@ msgstr ""
 msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/connection/ethernet.pm:176 ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/connection/ethernet.pm:181 ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr ""
@@ -2448,7 +2450,7 @@ msgstr ""
 msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/connection/ethernet.pm:222 ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2463,7 +2465,7 @@ msgstr ""
 msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/connection/ethernet.pm:244 ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
@@ -2532,27 +2534,27 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329 ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329 ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329 ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329 ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329 ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr ""
@@ -3172,87 +3174,87 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:464 ../lib/network/connection_manager.pm:280
+#: ../lib/network/connection/wireless.pm:474 ../lib/network/connection_manager.pm:280 ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478 ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482 ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3260,12 +3262,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -3284,12 +3286,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -3298,32 +3300,32 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522 ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523 ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524 ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525 ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526 ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that the\n"
@@ -3334,17 +3336,17 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534 ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535 ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -3354,12 +3356,12 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543 ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -3371,12 +3373,12 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552 ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless network\n"
@@ -3391,106 +3393,106 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556 ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566 ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -3498,12 +3500,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -3512,12 +3514,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -3527,12 +3529,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -3542,12 +3544,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -3565,42 +3567,42 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -3733,6 +3735,273 @@ msgstr ""
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid "No ethernet network adapter has been detected on your system. Please run the hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, c-format
+msgid "Select the network interface to remove:"
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid "Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:281 ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr ""
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -3920,11 +4189,6 @@ msgstr ""
 msgid "No device found"
 msgstr ""
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr ""
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4133,6 +4397,103 @@ msgstr ""
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr ""
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, c-format
+msgid "Process connection"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4175,18 +4536,6 @@ msgstr ""
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -4234,11 +4583,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr ""
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -4259,11 +4603,6 @@ msgstr ""
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -4274,41 +4613,6 @@ msgstr ""
 msgid "Provider DNS 2 (optional)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -4458,16 +4762,6 @@ msgstr ""
 msgid "Domain name"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -4728,11 +5022,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/el.po b/po/el.po
index 211a7b7..7151a77 100644
--- a/po/el.po
+++ b/po/el.po
@@ -9,14 +9,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-09 20:59+0200\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
 "Language-Team: Greek <mageia_gr@list.mageia.org.uk>\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Lokalize 1.2\n"
 
@@ -31,14 +31,16 @@ msgid "Interface"
 msgstr "Διεπαφή"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Διεύθυνση IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
@@ -74,23 +76,27 @@ msgid "Configure Local Area Network..."
 msgstr "Ρύθμιση του τοπικού δικτύου..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Βοήθεια"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Εφαρμογή"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Άκυρο"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Εντάξει"
@@ -100,16 +106,17 @@ msgstr "Εντάξει"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Παρακαλώ περιμένετε... Εφαρμογή των ρυθμίσεων"
@@ -145,6 +152,7 @@ msgstr "Κάρτα δικτύου %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Μάσκα δικτύου"
@@ -160,6 +168,7 @@ msgid "Started on boot"
 msgstr "Εκτέλεση κατά την εκκίνηση"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Πελάτης DHCP"
@@ -174,17 +183,19 @@ msgstr ""
 "Εκτελέστε τον οδηγό « %s » από το κέντρο ελέγχου Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Ρύθμισε μία καινούρια σύνδεση δικτύου (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Χωρίς IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Χωρίς μάσκα"
@@ -256,12 +267,12 @@ msgstr ""
 "\n"
 "Τι θα θέλατε να κάνετε;"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Ενεργοποίηση"
@@ -278,8 +289,8 @@ msgstr ""
 "Παρακαλώ επιλέξτε την διεπαφή δικτύου που είναι άμεσα συνδεδεμένη με το "
 "διαδίκτυο"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Συσκευή δικτύου"
@@ -358,7 +369,11 @@ msgstr "Το εσωτερικό όνομα τομέα"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -441,8 +456,8 @@ msgstr "Εξυπηρετητής διαμεσολαβητής-λανθάνουσ
 #, c-format
 msgid "Use this gateway as proxy caching server"
 msgstr ""
-"Χρησιμοποιήστε αυτήν την πύλη δικτύου ως εξυπηρετητής "
-"διαμεσολαβητής-λανθάνουσας"
+"Χρησιμοποιήστε αυτήν την πύλη δικτύου ως εξυπηρετητής διαμεσολαβητής-"
+"λανθάνουσας"
 
 #: ../bin/drakgw:275
 #, c-format
@@ -479,7 +494,8 @@ msgid ""
 "the Mageia firewall is not enabled for network adapter connected to your LAN "
 "network."
 msgstr ""
-"Δεν εντοπίστηκε καμιά κάρτα ρυθμισμένη για το τοπικό δίκτυο στο σύστημά σας.\n"
+"Δεν εντοπίστηκε καμιά κάρτα ρυθμισμένη για το τοπικό δίκτυο στο σύστημά "
+"σας.\n"
 "\n"
 "Παρακαλώ εκτελέστε το εργαλείο ρύθμισης υλικού για να τη ρυθμίσετε, και "
 "σιγουρευτείτε πως το τοίχος προστασίας Mageia είναι απενεργοποιημένο για την "
@@ -499,8 +515,8 @@ 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"
@@ -662,13 +678,14 @@ msgstr "Επιτρεπόμενες διευθύνσεις"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Διαδραστικό τοίχος προστασίας"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Αδύνατη η επικοινωνία με το δαίμονα"
@@ -678,12 +695,12 @@ msgstr "Αδύνατη η επικοινωνία με το δαίμονα"
 msgid "Log"
 msgstr "Καταγραφές"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Επιτρέπεται"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Σε φραγή"
@@ -710,12 +727,12 @@ msgstr "Υπηρεσίες σε φραγή"
 msgid "Clear logs"
 msgstr "Καθαρισμός των καταγραφών"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Μαύρη λίστα"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Λευκή λίστα"
@@ -865,7 +882,7 @@ msgstr "Άρθρωμα"
 msgid "Enabled"
 msgstr "Ενεργοποιημένο"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Περιγραφή"
@@ -883,8 +900,8 @@ msgstr "Νέο προφίλ..."
 #: ../bin/draknetprofile:155
 #, c-format
 msgid ""
-"Please specify the name of the new network profile to be created (e.g., work, "
-"home, roaming, ..). This new profile will be created based on current "
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
 "settings, and you'll be able to configure your system configuration as usual "
 "afterwards."
 msgstr ""
@@ -906,16 +923,17 @@ msgstr "Δημιουργήθηκε νέο προφίλ"
 #: ../bin/draknetprofile:172
 #, c-format
 msgid ""
-"You are now using network profile %s. You can configure your system as usual, "
-"and all your network settings from now on will be saved into this profile."
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
 msgstr ""
 "Χρησιμοποιείτε τώρα το προφίλ δικτύου %s. Μπορείτε να ρυθμίσετε το σύστημά "
 "σας ως συνήθως, και όλες οι ρυθμίσεις του δικτύου σας στο εξής θα "
 "αποθηκεύονται σε αυτό το προφίλ."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Προσοχή"
@@ -1100,8 +1118,8 @@ msgstr ""
 "\n"
 "<span foreground=\"royalblue3\">IP δίκτυα:</span> μπορείτε επίσης να εξάγετε "
 "καταλόγους σε όλους τους υπολογιστές σε ένα IP (υπό-)δίκτυο ταυτόχρονα "
-"προσθέτοντας μια μάσκα μετά από την διεύθυνση του (υπό-)δικτύου. Παράδειγμα : "
-"192.168.1.0/255.255.255.0' ή 192.168.1.0/24\n"
+"προσθέτοντας μια μάσκα μετά από την διεύθυνση του (υπό-)δικτύου. "
+"Παράδειγμα : 192.168.1.0/255.255.255.0' ή 192.168.1.0/24\n"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1119,9 +1137,9 @@ msgid ""
 "\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 "
+"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"
@@ -1137,15 +1155,16 @@ msgstr ""
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">επιτρέπει στον root πραγματική απομακρυσμένη "
-"πρόσβαση (no_root_squash) :</span> να μην γίνει συσχέτιση των UID/GID 0. Αυτή "
-"η επιλογή είναι κυρίως χρήσιμη για σταθμούς χωρίς δίσκο (no_root_squash).\n"
+"πρόσβαση (no_root_squash) :</span> να μην γίνει συσχέτιση των UID/GID 0. "
+"Αυτή η επιλογή είναι κυρίως χρήσιμη για σταθμούς χωρίς δίσκο "
+"(no_root_squash).\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Συσχέτιση όλων των χρηστών με τον χρήστη "
-"anonymous (all_squash):</span> μετατρέπει όλα τα UID/GID σε χρήστη anonymous. "
-"Χρήσιμο για εξαγωγή μέσω NFS δημοσίων καταλόγων του FTP, καταλόγους ειδήσεων "
-"κλπ. Η αντίθετη επιλογή είναι no_all_squash η οποία είναι και η "
-"προκαθορισμένη.\n"
+"anonymous (all_squash):</span> μετατρέπει όλα τα UID/GID σε χρήστη "
+"anonymous. Χρήσιμο για εξαγωγή μέσω NFS δημοσίων καταλόγων του FTP, "
+"καταλόγους ειδήσεων κλπ. Η αντίθετη επιλογή είναι no_all_squash η οποία "
+"είναι και η προκαθορισμένη.\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Χρήστης και ομάδα anonymous (anonuid και "
@@ -1191,10 +1210,10 @@ msgstr ""
 #: ../bin/draknfs:184
 #, 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."
+"<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. Από προεπιλογή, κάθε αίτημα "
@@ -1204,9 +1223,9 @@ msgstr ""
 #: ../bin/draknfs:185
 #, 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)."
+"<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 απαντώντας στα αιτήματα πριν να έχουν "
@@ -1239,7 +1258,8 @@ msgstr "Κατάλογος"
 #, c-format
 msgid "Please add an NFS share to be able to modify it."
 msgstr ""
-"Παρακαλώ προσθέστε μια κοινή χρήση NFS ώστε να μπορέσετε να την τροποποιήσετε."
+"Παρακαλώ προσθέστε μια κοινή χρήση NFS ώστε να μπορέσετε να την "
+"τροποποιήσετε."
 
 #: ../bin/draknfs:379
 #, c-format
@@ -1589,8 +1609,7 @@ msgstr "Ένα απλό εργαλείο για εύκολη διαχείρισ�
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
@@ -1675,8 +1694,8 @@ msgstr "Προσθήκη μιας ειδικής κοινής χρήσης εκ�
 msgid ""
 "Goal of this wizard is to easily create a new special printer Samba share."
 msgstr ""
-"Σκοπός αυτού του οδηγού είναι να δημιουργήσετε εύκολα έναν ειδικό κοινόχρηστο "
-"εκτυπωτή Samba."
+"Σκοπός αυτού του οδηγού είναι να δημιουργήσετε εύκολα έναν ειδικό "
+"κοινόχρηστο εκτυπωτή Samba."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -1902,11 +1921,11 @@ msgstr ""
 #: ../bin/draksambashare:1073
 #, c-format
 msgid ""
-"Domain master = yes, causes the server to register the NetBIOS name <pdc name>"
-". This name will be recognized by other servers."
+"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 >. Αυτό το όνομα θα αναγνωρίζεται από τους άλλους εξυπηρετητές."
+"Domain master = yes, προκαλεί στον εξυπηρετητή να δηλωθεί στο όνομα NetBIOS "
+"<pdc name >. Αυτό το όνομα θα αναγνωρίζεται από τους άλλους εξυπηρετητές."
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -1931,18 +1950,18 @@ msgstr "Επίπεδο λειτουργικού συστήματος:"
 #: ../bin/draksambashare:1092
 #, 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"
+"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 κατά την "
-"διάρκεια εκλογών των περιηγητών. Αν επιθυμείτε ο Samba να κερδίσει την εκλογή "
-"και να γίνει ο κύριος εξυπηρετητής, πρέπει να ορίσετε ένα επίπεδο ανώτερο από "
-"αυτό του λειτουργικού συστήματος που κατέχει την υψηλότερη τιμή στο δίκτυό "
-"σας. Π.χ. : Επίπεδο λειτουργικού συστήματος = 34"
+"διάρκεια εκλογών των περιηγητών. Αν επιθυμείτε ο Samba να κερδίσει την "
+"εκλογή και να γίνει ο κύριος εξυπηρετητής, πρέπει να ορίσετε ένα επίπεδο "
+"ανώτερο από αυτό του λειτουργικού συστήματος που κατέχει την υψηλότερη τιμή "
+"στο δίκτυό σας. Π.χ. : Επίπεδο λειτουργικού συστήματος = 34"
 
 #: ../bin/draksambashare:1096
 #, c-format
@@ -2001,13 +2020,13 @@ msgstr ""
 #: ../bin/draksambashare:1122
 #, 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."
+"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:1133
@@ -2050,15 +2069,15 @@ msgid ""
 "Log file: use file.%m to use a separate log file for each machine that "
 "connects"
 msgstr ""
-"Αρχείο καταγραφών : χρησιμοποιείστε αρχείο.%m για να γίνεται χρήση ξεχωριστού "
-"αρχείου καταγραφών, για κάθε υπολογιστή που συνδέεται."
+"Αρχείο καταγραφών : χρησιμοποιείστε αρχείο.%m για να γίνεται χρήση "
+"ξεχωριστού αρχείου καταγραφών, για κάθε υπολογιστή που συνδέεται."
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
 msgstr ""
-"Επίπεδο καταγραφών: καθορίζει το πόσο αναλυτικές θα είναι οι καταγραφές (0 <= "
-"επίπεδο καταγραφών <=10)"
+"Επίπεδο καταγραφών: καθορίζει το πόσο αναλυτικές θα είναι οι καταγραφές (0 "
+"<= επίπεδο καταγραφών <=10)"
 
 #: ../bin/draksambashare:1154
 #, c-format
@@ -2505,12 +2524,12 @@ msgstr ""
 "Προσοχή εντοπίστηκε μια άλλη σύνδεση στο διαδίκτυο, που ίσως χρησιμοποιεί το "
 "δίκτυό σας"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Συνδέθηκε"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Δεν συνδέθηκε"
@@ -2575,7 +2594,7 @@ msgstr "Ενεργοποίηση της καταμέτρησης κυκλοφο�
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Επιτρέψτε τον έλεγχο της διεπαφής από το Network Manager"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Μετρικό"
@@ -2617,19 +2636,22 @@ msgstr "Καλωδιακό μόντεμ"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Χρήση του BPALogin (απαραίτητο για το Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Πιστοποίηση"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Λογαριασμός σύνδεσης (όνομα χρήστη)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Κωδικός πρόσβασης λογαριασμού"
@@ -2756,13 +2778,15 @@ msgstr ""
 "Κάθε αντικείμενο πρέπει να εισαχθεί ως διεύθυνση IP με αριθμούς\n"
 "χωρισμένους με τελείες (παράδειγμα: 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Πύλη"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Λήψη των εξυπηρετητών DNS από τον εξυπηρετητή DHCP"
@@ -2786,25 +2810,29 @@ msgstr "Τομέας αναζήτησης"
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
-"Από προεπιλογή, ο τομέας αναζήτησης θα προέρχεται από το πλήρως πιστοποιημένο "
-"όνομα υπολογιστή"
+"Από προεπιλογή, ο τομέας αναζήτησης θα προέρχεται από το πλήρως "
+"πιστοποιημένο όνομα υπολογιστή"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Χρονικό όριο λήξης DHCP (σε δευτερόλεπτα)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Λήψη των εξυπηρετητών YP από τον εξυπηρετητή DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Λήψη των εξυπηρετητών NTPD από τον εξυπηρετητή DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP όνομα υπολογιστή"
@@ -2815,11 +2843,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Να μην ανακατευθυνθεί στο Zeroconf (δίκτυο 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Η διεύθυνση IP πρέπει να είναι της μορφής 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Η μάσκα δικτύου πρέπει να είναι της μορφής « 255.255.224.0 »"
@@ -2836,12 +2866,13 @@ msgid ""
 "address with this connection, first disable all other devices which use it, "
 "or configure them not to start at boot"
 msgstr ""
-"%s χρησιμοποιείται ήδη από μια σύνδεση ενεργοποιημένη στην εκκίνηση (%s). Για "
-"να χρησιμοποιήσετε αυτή τη διεύθυνση με αυτή τη σύνδεση, πρώτα "
-"απενεργοποιήστε όλες τις υπόλοιπες συσκευές που την χρησιμοποιούν, ή ρυθμίστε "
-"τες να μην ξεκινούν κατά την εκκίνηση"
+"%s χρησιμοποιείται ήδη από μια σύνδεση ενεργοποιημένη στην εκκίνηση (%s). "
+"Για να χρησιμοποιήσετε αυτή τη διεύθυνση με αυτή τη σύνδεση, πρώτα "
+"απενεργοποιήστε όλες τις υπόλοιπες συσκευές που την χρησιμοποιούν, ή "
+"ρυθμίστε τες να μην ξεκινούν κατά την εκκίνηση"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2855,8 +2886,8 @@ msgid ""
 "server does not provides a valid host name, it will be generated "
 "automatically."
 msgstr ""
-"Αυτό θα επιτρέψει στον εξυπηρετητή να αποδώσει ένα όνομα για αυτό το μηχάνημα."
-" Αν ο εξυπηρετητής δεν παρέχει ένα έγκυρο όνομα υπολογιστή, αυτό θα "
+"Αυτό θα επιτρέψει στον εξυπηρετητή να αποδώσει ένα όνομα για αυτό το "
+"μηχάνημα. Αν ο εξυπηρετητής δεν παρέχει ένα έγκυρο όνομα υπολογιστή, αυτό θα "
 "δημιουργηθεί αυτόματα."
 
 #: ../lib/network/connection/ethernet.pm:226
@@ -2872,6 +2903,7 @@ msgstr ""
 "localhost.localdomain »."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Θερμή σύνδεση (hotplugging) δικτύου"
@@ -2940,27 +2972,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Αναλογικό modem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Βασισμένο σε ένα σενάριο"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Μέσω τερματικού"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4119,12 +4156,12 @@ msgstr "WPA/WPA2 με ήδη κοινόχρηστο κλειδί (PSK)"
 msgid "WPA/WPA2 Enterprise"
 msgstr "Εταιρικό WPA/WPA2"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Οδηγός Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4133,80 +4170,83 @@ msgstr ""
 "Η κάρτα ασύρματου δικτύου είναι απενεργοποιημένη, παρακαλώ ενεργοποιήστε την "
 "πρώτα, από το διακόπτη της (RF kill switch)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Ρυθμίσεις ασύρματης σύνδεσης"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Τρόπος λειτουργίας"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Διαχειριζόμενο"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Κύριο"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Αναμεταδότης"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Δευτερεύων"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Αυτόματο"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Όνομα δικτύου (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Λειτουργία κρυπτογράφησης"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Κλειδί κρυπτογράφησης"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Απόκρυψη κωδικού"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Εξαναγκασμός χρήσης αυτού του κλειδιού σαν συμβολοσειρά ASCII (πχ για το "
 "Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Χρήστης/λογαριασμός EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4217,12 +4257,12 @@ msgstr ""
 "Αν πρέπει να καθορίσετε έναν τομέα, δοκιμάστε την μη δοκιμασμένη σύνταξη\n"
 "  DOMAIN\\χρήστης "
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Κωδικός πρόσβασης EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4256,12 +4296,12 @@ msgstr ""
 "  Η TLS λειτουργία βασίζεται αποκλειστικά σε ένα πιστοποιητικό το οποίο\n"
 "μπορεί να αγνοήσει το όνομα χρήστη και των κωδικό που ορίστηκαν εδώ."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Πιστοποιητικό πελάτη EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4276,32 +4316,37 @@ msgstr ""
 " Σημείωση: οι άλλες σχετικές ρυθμίσεις βρίσκονται στην σελίδα Προχωρημένες "
 "ρυθμίσεις."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Αναγνωριστικό δικτύου"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Συχνότητα λειτουργίας"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Όριο ευαισθησίας"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Ρυθμός bit (σε b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4323,22 +4368,24 @@ msgstr ""
 "το μέγιστο μέγεθος θα απενεργοποιήσει αυτήν τη ρύθμιση. Μπορείτε\n"
 "επίσης να καθορίσετε αυτήν την παράμετρο σε « auto », « fixed » ή « off »."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Κατακερματισμός"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Επιπλέον ορίσματα για την εντολή iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 ""
@@ -4349,14 +4396,14 @@ msgstr ""
 "\n"
 "Δείτε τη σελίδα εγχειριδίου του iwconfig(8) για περισσότερες πληροφορίες."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "επιπλέον ορίσματα για την εντολή iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4376,15 +4423,17 @@ msgstr ""
 "\n"
 "Δείτε το εγχειρίδιο χρήσης (man) iwspy(8) για περισσότερες πληροφορίες. "
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Επιπλέον ορίσματα για την εντολή iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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 "
@@ -4397,7 +4446,8 @@ msgid ""
 "\n"
 "See iwpriv(8) man page for further information."
 msgstr ""
-"Η iwpv επιτρέπει να καθορίσετε τις προαιρετικές (και ιδιωτικές) παραμέτρους \n"
+"Η iwpv επιτρέπει να καθορίσετε τις προαιρετικές (και ιδιωτικές) "
+"παραμέτρους \n"
 "μιας διεπαφής ασύρματου δικτύου.\n"
 "\n"
 "Η iwpriv ασχολείται με τον καθορισμό παραμέτρων συγκεκριμένα για κάθε οδηγό "
@@ -4410,28 +4460,28 @@ msgstr ""
 "\n"
 "Δείτε στο εγχειρίδιο χρήσης (man) της iwpriv(8) για περισσότερες πληροφορίες."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Πρωτόκολλο EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Αυτόματος εντοπισμός"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4440,67 +4490,67 @@ msgstr ""
 "Συνιστάται ο αυτόματος εντοπισμός, διότι ελέγχει πρώτα για WPA\n"
 "έκδοση 2 με εφεδρική ανακατεύθυνση WPA έκδοση 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Λειτουργία EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4509,12 +4559,12 @@ msgstr ""
 "λίστα των πρωτοκόλλων διαχείρισης αποδεκτών κλειδιών ταυτοποίησης.\n"
 "πιθανές τιμές : WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Εξωτερικό αναγνωριστικό EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4525,12 +4575,12 @@ msgstr ""
 "σαν ταυτότητα χωρίς κρυπτογράφηση με τους τύπους EAP που υποστηρίζουν\n"
 "διαφορετικά αναγνωριστικά ενθυλακωμένα σε σήραγγες, π.χ. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP φάση2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4543,12 +4593,12 @@ msgstr ""
 "auth=MSCHAPV2 για PEAP ή\n"
 "autheap=MSCHAPV2 autheap=MD5 για TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Πιστοποιητικό CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4563,12 +4613,12 @@ msgstr ""
 "επαληθεύεται. Αν είναι δυνατό, ένα έμπιστο πιστοποιητικό CA θα πρέπει\n"
 "πάντα είναι ρυθμισμένο όταν γίνεται χρήση των TLS, TTLS ή PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Συσχέτιση του θέματος του πιστοποιητικού EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4585,12 +4635,12 @@ msgstr ""
 "μορφής :\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Επιπλέον οδηγίες"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4623,12 +4673,12 @@ msgstr ""
 "\tχρήσης συγκεκριμένων ρυθμίσεων διαφορετικών από τις ρυθμίσεις της "
 "διασύνδεσης."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Απαιτείται ένα κλειδί κρυπτογράφησης."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4637,7 +4687,7 @@ msgstr ""
 "Το ήδη κοινόχρηστο κλειδί πρέπει να έχει ανάμεσα σε 8 και 63 χαρακτήρες "
 "ASCII, ή 64 δεκαεξαδικούς χαρακτήρες."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4646,16 +4696,16 @@ msgstr ""
 "Το κλειδί WEP πρέπει να έχει το πολύ %d χαρακτήρες ASCII ή %d δεκαεξαδικούς "
 "χαρακτήρες."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 ""
-"Η συχνότητα πρέπει να έχει μια κατάληξη k, M ή G (πχ: « 2.46G » για 2.46 GHz "
-"), ή προσθέτοντας να απαραίτητα μηδενικά (« 0 »)."
+"Η συχνότητα πρέπει να έχει μια κατάληξη k, M ή G (πχ: « 2.46G » για 2.46 "
+"GHz ), ή προσθέτοντας να απαραίτητα μηδενικά (« 0 »)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4664,17 +4714,17 @@ msgstr ""
 "Η ροή πρέπει να έχει μια κατάληξη k, M ή G (πχ: « 11M » για 11M), ή "
 "προσθέτοντας να απαραίτητα μηδενικά (« 0 »)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Επιτρέπεται η περιαγωγή του σημείου πρόσβασης"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Συσχετισμένο στο ασύρματο δίκτυο « %s » στην διεπαφή %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Χάθηκε η σύνδεση στο ασύρματο δίκτυο στην διεπαφή %s "
@@ -4705,11 +4755,12 @@ msgstr ""
 #: ../lib/network/connection/xdsl.pm:185
 #, c-format
 msgid ""
-"Modems using Conexant AccessRunner chipsets cannot be supported due to binary "
-"firmware distribution problem."
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
 msgstr ""
 "Τα modem που χρησιμοποιούν Conexant AccessRunner chipsets δεν υποστηρίζονται "
-"εξαιτίας προβλημάτων στην αναδιανομή του δυαδικού υλικολογισμικού (firmware). "
+"εξαιτίας προβλημάτων στην αναδιανομή του δυαδικού υλικολογισμικού "
+"(firmware). "
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4822,6 +4873,285 @@ msgstr "Σύνδεση"
 msgid "Hostname changed to \"%s\""
 msgstr "Το όνομα υπολογιστή άλλαξε σε « %s »"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Διεπαφή δικτύου"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Επιλέξτε την διεπαφή δικτύου για ρύθμιση:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Ένα πρόβλημα παρουσιάστηκε κατά την επανεκκίνηση του δικτύου: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Συγχαρητήρια, η ρύθμιση του δικτύου ολοκληρώθηκε."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Διαχείριση των συνδέσεων VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Συσκευή: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Ρύθμιση VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Εξυπηρετητής DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Τομέας αναζήτησης"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Αυτόματα"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Εκτέλεση κατά την εκκίνηση"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Τρόπος κλήσης"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Ταχύτητα σύνδεσης"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Χρόνος εκτός σύνδεσης (σε δευτερόλεπτα)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Αριθμός τηλεφώνου του παρόχου"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Σύνδεση μέσω μόντεμ"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Επιλέξτε αρχείο"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Κουβέιτ"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Μόντεμ"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ κάρτας"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Εύρος μνήμης κάρτας (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO κάρτας"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 κάρτας"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Ευρωπαϊκό πρωτόκολλο (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Πρωτόκολλο για τον υπόλοιπο κόσμο\n"
+" χωρίς D-Channel (μισθωμένες γραμμές)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Άρθρωμα"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Πραγματική διεύθυνση"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Λευκορωσία"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Η διεύθυνση της πύλης πρέπει να είναι της μορφής 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Πύλη"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Διεπαφή"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Δεν έχει ρυθμιστεί καμία σύνδεση με το διαδίκτυο"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Δεν έχετε καμία ρυθμισμένη σύνδεση στο διαδίκτυο.\n"
+"Εκτελέστε τον οδηγό « %s » από το κέντρο ελέγχου Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Πρώτος εξυπηρετητής DNS (προαιρετικό)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Πρώτος εξυπηρετητής DNS (προαιρετικό)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Δεύτερος εξυπηρετητής DNS (προαιρετικό)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Πρώτος εξυπηρετητής DNS (προαιρετικό)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Ρυθμίσεις σύνδεσης"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Πρόσβαση στον εκτυπωτή"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Χρόνος σύνδεσης :"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Κατάσταση"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Δοκιμή της σύνδεσής σας... "
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Παράμετροι IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4949,8 +5279,8 @@ msgid ""
 msgstr ""
 "ρυθμιστής drakfirewall\n"
 "\n"
-"Πριν συνεχίσετε, βεβαιωθείτε ότι έχετε ρυθμίσει την πρόσβαση στο "
-"δίκτυο/διαδίκτυο\n"
+"Πριν συνεχίσετε, βεβαιωθείτε ότι έχετε ρυθμίσει την πρόσβαση στο δίκτυο/"
+"διαδίκτυο\n"
 "χρησιμοποιώντας το drakconnect."
 
 #: ../lib/network/drakfirewall.pm:245 ../lib/network/drakfirewall.pm:247
@@ -5015,8 +5345,8 @@ msgstr ""
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
 "Μπορείτε να προειδοποιηθείτε όταν κάποιος αποκτήσει πρόσβαση σε μια υπηρεσία "
@@ -5034,11 +5364,6 @@ msgstr "Χρήση του διαδραστικού τοίχους προστασ
 msgid "No device found"
 msgstr "Δε βρέθηκε συσκευή"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Συσκευή: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5116,13 +5441,13 @@ msgid ""
 "\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"
+"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"
 
@@ -5183,8 +5508,7 @@ msgid ""
 "network."
 msgstr "Η εφαρμογή « %s » προσπαθεί να διαθέσει μια υπηρεσία (%s) στο δίκτυο."
 
-#. -PO: this should be kept lowercase since the expression is meant to be used
-#. between brackets
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -5273,6 +5597,103 @@ msgstr "Εγκατάσταση ενός νέου οδηγού"
 msgid "Select a device:"
 msgstr "Επιλέξτε μια συσκευή:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Επίθεση υπηρεσίας"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Αυτόματη λειτουργία του διαδραστικού τοίχου προστασίας"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Πώς θέλετε να ενεργοποιήσετε αυτή τη σύνδεση;"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Διεπαφή δικτύου"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Πρωτόκολλο"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Διεύθυνση IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Επίθεση υπηρεσίας"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Διαδραστικό τοίχος προστασίας"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Ασύρματη σύνδεση"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Πώς θέλετε να ενεργοποιήσετε αυτή τη σύνδεση;"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5316,20 +5737,6 @@ msgstr "Εσωτερική κάρτα ISDN"
 msgid "Protocol for the rest of the world"
 msgstr "Πρωτόκολλο για τον υπόλοιπο κόσμο"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Ευρωπαϊκό πρωτόκολλο (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Πρωτόκολλο για τον υπόλοιπο κόσμο\n"
-" χωρίς D-Channel (μισθωμένες γραμμές)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5380,11 +5787,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Έλεγχος της σύνδεσης"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Δοκιμή της σύνδεσής σας... "
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5405,11 +5807,6 @@ msgstr "Ο προσωπικός σας αριθμός τηλεφώνου"
 msgid "Provider name (ex provider.net)"
 msgstr "Όνομα παρόχου (π.χ. provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Αριθμός τηλεφώνου του παρόχου"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5420,41 +5817,6 @@ msgstr "Πρώτο DNS του παρόχου (προαιρετικό)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Δεύτερο DNS του παρόχου (προαιρετικό)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Τρόπος κλήσης"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Ταχύτητα σύνδεσης"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Χρόνος εκτός σύνδεσης (σε δευτερόλεπτα)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ κάρτας"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Εύρος μνήμης κάρτας (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO κάρτας"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 κάρτας"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5495,8 +5857,8 @@ msgstr ""
 "Εάν έχετε μια ISA κάρτα, οι τιμές στην επόμενη οθόνη θα πρέπει να είναι "
 "σωστές.\n"
 "\n"
-"Εάν έχετε μια PCMCIA κάρτα, πρέπει να ξέρετε το irq και το io της κάρτας σας."
-"\n"
+"Εάν έχετε μια PCMCIA κάρτα, πρέπει να ξέρετε το irq και το io της κάρτας "
+"σας.\n"
 
 #: ../lib/network/netconnect.pm:437
 #, c-format
@@ -5624,16 +5986,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Όνομα τομέα"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Πρώτος εξυπηρετητής DNS (προαιρετικό)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Δεύτερος εξυπηρετητής DNS (προαιρετικό)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5743,8 +6095,8 @@ msgstr "Συγχαρητήρια, η ρύθμιση του δικτύου και
 #: ../lib/network/netconnect.pm:779
 #, c-format
 msgid ""
-"After this is done, we recommend that you restart your X environment to avoid "
-"any hostname-related problems."
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
 msgstr ""
 "Αφού γίνει αυτό, προτείνουμε να επανεκκινήσετε το γραφικό περιβάλλον για να "
 "αποφύγετε τυχόν προβλήματα που σχετίζονται με την αλλαγή ονόματος του "
@@ -5939,18 +6291,14 @@ msgstr ""
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
 msgstr ""
-"Τέλος, μπορείτε επίσης να εισάγετε τις διευθύνσεις IP του εξυπηρετητή σας DNS."
+"Τέλος, μπορείτε επίσης να εισάγετε τις διευθύνσεις IP του εξυπηρετητή σας "
+"DNS."
 
 #: ../lib/network/netconnect.pm:831
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Η διεύθυνση DNS πρέπει να είναι της μορφής 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Η διεύθυνση της πύλης πρέπει να είναι της μορφής 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6037,11 +6385,11 @@ msgstr "Ρυθμίσεις διαμεσολαβητών"
 #: ../lib/network/network.pm:549
 #, c-format
 msgid ""
-"Here you can set up your proxies configuration (eg: "
-"http://my_caching_server:8080)"
+"Here you can set up your proxies configuration (eg: http://"
+"my_caching_server:8080)"
 msgstr ""
-"Εδώ μπορείτε να ρυθμίσετε την διαμόρφωση των διαμεσολαβητών (πχ: "
-"http://my_caching_server:8080)"
+"Εδώ μπορείτε να ρυθμίσετε την διαμόρφωση των διαμεσολαβητών (πχ: http://"
+"my_caching_server:8080)"
 
 #: ../lib/network/network.pm:550
 #, c-format
@@ -6096,8 +6444,8 @@ msgid ""
 "\n"
 "Which interfaces should be protected?\n"
 msgstr ""
-"Παρακαλώ επιλέξτε τις διεπαφές που θα προστατεύονται από το τοίχος προστασίας."
-"\n"
+"Παρακαλώ επιλέξτε τις διεπαφές που θα προστατεύονται από το τοίχος "
+"προστασίας.\n"
 "\n"
 "Θα πρέπει να επιλεχθούν όλες οι διεπαφές που συνδέονται στο διαδίκτυο,\n"
 "ενώ οι διεπαφές συνδεδεμένες με το τοπικό δίκτυο μπορούν να αποεπιλεχθούν.\n"
@@ -6134,8 +6482,8 @@ msgstr ""
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
 msgstr ""
-"Μερικά συστατικά (%s) είναι απαραίτητα άλλα δεν είναι διαθέσιμα για το υλικό %"
-"s ."
+"Μερικά συστατικά (%s) είναι απαραίτητα άλλα δεν είναι διαθέσιμα για το υλικό "
+"%s ."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
@@ -6149,8 +6497,8 @@ msgstr "Μερικά πακέτα  (%s) είναι απαραίτητα αλλά
 msgid ""
 "These packages can be found in %s, or in the official %s package repository."
 msgstr ""
-"Αυτά τα πακέτα μπορούν να βρεθούν στην %s, ή στο επίσημο αποθετήριο πακέτων %"
-"s."
+"Αυτά τα πακέτα μπορούν να βρεθούν στην %s, ή στο επίσημο αποθετήριο πακέτων "
+"%s."
 
 #: ../lib/network/thirdparty.pm:152
 #, c-format
@@ -6163,7 +6511,8 @@ msgid ""
 "The required files can also be installed from this URL:\n"
 "%s"
 msgstr ""
-"Τα απαραίτητα αρχεία μπορούν επίσης να εγκατασταθούν από αυτόν τον σύνδεσμό:\n"
+"Τα απαραίτητα αρχεία μπορούν επίσης να εγκατασταθούν από αυτόν τον "
+"σύνδεσμό:\n"
 "%s"
 
 #: ../lib/network/thirdparty.pm:190
@@ -6209,8 +6558,8 @@ msgstr "Εισάγετε μια δισκέτα"
 #: ../lib/network/thirdparty.pm:243
 #, c-format
 msgid ""
-"Insert a FAT formatted floppy in drive %s with %s in root directory and press "
-"%s"
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
 msgstr ""
 "Εισάγετε μια μορφοποιημένη δισκέτα FAT στη συσκευή %s με το %s στον ριζικό "
 "κατάλογο και πατήστε στο %s"
@@ -6370,4 +6719,3 @@ msgstr "Κατάσταση λειτουργίας NAT"
 #, c-format
 msgid "Use specific UDP port"
 msgstr "Χρήση συγκεκριμένης θύρας UDP"
-
diff --git a/po/eo.po b/po/eo.po
index a2d0d97..c2a2ae9 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Interfaco"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-adreso"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokolo"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfiguru lokan reton"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Helpo"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Apliku"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Nuligu"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Jeso"
@@ -95,7 +101,8 @@ msgstr "Jeso"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "Jeso"
 msgid "Please wait"
 msgstr "Bonvole atendu"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Bonvole atendu... Mi aplikas la konfiguraĵon"
@@ -138,6 +145,7 @@ msgstr "Adaptilo %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Retmasko"
@@ -153,6 +161,7 @@ msgid "Started on boot"
 msgstr ""
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr ""
@@ -165,17 +174,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Agordu novan retan interfacon (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Malbona pakaĵo"
@@ -235,12 +246,12 @@ msgid ""
 msgstr ""
 "La konfigurado de la disdividado de la Interreta konekto jam estas farita.\n"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Malŝaltu"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Ŝaltu"
@@ -255,8 +266,8 @@ msgstr "Rekonfiguru"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Printservilo"
@@ -323,7 +334,11 @@ msgstr "Neniu printilo"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -607,13 +622,14 @@ msgstr "Permesu ĉiujn uzulojn"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Fajromuro (Firewall)"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Ne povis kontakti spegulon %s"
@@ -623,12 +639,12 @@ msgstr "Ne povis kontakti spegulon %s"
 msgid "Log"
 msgstr "Protokolo"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Ĉiuj"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -655,12 +671,12 @@ msgstr "Malbona rezerva dosiero"
 msgid "Clear logs"
 msgstr "Forviŝu ĉion"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -808,7 +824,7 @@ msgstr "Reĝimo"
 msgid "Enabled"
 msgstr "Ŝaltu"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Priskribo"
@@ -850,9 +866,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Averto"
@@ -2310,12 +2326,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Konektita"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Ne konektita"
@@ -2380,7 +2396,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "limigu"
@@ -2420,19 +2436,22 @@ msgstr "Model de la karto:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Aŭtentikigado"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Konta Salutnomo (uzula nomo)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Konta Pasvorto"
@@ -2555,13 +2574,15 @@ msgstr ""
 "Ĉiu ero devus esti enigata kiel IP-adreson en punktita-decimala notacio\n"
 "(ekzemple, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Kluzo"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "IP de SMB servilo"
@@ -2587,21 +2608,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Speco de konekto"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "Poŝtejo"
@@ -2612,11 +2637,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adreso devus esti en la notacio 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "IP-adreso devus esti en la notacio 1.2.3.4"
@@ -2635,6 +2662,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Bonvole, provu la muson"
@@ -2656,6 +2684,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Reta Konfiguraĵo"
@@ -2724,27 +2753,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Programeto-bazata"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP (Pasvorta Aŭtentikigada Protokolo)"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Finaparato-bazata"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "per CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3903,90 +3937,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Kabla konekto"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Spertuloreĝimo"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Elektu vian lingvon"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Master"
 msgstr "majota"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Restaŭru de dosiero"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Dua"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Aŭtomate"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Ĉifroŝlosilo:"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Pasvorto"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Konta Salutnomo (uzula nomo)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3994,12 +4031,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Pasvorto"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4018,12 +4055,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4032,32 +4069,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Reto"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4071,17 +4113,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Dokumentaro"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4092,12 +4136,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4109,12 +4154,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4132,107 +4178,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokolo"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Memdetekta"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP (Pasvorta Aŭtentikigada Protokolo)"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Reĝimo"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP (Pasvorta Aŭtentikigada Protokolo)"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "per CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4240,12 +4286,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4254,12 +4300,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4269,12 +4315,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4284,12 +4330,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4307,50 +4353,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4492,6 +4538,285 @@ msgstr "Konektu"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Mi ne detektas eterretan retadaptilom sur via sistemo.  Bonvole lanĉu la\n"
+"aparatokonfigurilon."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Elektu la retan interfacon"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Elektu la retan interfacon"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Problemo okazis dum restarto de la reto: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Mastrumi konektojn"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Aparato: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "LAN Konfiguraĵo"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNA servilo"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS Domajno"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "neniu"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Aŭtomata IP"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Startu ĉe starto"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Diskuma modalo"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Rapido de konekto"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, fuzzy, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Speco de konekto"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telefonnumero de interretprovizanto"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Flu-kontrolo"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Interreta Konfigurado"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Winmodem-konekto"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Uzu ŝlosodosieron"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuvajto"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modemo"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ de Karto"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memoro de Karto (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "I/O (Eneligo) de Karto"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "I/O 0 (Eneligo 0) de Karto"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Eŭropa protokolo (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokolo por la cetera mondo \n"
+"Neniom da D-Kanelo (lukontraktataj lineoj)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Vendinto"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Modulonomo"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "IP-adreso"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Buso"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "IP-adreso devus esti en la notacio 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Kluzo:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfaco :"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Interreta konektaĵo kaj konfiguro"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Unu DNS-a Servilo (nedeviga)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Unu DNS-a Servilo (nedeviga)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Du DNS-a Servilo (nedeviga)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Unu DNS-a Servilo (nedeviga)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Interreta konektaĵo kaj konfiguro"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Interret-aliro"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Speco de konekto"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Stato:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testante vian konektaĵon..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametroj"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4683,11 +5008,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Loka printilo"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Aparato: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4910,6 +5230,103 @@ msgstr "Instalu sistemon"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Servo-Administrilo"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Konfiguraĵo de barilo detektata!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Ĉu vi deziras uzi tiun funkcion?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Neniaj detaloj"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Speco: "
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Reta interfaco: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Speco: "
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokolo: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Plej malalta IP-adreso:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Salutnomo por prokura servilo:"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Servo-Administrilo"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Pordo: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Pordo: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignoru"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Konfiguraĵo de barilo detektata!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Kabla konekto"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Ĉu vi deziras provi la konfiguraĵon?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Neniu pasvorto"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4953,20 +5370,6 @@ msgstr "Interna ISDN-karto"
 msgid "Protocol for the rest of the world"
 msgstr "Protokolo por la cetera mondo"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Eŭropa protokolo (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokolo por la cetera mondo \n"
-"Neniom da D-Kanelo (lukontraktataj lineoj)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5015,11 +5418,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testante vian konektaĵon..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5040,11 +5438,6 @@ msgstr "Via persona telefonnumero"
 msgid "Provider name (ex provider.net)"
 msgstr "Nomo de interretprovizanto (ekz-e provizanto.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telefonnumero de interretprovizanto"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5055,41 +5448,6 @@ msgstr "Provizanto DNS 1 (nedeviga)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provizanto DNS 2 (nedeviga)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Diskuma modalo"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Rapido de konekto"
-
-#: ../lib/network/netconnect.pm:354
-#, fuzzy, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Speco de konekto"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ de Karto"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memoro de Karto (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "I/O (Eneligo) de Karto"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "I/O 0 (Eneligo 0) de Karto"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5252,16 +5610,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domajna nomo"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Unu DNS-a Servilo (nedeviga)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Du DNS-a Servilo (nedeviga)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5553,11 +5901,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS-servila adreso devas esti en formato 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "IP-adreso devus esti en la notacio 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5981,16 +6324,6 @@ msgstr ""
 #~ "\n"
 #~ "Ĉu vi deziras konfiguri vian Lokan Reton (LAN) kun ĉi tiu adaptilo?"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Mi ne detektas eterretan retadaptilom sur via sistemo.  Bonvole lanĉu la\n"
-#~ "aparatokonfigurilon."
-
-#~ msgid "Connection type: "
-#~ msgstr "Speco de konekto"
-
 #~ msgid "disable"
 #~ msgstr "malebligu"
 
@@ -6044,153 +6377,12 @@ msgstr ""
 #~ msgid "Direction"
 #~ msgstr "Direkto"
 
-#~ msgid "none"
-#~ msgstr "neniu"
-
 #~ msgid "Level"
 #~ msgstr "Nivelo"
 
 #~ msgid "default"
 #~ msgstr "defaŭlta"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Servo-Administrilo"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Konfiguraĵo de barilo detektata!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Ĉu vi deziras uzi tiun funkcion?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Neniaj detaloj"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Reta interfaco: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Speco: "
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokolo: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Plej malalta IP-adreso:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Salutnomo por prokura servilo:"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Servo-Administrilo"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Pordo: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignoru"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Konfiguraĵo de barilo detektata!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Kabla konekto"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Ĉu vi deziras provi la konfiguraĵon?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Neniu pasvorto"
-
-#~ msgid "Gateway:"
-#~ msgstr "Kluzo:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfaco :"
-
-#~ msgid "Manage connections"
-#~ msgstr "Mastrumi konektojn"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "LAN Konfiguraĵo"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNA servilo"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS Domajno"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "Aŭtomata IP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Startu ĉe starto"
-
-#~ msgid "Flow control"
-#~ msgstr "Flu-kontrolo"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Interreta Konfigurado"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Winmodem-konekto"
-
-#~ msgid "Use lock file"
-#~ msgstr "Uzu ŝlosodosieron"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Kuvajto"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Modemo"
-
-#~ msgid "Vendor"
-#~ msgstr "Vendinto"
-
-#~ msgid "Module name"
-#~ msgstr "Modulonomo"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "IP-adreso"
-
-#~ msgid "Bus"
-#~ msgstr "Buso"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Elektu la retan interfacon"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Problemo okazis dum restarto de la reto: \n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Malkonektu..."
 
@@ -6198,31 +6390,6 @@ msgstr ""
 #~ msgstr "Konektu..."
 
 #, fuzzy
-#~ msgid "Internet connection configuration"
-#~ msgstr "Interreta konektaĵo kaj konfiguro"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Unu DNS-a Servilo (nedeviga)"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Unu DNS-a Servilo (nedeviga)"
-
-#, fuzzy
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Interreta konektaĵo kaj konfiguro"
-
-#~ msgid "Internet access"
-#~ msgstr "Interret-aliro"
-
-#~ msgid "Status:"
-#~ msgstr "Stato:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametroj"
-
-#, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Neniaj detaloj"
 
diff --git a/po/es.po b/po/es.po
index 18ada79..785f9d0 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,18 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-09 00:29+0000\n"
 "Last-Translator: Diego Bello <dbello@gmail.com>\n"
 "Language-Team: Spanish <mdktrans@blogdrake.net>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../bin/drakconnect-old:45
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Interfaz"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Dirección IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocolo"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "Configure red de área local..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ayuda"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Aplicar"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -95,16 +101,17 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Porfavor espere"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Porfavor espere... Aplicando la configuración"
@@ -140,6 +147,7 @@ msgstr "Adaptador %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Mascara de subred"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "Iniciado al arrancar el equipo"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Cliente DHCP"
@@ -169,17 +178,19 @@ msgstr ""
 "Ejecute el asistente \"%s\" desde el Centro de Control de Mageia Linux"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configurar una nueva interfaz de red (LAN, ISDN,ADSL,...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Sin IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Sin mascara de subred"
@@ -203,18 +214,26 @@ msgstr "Compartir la conexión a internet"
 #, 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). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
 "Usted va a configurar su computador para compartir su conexión a Internet.\n"
-"Con esta característica, otros computadores de su red local serán capaces de usar la conexión a Internet de este computador.\n"
+"Con esta característica, otros computadores de su red local serán capaces de "
+"usar la conexión a Internet de este computador.\n"
 "\n"
-"Asegúrese de que ha configurado su acceso a Red/Internet usando drakconnect antes de continuar,\n"
+"Asegúrese de que ha configurado su acceso a Red/Internet usando drakconnect "
+"antes de continuar,\n"
 "\n"
-"Nota: necesita un adaptador de red dedicado para configurar una Red de Área Local (LAN). Por favor deshabilite el cortafuegos de Mageia en el adaptador de red conectado a su LAN antes de proceder."
+"Nota: necesita un adaptador de red dedicado para configurar una Red de Área "
+"Local (LAN). Por favor deshabilite el cortafuegos de Mageia en el adaptador "
+"de red conectado a su LAN antes de proceder."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -224,7 +243,8 @@ msgid ""
 "\n"
 "What would you like to do?"
 msgstr ""
-"La configuración de Compartición de Conexión a Internet ya ha sido realizada.\n"
+"La configuración de Compartición de Conexión a Internet ya ha sido "
+"realizada.\n"
 "Actualmente está habilitada.\n"
 "\n"
 "¿Qué le gustaría hacer?"
@@ -237,17 +257,18 @@ msgid ""
 "\n"
 "What would you like to do?"
 msgstr ""
-"La configuración de Compartición de Conexión a Internet ya ha sido realizada.\n"
+"La configuración de Compartición de Conexión a Internet ya ha sido "
+"realizada.\n"
 "Actualmente está deshabilitada.\n"
 "\n"
 "¿Qué le gustaría hacer?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Habilitar"
@@ -262,8 +283,8 @@ msgstr "Reconfigurar"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Porfavor seleccione la interfaz que está conectada a internet"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Dispositivo de red"
@@ -271,7 +292,8 @@ msgstr "Dispositivo de red"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one network adapter on your system configured for LAN connections:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
@@ -293,8 +315,12 @@ msgstr ""
 
 #: ../bin/drakgw:156
 #, c-format
-msgid "Please choose what network adapter will be connected to your Local Area Network."
-msgstr "Porfavor seleccione que adaptador de red será conectado a su red de área local"
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"Porfavor seleccione que adaptador de red será conectado a su red de área "
+"local"
 
 #: ../bin/drakgw:177
 #, c-format
@@ -335,7 +361,11 @@ msgstr "El nombre de dominio interno"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -350,10 +380,10 @@ msgstr "Error"
 
 #: ../bin/drakgw:188
 #, c-format
-msgid ""
-"Potential LAN address conflict found in current config of %s!\n"
-""
-msgstr "Conflicto potencial en la dirección de red local encontrado en la actual configuración de %s!\n"
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr ""
+"Conflicto potencial en la dirección de red local encontrado en la actual "
+"configuración de %s!\n"
 
 #: ../bin/drakgw:204
 #, c-format
@@ -380,7 +410,8 @@ msgid ""
 msgstr ""
 "Configuración de servidor DHCP.\n"
 "\n"
-"Aquí puede seleccionar opciones diferentes para la configuración del servidor DHCP.\n"
+"Aquí puede seleccionar opciones diferentes para la configuración del "
+"servidor DHCP.\n"
 "Si no conoce el significado de una opción, simplemente déjela tal cual está."
 
 #: ../bin/drakgw:243
@@ -446,13 +477,18 @@ msgstr "Propagar información de impresora"
 #: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter configured for LAN has been detected on your system.\n"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that "
+"the Mageia firewall is not enabled for network adapter connected to your LAN "
+"network."
 msgstr ""
 "No se ha detectado un adaptador de red configurado para LAN en su sistema.\n"
 "\n"
-"Por favor ejecute la herramienta de configuración de hardware para configurarla, y asegúrese de que el cortafuegos de Mageia no esté habilitado para el adaptador de red conectado a su red LAN."
+"Por favor ejecute la herramienta de configuración de hardware para "
+"configurarla, y asegúrese de que el cortafuegos de Mageia no esté habilitado "
+"para el adaptador de red conectado a su red LAN."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -468,11 +504,13 @@ msgstr "Compartir la conexión a internet ahora está deshabilitada"
 #, 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 ""
 "Todo ha sido configurado.\n"
-"Ahora puede compartir su conexión a Internet con otros computadores en su Red de Área Local, utilizando la configuración automática de red (DHCP) y\n"
+"Ahora puede compartir su conexión a Internet con otros computadores en su "
+"Red de Área Local, utilizando la configuración automática de red (DHCP) y\n"
 "un servidor de Caché de Proxy transparente (SQUID)."
 
 #: ../bin/drakgw:351
@@ -487,8 +525,12 @@ msgstr "Configuración de Cortafuegos detectada!"
 
 #: ../bin/drakgw:366
 #, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
-msgstr "Advertencia! Se ha detectado una configuración para cortafuegos. Puede necesitar correcciones manuales despues de la instalacion."
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+"Advertencia! Se ha detectado una configuración para cortafuegos. Puede "
+"necesitar correcciones manuales despues de la instalacion."
 
 #: ../bin/drakgw:371
 #, c-format
@@ -623,13 +665,14 @@ msgstr "Direcciones permitidas"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Cortafuegos interactivo"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "No se puede contactar al demonio"
@@ -639,12 +682,12 @@ msgstr "No se puede contactar al demonio"
 msgid "Log"
 msgstr "Registro"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Bloquear"
@@ -671,12 +714,12 @@ msgstr "Servicios bloqueados"
 msgid "Clear logs"
 msgstr "Limpiar registros"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Lista blanca"
@@ -758,8 +801,12 @@ msgstr "Se requiere una contraseña."
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "Esta herramienta permite configurar tolerancia a fallos de interfaces de red y replicación de cortafuegos."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
+msgstr ""
+"Esta herramienta permite configurar tolerancia a fallos de interfaces de red "
+"y replicación de cortafuegos."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -822,7 +869,7 @@ msgstr "Módulo"
 msgid "Enabled"
 msgstr "Habilidato"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descripción"
@@ -839,8 +886,16 @@ msgstr "Nuevo perfil..."
 
 #: ../bin/draknetprofile:155
 #, c-format
-msgid "Please specify the name of the new network profile to be created (e.g., work, home, roaming, ..). This new profile will be created based on current settings, and you'll be able to configure your system configuration as usual afterwards."
-msgstr "Por favor especifique el nombre del nuevo perfil de red a ser creado, como por ejemplo, trabajo, casa, romaing, etc. Éste nuevo perfil será creado basándose en la configuración actual, y usted podrá configurar su sistema como de costumbre posteriormente."
+msgid ""
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
+"settings, and you'll be able to configure your system configuration as usual "
+"afterwards."
+msgstr ""
+"Por favor especifique el nombre del nuevo perfil de red a ser creado, como "
+"por ejemplo, trabajo, casa, romaing, etc. Éste nuevo perfil será creado "
+"basándose en la configuración actual, y usted podrá configurar su sistema "
+"como de costumbre posteriormente."
 
 #: ../bin/draknetprofile:166
 #, c-format
@@ -854,12 +909,18 @@ msgstr "Nuevo perfil creado"
 
 #: ../bin/draknetprofile:172
 #, c-format
-msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
-msgstr "Ahora está usando el perfil de red %s. Puede configurar su sistema como de costumbre, y todas las configuraciones de red serán guardadas en este perfil de ahora en adelante."
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+"Ahora está usando el perfil de red %s. Puede configurar su sistema como de "
+"costumbre, y todas las configuraciones de red serán guardadas en este perfil "
+"de ahora en adelante."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
@@ -871,8 +932,12 @@ msgstr "¿Está seguro de que desea borrar el perfil predeterminado?"
 
 #: ../bin/draknetprofile:186
 #, c-format
-msgid "You can not delete the current profile. Please switch to a different profile first."
-msgstr "No puede eliminar el perfil actual. Por favor cambie a un perfil diferente antes."
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
+msgstr ""
+"No puede eliminar el perfil actual. Por favor cambie a un perfil diferente "
+"antes."
 
 #: ../bin/draknetprofile:194 ../bin/draknfs:356
 #, c-format
@@ -994,32 +1059,48 @@ msgstr "Debería ser un directorio."
 #: ../bin/draknfs:146
 #, 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\">los clientes NFS</span> pueden ser especificados de distintas maneras: <span foreground=\"royalblue3\">equipo único:</span> un equipo ya sea por un nombre abreviado reconocido por el resolvedor, nombre de dominio completo, o una dirección IP.\n"
+"<span weight=\"bold\">los clientes NFS</span> pueden ser especificados de "
+"distintas maneras: <span foreground=\"royalblue3\">equipo único:</span> un "
+"equipo ya sea por un nombre abreviado reconocido por el resolvedor, nombre "
+"de dominio completo, o una dirección IP.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">grupos de red:</span> grupos de red NIS pueden ser dados como ·grupo.\n"
+"<span foreground=\"royalblue3\">grupos de red:</span> grupos de red NIS "
+"pueden ser dados como ·grupo.\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">comodines:</span>\n"
-"los nombres de máquina pueden contener los caracteres comodín * y ?. Por ejemplo: *. cs.foo.edu  calza a todos los  equipos  en el dominio cs.foo.edu.\n"
+"los nombres de máquina pueden contener los caracteres comodín * y ?. Por "
+"ejemplo: *. cs.foo.edu  calza a todos los  equipos  en el dominio cs.foo."
+"edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">redes IP</span> también puede exportar directorios a todos los equipos de una (sub-)red IP simultáneamente. Por ejemplo, `/255.255.252.0' o `/22' adjunto a la dirección base de red.\n"
+"<span foreground=\"royalblue3\">redes IP</span> también puede exportar "
+"directorios a todos los equipos de una (sub-)red IP simultáneamente. Por "
+"ejemplo, `/255.255.252.0' o `/22' adjunto a la dirección base de red.\n"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1027,31 +1108,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\">Opciones de ID de Usuario</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">mapear usuario root como anónimo:</span> mapea peticiones de uid/gid 0 al uid/gid anónimo (root_squash).\n"
+"<span foreground=\"royalblue3\">mapear usuario root como anónimo:</span> "
+"mapea peticiones de uid/gid 0 al uid/gid anónimo (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">permitir acceso de root real remoto:</span> apagar root squashing. Esta opción es principalmente útil para clientes sin disco (no_root_squash).\n"
+"<span foreground=\"royalblue3\">permitir acceso de root real remoto:</span> "
+"apagar root squashing. Esta opción es principalmente útil para clientes sin "
+"disco (no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">mapea todos los usuarios a usuario anónimo:</span> mapea todos los uids y gids al usuario anónimo (all_squash). Útil para directorios públicos de FTP exportados por NFS, directorios de spool de noticias, etc. La opción opuesta es no mapear UID de usuario (no_all_squash), lo cual es la configuración predeterminada.\n"
+"<span foreground=\"royalblue3\">mapea todos los usuarios a usuario anónimo:</"
+"span> mapea todos los uids y gids al usuario anónimo (all_squash). Útil para "
+"directorios públicos de FTP exportados por NFS, directorios de spool de "
+"noticias, etc. La opción opuesta es no mapear UID de usuario "
+"(no_all_squash), lo cual es la configuración predeterminada.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid y anongid:</span> establecer el uid y gid de la cuenta anónimo explícitamente.\n"
+"<span foreground=\"royalblue3\">anonuid y anongid:</span> establecer el uid "
+"y gid de la cuenta anónimo explícitamente.\n"
 
 #: ../bin/draknfs:177
 #, c-format
@@ -1080,23 +1176,51 @@ msgstr "Opciones avanzadas"
 
 #: ../bin/draknfs:183
 #, 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> esta opción requiere que las solicitudes se originen en un puerto de Internet menor a IPPORT_RESERVED (1024). Esta opción está activada por defecto."
+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> esta opción requiere que las "
+"solicitudes se originen en un puerto de Internet menor a IPPORT_RESERVED "
+"(1024). Esta opción está activada por defecto."
 
 #: ../bin/draknfs:184
 #, 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> permite peticiones sólo de lectura o de lectura y escritura en este volume NFS. De manera predeterminada no se permiten peticiones con cambios en el sistema de archivo. Esto también puede hacerse explícitamente utilizando esta opción."
+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> permite peticiones sólo de lectura "
+"o de lectura y escritura en este volume NFS. De manera predeterminada no se "
+"permiten peticiones con cambios en el sistema de archivo. Esto también puede "
+"hacerse explícitamente utilizando esta opción."
 
 #: ../bin/draknfs:185
 #, 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> no permite al servidor NFS violar el protocolo NFS ni responder peticiones antes de que cualquier cambio hecho por estas peticiones sea realizado a almacenamiento estable (ej. unidad de disco)."
+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> no permite al servidor NFS violar "
+"el protocolo NFS ni responder peticiones antes de que cualquier cambio hecho "
+"por estas peticiones sea realizado a almacenamiento estable (ej. unidad de "
+"disco)."
 
 #: ../bin/draknfs:186
 #, 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> habilita revisión de subárbol lo que puede ayudar a mejorar la seguridad en algunos casos, pero puede disminuir la confiabilidad. Vea la página de man exports(5) para mas detalles."
+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> habilita revisión de subárbol lo "
+"que puede ayudar a mejorar la seguridad en algunos casos, pero puede "
+"disminuir la confiabilidad. Vea la página de man exports(5) para mas "
+"detalles."
 
 #: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
@@ -1198,7 +1322,8 @@ msgstr "Por favor ingrese un directorio a compartir."
 #: ../bin/draknfs:533
 #, c-format
 msgid "Please use the modify button to set right access."
-msgstr "Por favor utilice el botón 'modificar' para establecer derechos de acceso. "
+msgstr ""
+"Por favor utilice el botón 'modificar' para establecer derechos de acceso. "
 
 #: ../bin/draknfs:548
 #, c-format
@@ -1459,13 +1584,10 @@ msgstr "Esta es una herramienta para configurar Samba de manera fácil."
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
-msgid ""
-"_: Translator(s) name(s) & email(s)\n"
-""
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "_: Translator(s) name(s) & email(s)\n"
 "Diego Bello    dbello@gmail.com\n"
@@ -1509,8 +1631,12 @@ msgstr "Comentario:"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
-msgstr "Ya existe una compartición con el mismo nombre o el nombre de la compartición está vacío, por favor seleccione otro nombre."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+"Ya existe una compartición con el mismo nombre o el nombre de la "
+"compartición está vacío, por favor seleccione otro nombre."
 
 #: ../bin/draksambashare:400
 #, c-format
@@ -1540,8 +1666,11 @@ msgstr "Agregar compartición de Impresora Especial"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "El objetivo de este asistente es crear una compartición de una impresora especial de Samba de manera fácil."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"El objetivo de este asistente es crear una compartición de una impresora "
+"especial de Samba de manera fácil."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -1566,7 +1695,9 @@ msgstr "El asistente ha agregado la impresora Samba compartida exitosamente"
 #: ../bin/draksambashare:552
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
-msgstr "Por favor agregue o seleccione una impresora Samba compartida para poder modificarla."
+msgstr ""
+"Por favor agregue o seleccione una impresora Samba compartida para poder "
+"modificarla."
 
 #: ../bin/draksambashare:570
 #, c-format
@@ -1646,7 +1777,8 @@ msgstr "Entrada DrakSamba"
 #: ../bin/draksambashare:695
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Por favor agregue o seleccione una compartición Samba para poder modificarla."
+msgstr ""
+"Por favor agregue o seleccione una compartición Samba para poder modificarla."
 
 #: ../bin/draksambashare:718
 #, c-format
@@ -1680,8 +1812,11 @@ msgstr "Público:"
 
 #: ../bin/draksambashare:795
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Máscara de creación, modo de creación y directorio deberían ser números, por ejemplo: 0755"
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Máscara de creación, modo de creación y directorio deberían ser números, por "
+"ejemplo: 0755"
 
 #: ../bin/draksambashare:803
 #, c-format
@@ -1730,8 +1865,12 @@ msgstr "Asistente de configuración de servidor Samba"
 
 #: ../bin/draksambashare:1057
 #, c-format
-msgid "Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
-msgstr "Samba permite a su servidor actuar como un servidor de archivos e impresoras para estaciones de trabajo funcionando con sistemas no-Linux."
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
+msgstr ""
+"Samba permite a su servidor actuar como un servidor de archivos e impresoras "
+"para estaciones de trabajo funcionando con sistemas no-Linux."
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1740,18 +1879,29 @@ msgstr "Servidor PDC: controlador de dominio primario"
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
-msgstr "Un servidor configurado como PDC es responsable de autenticación de Windows a través del dominio."
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+"Un servidor configurado como PDC es responsable de autenticación de Windows "
+"a través del dominio."
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Instalaciones de servidor único pueden utilizar los backends de contraseñas smbpasswd o tdbsam "
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Instalaciones de servidor único pueden utilizar los backends de contraseñas "
+"smbpasswd o tdbsam "
 
 #: ../bin/draksambashare:1073
 #, 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 "Dominio maestro = yes, causa que el servidor registre el nombre NetBIOS <pdc name>. Este nombre será reconocido por otros servidores."
+msgid ""
+"Domain master = yes, causes the server to register the NetBIOS name <pdc "
+"name>. This name will be recognized by other servers."
+msgstr ""
+"Dominio maestro = yes, causa que el servidor registre el nombre NetBIOS <pdc "
+"name>. Este nombre será reconocido por otros servidores."
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -1775,8 +1925,18 @@ msgstr "Nivel de Os:"
 
 #: ../bin/draksambashare:1092
 #, 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 "La opción de nivel global de os dicta el nivel de sistema operativo al que Samba enmascarará durante una elección de navegador. Si desea que Samba gane la elección y se convierta en el navegador maestro, puede configurar el nivel sobre el del sistema operativo de su red con el mayor valor actual. Por ejemplo, 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 ""
+"La opción de nivel global de os dicta el nivel de sistema operativo al que "
+"Samba enmascarará durante una elección de navegador. Si desea que Samba gane "
+"la elección y se convierta en el navegador maestro, puede configurar el "
+"nivel sobre el del sistema operativo de su red con el mayor valor actual. "
+"Por ejemplo, os level = 34"
 
 #: ../bin/draksambashare:1096
 #, c-format
@@ -1815,18 +1975,32 @@ msgstr "Modo de seguridad"
 
 #: ../bin/draksambashare:1122
 #, c-format
-msgid "User level: the client sends a session setup request directly following protocol negotiation. This request provides a username and password."
-msgstr "Nivel de usuario: el cliente envía directamente una petición de configuración de sesión siguiendo el protocolo de negociación. Esta petición provee nombre de usuario y contraseña."
+msgid ""
+"User level: the client sends a session setup request directly following "
+"protocol negotiation. This request provides a username and password."
+msgstr ""
+"Nivel de usuario: el cliente envía directamente una petición de "
+"configuración de sesión siguiendo el protocolo de negociación. Esta petición "
+"provee nombre de usuario y contraseña."
 
 #: ../bin/draksambashare:1122
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
-msgstr "Nivel de compartición: el cliente se autentica a sí mismo separadamente para cada compartición"
+msgstr ""
+"Nivel de compartición: el cliente se autentica a sí mismo separadamente para "
+"cada compartición"
 
 #: ../bin/draksambashare:1122
 #, 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 "Nivel de dominio: provee un mecanismo para almacenar todas las cuentas de usuario y grupo en un repositorio de cuentas central compartido. El repositorio de cuentas centralizado es compartido entre los controladores (de seguridad) del dominio."
+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 ""
+"Nivel de dominio: provee un mecanismo para almacenar todas las cuentas de "
+"usuario y grupo en un repositorio de cuentas central compartido. El "
+"repositorio de cuentas centralizado es compartido entre los controladores "
+"(de seguridad) del dominio."
 
 #: ../bin/draksambashare:1133
 #, c-format
@@ -1840,8 +2014,12 @@ msgstr "Pancarta del servidor."
 
 #: ../bin/draksambashare:1138
 #, c-format
-msgid "The banner is the way this server will be described in the Windows workstations."
-msgstr "La pancarta es la forma en que este servidor será descrito en las estaciones de trabajo Windows."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"La pancarta es la forma en que este servidor será descrito en las estaciones "
+"de trabajo Windows."
 
 #: ../bin/draksambashare:1143
 #, c-format
@@ -1860,18 +2038,26 @@ msgstr "Registros de Samba"
 
 #: ../bin/draksambashare:1154
 #, c-format
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
-msgstr "Archivo de registros: utilice archivo.%m para un archivo de registros separado por cada máquina que se conecta"
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
+"Archivo de registros: utilice archivo.%m para un archivo de registros "
+"separado por cada máquina que se conecta"
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Nivel de registro: establezca el nivel de verbosidad del registro (o <= nivel de registro <= 10)"
+msgstr ""
+"Nivel de registro: establezca el nivel de verbosidad del registro (o <= "
+"nivel de registro <= 10)"
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Tamaño máximo de registro: poner una cota al tamaño de los archivos de registros, en Kb."
+msgstr ""
+"Tamaño máximo de registro: poner una cota al tamaño de los archivos de "
+"registros, en Kb."
 
 #: ../bin/draksambashare:1161 ../bin/draksambashare:1179
 #, c-format
@@ -1891,17 +2077,27 @@ msgstr "Nivel de registro:"
 #: ../bin/draksambashare:1168
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
-msgstr "El asistente recolectó los siguientes parámetros para configurar Samba."
+msgstr ""
+"El asistente recolectó los siguientes parámetros para configurar Samba."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
-msgstr "Para aceptar estos valores y configurar su servidor, presione el botón 'Siguiente' o utilice el botón 'Atrás' para corregirlos."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Para aceptar estos valores y configurar su servidor, presione el botón "
+"'Siguiente' o utilice el botón 'Atrás' para corregirlos."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Si usted ha creado comparticiones previamente, aparecerán en esta configuración. Ejecute 'drakwizard sambashare\" para administrar sus comparticiones."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run 'drakwizard sambashare' to manage your shares."
+msgstr ""
+"Si usted ha creado comparticiones previamente, aparecerán en esta "
+"configuración. Ejecute 'drakwizard sambashare\" para administrar sus "
+"comparticiones."
 
 #: ../bin/draksambashare:1176
 #, c-format
@@ -2292,15 +2488,19 @@ msgstr "Medida local"
 
 #: ../bin/net_monitor:512
 #, c-format
-msgid "Warning, another internet connection has been detected, maybe using your network"
-msgstr "Advertencia, se ha detectado otra conexión a Internet, tal vez utilizando su red."
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"Advertencia, se ha detectado otra conexión a Internet, tal vez utilizando su "
+"red."
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "No conectado"
@@ -2365,7 +2565,7 @@ msgstr "Habilitar contabilidad de tráfico"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Permitir que la interfaz sea controlada por el Administrador de Redes"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Métrica"
@@ -2378,7 +2578,8 @@ msgstr "MTU"
 #: ../lib/network/connection.pm:253
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
-msgstr "Tamaño máximo de mensaje de red (MTU). Si no está seguro, deje en blanco."
+msgstr ""
+"Tamaño máximo de mensaje de red (MTU). Si no está seguro, deje en blanco."
 
 #: ../lib/network/connection.pm:333
 #, c-format
@@ -2405,19 +2606,22 @@ msgstr "Cable módem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Usar BPALogin (necesario para Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autenticación"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Cuenta de ingreso (nombre de usuario)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Contraseña de la cuenta"
@@ -2469,7 +2673,8 @@ msgid ""
 "Entering the wrong PIN code multiple times may lock your SIM card!"
 msgstr ""
 "Ingresó un código PIN erróneo.\n"
-"¡Ingresar muchas veces un código de PIN incorrecto puede bloquear su tarjeta SIM!"
+"¡Ingresar muchas veces un código de PIN incorrecto puede bloquear su tarjeta "
+"SIM!"
 
 #: ../lib/network/connection/dvb.pm:9
 #, c-format
@@ -2514,7 +2719,9 @@ msgstr "Interfaz virtual"
 #: ../lib/network/connection/ethernet.pm:60
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "No se puede encontrar una interfaz de red para el dispositivo seleccionado (usando el controlador %s)."
+msgstr ""
+"No se puede encontrar una interfaz de red para el dispositivo seleccionado "
+"(usando el controlador %s)."
 
 #: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
@@ -2542,13 +2749,15 @@ msgstr ""
 "Cada ítem debe ser ingresado como una dirección IP en notación\n"
 "decimal separada con puntos (por ejemplo, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Puerta de enlave"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Obtener servidores DNS desde DHCP"
@@ -2571,24 +2780,30 @@ msgstr "Dominio de búsqueda"
 #: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
-msgstr "De manera predeterminada, el dominio de búsqueda será el nombre de equipo totalmente calificado"
+msgstr ""
+"De manera predeterminada, el dominio de búsqueda será el nombre de equipo "
+"totalmente calificado"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Tiempo de espera DHCP (en segundos)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Obtener servidores YP desde DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Obtener servidores NTPD desde DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nombre de equipo DHCP"
@@ -2599,11 +2814,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "No usar Zeroconf en caso de fallo (red 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "La dirección IP debe estar en formato 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "La máscara de red debe estar en formato 255.255.224.0"
@@ -2615,25 +2832,46 @@ msgstr "Advertencia: ¡la dirección IP %s es usualmente reservada!"
 
 #: ../lib/network/connection/ethernet.pm:195
 #, c-format
-msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
-msgstr "%s ya está siendo usada por una conexión que inicia durante el arranque (%s). Para usar esta dirección con esta conexión, primero deshabilite todos los otros dispositivos que la usen, o configúrelos para que no inicien durante el arranque."
+msgid ""
+"%s is already used by a connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start at boot"
+msgstr ""
+"%s ya está siendo usada por una conexión que inicia durante el arranque "
+"(%s). Para usar esta dirección con esta conexión, primero deshabilite todos "
+"los otros dispositivos que la usen, o configúrelos para que no inicien "
+"durante el arranque."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Asignar nombre de equipo desde el servidor DHCP (o generar uno único)"
 
 #: ../lib/network/connection/ethernet.pm:223
 #, c-format
-msgid "This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically."
-msgstr "Esto permitirá al servidor atribuir un nombre a esta máquina. Si el servidor no provee un nombre de equipo válido, será generado automáticamente."
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+"Esto permitirá al servidor atribuir un nombre a esta máquina. Si el servidor "
+"no provee un nombre de equipo válido, será generado automáticamente."
 
 #: ../lib/network/connection/ethernet.pm:226
 #, c-format
-msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
-msgstr "Usted debe definir un nombre de equipo para este equipo, el cual identificará a este PC. Note que este nombre de equipo será compartido entre todas las conexiones de red.  Si se deja en blanco, se utilizará 'localhost.localdomain'."
+msgid ""
+"You should define a hostname for this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections.  If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+"Usted debe definir un nombre de equipo para este equipo, el cual "
+"identificará a este PC. Note que este nombre de equipo será compartido entre "
+"todas las conexiones de red.  Si se deja en blanco, se utilizará 'localhost."
+"localdomain'."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Enchufe en caliente de la red"
@@ -2661,7 +2899,8 @@ msgstr "Se obtuvo una dirección de red en la interfaz %s (protocolo %s)"
 #: ../lib/network/connection/ethernet.pm:309
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
-msgstr "Falló la obtención de una dirección de red en la interfaz %s (protocolo %s)"
+msgstr ""
+"Falló la obtención de una dirección de red en la interfaz %s (protocolo %s)"
 
 #: ../lib/network/connection/isdn.pm:8
 #, c-format
@@ -2702,27 +2941,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Módem de teléfono analógico (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Basado en script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Basado en terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3881,88 +4125,96 @@ msgstr "Clave pre-compartida WPA/WPA2"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Empresarial"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Controlador de Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
-msgstr "Su tarjeta inalámbrica está deshabilitada, por favor habilite el interruptor inalámbrico primero (RF kill switch)."
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
+msgstr ""
+"Su tarjeta inalámbrica está deshabilitada, por favor habilite el interruptor "
+"inalámbrico primero (RF kill switch)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Configuraciones inalámbricas"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Modo de operación"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Administrada"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Maestro"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repetidor"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secundario"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nombre de red (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Modo de encriptación"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Llave de encriptación"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Ocultar contraseña"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
-msgstr "Forzar el uso de esta llave como cadena ASCII (por ejemplo, para Livebox)"
+msgstr ""
+"Forzar el uso de esta llave como cadena ASCII (por ejemplo, para Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Login/Nombre de usuario EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3975,12 +4227,12 @@ msgstr ""
 "   DOMINIO\n"
 "ombre_de_usuario"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Contraseña EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4008,17 +4260,18 @@ msgstr ""
 "\n"
 "Si Auto Detect falla, intente el combo PEAP TTLS antes que otros\n"
 "Nota:\n"
-"<span class=\"whitespace other\" title=\"Tab\">»</span>Las configuraciones MD5, MSCHAPV2, OTP y GTC automáticamente\n"
+"<span class=\"whitespace other\" title=\"Tab\">»</span>Las configuraciones "
+"MD5, MSCHAPV2, OTP y GTC automáticamente\n"
 "implican los modos PEAP y TTLS.\n"
 "  El modo TLS se basa completamente en certificados y puede ignorar\n"
 "los valores de nombre de usuario y contraseña especificados aquí."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Certificado de cliente EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4028,80 +4281,99 @@ msgid ""
 msgstr ""
 "LA ruta completa y el nombre de archivo del certificado cliente. Esto\n"
 "sólo es usado para autenticación basada en certificados EAP. Esto\n"
-"podría ser considerado como una alternativa al combo nombre_de_usuario/contraseña.\n"
+"podría ser considerado como una alternativa al combo nombre_de_usuario/"
+"contraseña.\n"
 " Nota: en la página Avanzado se muestran otras configuraciones relacionadas."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID de red"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frecuencia de operación"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Límite de sensibilidad"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Tasa de bits (en b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, 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 ""
-"RTS/CTS agrega una negociación antes de cada transmisión de paquetes para asegurarse de que\n"
-"el canal está despejado. Esto agrega carga, pero incrementa el desempeño en casos de nodos\n"
-"ocultos o grandes números de nodos activos. Este parámetro establece el tamaño del paquete\n"
-"mas pequeño para el cual el nodo envía RTS, un valor igual al máximo tamaño de paquete que\n"
-"deshabilita el esquema. También puede configurar este parámetro a auto, fijo o apagado."
+"RTS/CTS agrega una negociación antes de cada transmisión de paquetes para "
+"asegurarse de que\n"
+"el canal está despejado. Esto agrega carga, pero incrementa el desempeño en "
+"casos de nodos\n"
+"ocultos o grandes números de nodos activos. Este parámetro establece el "
+"tamaño del paquete\n"
+"mas pequeño para el cual el nodo envía RTS, un valor igual al máximo tamaño "
+"de paquete que\n"
+"deshabilita el esquema. También puede configurar este parámetro a auto, fijo "
+"o apagado."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentación"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Argumentos extra del comando iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 ""
-"Aquí se pueden configurar algunos parámetros inalámbricos adicionales, tales como:\n"
-"ap, canal, commit, enc, power, retry, sens, txpower (nick ya está configurado como el nombre de equipo).\n"
+"Aquí se pueden configurar algunos parámetros inalámbricos adicionales, tales "
+"como:\n"
+"ap, canal, commit, enc, power, retry, sens, txpower (nick ya está "
+"configurado como el nombre de equipo).\n"
 "Vea la página man iwconfig(8) para mayor información."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Argumentos extra para el comando iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4113,28 +4385,34 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 "iwspy se usa para asignar una lista de direcciones en una interfaz de\n"
-"red inalámbrica y para leer información de la calidad del enlace para cada uno de ellos.\n"
+"red inalámbrica y para leer información de la calidad del enlace para cada "
+"uno de ellos.\n"
 "\n"
-"Esta información es la misma que la que está disponible en /proc/net/wireless:\n"
+"Esta información es la misma que la que está disponible en /proc/net/"
+"wireless:\n"
 "calidad del enlace, fuerza de la señal y nivel de ruido.\n"
 "\n"
 "Vea la página de man iwspy(8) para mas información."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Argumentos extra para el comando iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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."
@@ -4142,36 +4420,38 @@ msgstr ""
 "iwpriv le permite configurar parámetros opcionales de una interfaz de\n"
 "red inalámbrica.\n"
 "\n"
-"iwpriv trabaja con parámetros y configuraciones específicas para cada controlador (de manera opuesta a\n"
+"iwpriv trabaja con parámetros y configuraciones específicas para cada "
+"controlador (de manera opuesta a\n"
 "iwconfig, el cual trabaja con parámetros y configuraciones genéricas).\n"
 "\n"
-"En teoría, la documentación de cada controlador de dispositivo debería indicar cómo\n"
+"En teoría, la documentación de cada controlador de dispositivo debería "
+"indicar cómo\n"
 "utilizar aquellos comandos específicos de interfaz y su efecto.\n"
 "\n"
 "Vea la página man iwpriv(8) para más información."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protocolo EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Detectar automáticamente"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4180,67 +4460,67 @@ msgstr ""
 "Se recomienda Auto Detect ya que intenta primero WPA versión 2\n"
 "y luego sigue con WPA versión 1 en caso de fallo"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Modo EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4249,12 +4529,12 @@ msgstr ""
 "lista de protocolos de administración de llaves autenticadas aceptados.\n"
 "Valores posibles son WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Identidad externa EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4265,12 +4545,12 @@ msgstr ""
 "identidad desencriptada con tipos EAP que soportan distintas\n"
 "identidades tuneleadas, ej, TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4283,12 +4563,12 @@ msgstr ""
 "auth=MSCHAPV2 para PEAP o\n"
 "autheap=MSCHAPV2 autheap=MD5 para TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Certificado de CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4303,12 +4583,12 @@ msgstr ""
 "debería cofigurar un certificado CA de confianza cuando se use\n"
 "TLS o TTLS o PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Calce de asunto de certificado EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4323,12 +4603,12 @@ msgstr ""
 "cadena en el asunto.  La cadena del asunto está en el siguiente formato:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Directivas extra"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4358,42 +4638,58 @@ msgstr ""
 "»Others such as key_mgmt, eap maybe used to force\n"
 "»configuraciones especiales diferentes de las configuraciones U.I."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Se requiere una llave de encriptación"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
-msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
-msgstr "La llave pre-compartida debe tener entre 8 y 63 caracteres ASCII, o 64 caracteres hexadecimales."
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+"La llave pre-compartida debe tener entre 8 y 63 caracteres ASCII, o 64 "
+"caracteres hexadecimales."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
-msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
-msgstr "La llave WEP debería tener a lo mas %d caracteres ASCII o %d caracteres hexadecimales."
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+"La llave WEP debería tener a lo mas %d caracteres ASCII o %d caracteres "
+"hexadecimales."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 debe tener el sufijo k, M o G (por ejemplo, \"2.46G\" para una frecuencia de 2.46 GHz), o agregar suficientes '0' (ceros)."
+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 debe tener el sufijo k, M o G (por ejemplo, \"2.46G\" para una "
+"frecuencia de 2.46 GHz), o agregar suficientes '0' (ceros)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "Tasa debe tener el sufijo k, M o G (por ejemplo, \"11M\" para 11M), o agregue suficientes '0' (ceros)."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Tasa debe tener el sufijo k, M o G (por ejemplo, \"11M\" para 11M), o "
+"agregue suficientes '0' (ceros)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Permitir roaming del punto de acceso"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Se ha asociado a la red inalámbrica \"%s\" en la interfaz %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Se perdió la asociación a la red inalámbrica en la interfaz %s"
@@ -4411,18 +4707,24 @@ msgstr "Módem Alcatel speedtouch USB"
 #: ../lib/network/connection/xdsl.pm:125
 #, 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 ""
-"El módem ECI Hi-Focus no puede ser soportado debido a un problema con la distribución de controlador binario.\n"
+"El módem ECI Hi-Focus no puede ser soportado debido a un problema con la "
+"distribución de controlador binario.\n"
 "\n"
 "Puede encontrar un controlador en http://eciadsl.flashtux.org/"
 
 #: ../lib/network/connection/xdsl.pm:185
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
-msgstr "Módems usando chipsets Conexant AccessRunner no pueden ser soportados debido a problemas de distribución de firmware binario."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
+msgstr ""
+"Módems usando chipsets Conexant AccessRunner no pueden ser soportados debido "
+"a problemas de distribución de firmware binario."
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4535,6 +4837,285 @@ msgstr "Conectar"
 msgid "Hostname changed to \"%s\""
 msgstr "Nombre de equipo ha cambiado a \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Interfaz de red"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Seleccione la interfaz de red a configurar:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocurrió un problema al reiniciar la red:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Felicitaciones, la configuración de red ha finalizado."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Administrar conexiones VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Dispositivo: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Configuración de VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Servidor DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Dominio de búsqueda"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automático"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Iniciado al arrancar el equipo"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Modo de marcado"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Velocidad de conexión"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Tiempo de espera de conexión (en segundos)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Número de teléfono del proveedor"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Conexión por modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Seleccionar un archivo"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Módem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ de tarjeta"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memoria de tarjeta (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO de tarjeta"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 de tarjeta"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocolo Europeo (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocolo para el resto del mundo\n"
+"Sin D-Channel (leased lines)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Módulo"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Dirección real"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Bielorusia"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "La dirección de la puerta de enlace debe tener formato 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Puerta de enlave"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interfaz"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "No hay conexión a internet configurada"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Usted no tiene configurada una conexión a Internet.\n"
+"Ejecute el asistente \"%s\" desde el Centro de Control de Mageia Linux"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Primer servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primer servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Segundo servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Primer servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configuración de conexión"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Acceso a impresora"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Tiempo de conexión: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Estado"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Probando su conexión..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Parámetros IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4726,10 +5307,12 @@ msgstr "Registrar mensajes del cortafuegos en los registros del sistema"
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
-"Puede ser advertido cuando alguien accede a un servicio o intenta ingresar en su computador.\n"
+"Puede ser advertido cuando alguien accede a un servicio o intenta ingresar "
+"en su computador.\n"
 "Por favor seleccione cuáles actividades de red deberían ser vigiladas."
 
 #: ../lib/network/drakfirewall.pm:316
@@ -4742,11 +5325,6 @@ msgstr "Usar cortafuegos interactivo"
 msgid "No device found"
 msgstr "No se encontró dispositivo"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Dispositivo: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4785,7 +5363,8 @@ msgstr "¡No se puede inicializar el tipo de conexión %s!"
 #: ../lib/network/drakvpn.pm:60
 #, c-format
 msgid "Please select an existing VPN connection or enter a new name."
-msgstr "Por favor seleccione una conexión VPN existente o ingrese un nuevo nombre."
+msgstr ""
+"Por favor seleccione una conexión VPN existente o ingrese un nuevo nombre."
 
 #: ../lib/network/drakvpn.pm:64
 #, c-format
@@ -4822,14 +5401,17 @@ msgstr "¿Desea iniciar la conexión ahora?"
 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 ""
 "La conexión VPN está configurada.\n"
 "\n"
-"Esta conexión VPN puede ser iniciada automáticamente junto con una conexión de red.\n"
-"Se puede hacer reconfigurando la conexión de red y seleccionando esta conexión VPN.\n"
+"Esta conexión VPN puede ser iniciada automáticamente junto con una conexión "
+"de red.\n"
+"Se puede hacer reconfigurando la conexión de red y seleccionando esta "
+"conexión VPN.\n"
 
 #: ../lib/network/ifw.pm:132
 #, c-format
@@ -4883,11 +5465,14 @@ msgstr "%s ha intentado un ataque \"%s\""
 
 #: ../lib/network/ifw.pm:151
 #, c-format
-msgid "The \"%s\" application is trying to make a service (%s) available to the network."
-msgstr "La aplicación \"%s\" está tratando de dejar un servicio (%s) disponible para la red."
+msgid ""
+"The \"%s\" application is trying to make a service (%s) available to the "
+"network."
+msgstr ""
+"La aplicación \"%s\" está tratando de dejar un servicio (%s) disponible para "
+"la red."
 
-#. -PO: this should be kept lowercase since the expression is meant to be used
-#. between brackets
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -4914,7 +5499,8 @@ msgstr "Automático"
 #: ../lib/network/ndiswrapper.pm:30
 #, c-format
 msgid "No device supporting the %s ndiswrapper driver is present!"
-msgstr "¡No hay un dispositivo disponible que soporte el controlador ndiswrapper %s!"
+msgstr ""
+"¡No hay un dispositivo disponible que soporte el controlador ndiswrapper %s!"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
@@ -4923,8 +5509,14 @@ msgstr "Por favor seleccione el controlador correcto"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver description (.inf) file, or corresponding driver file (.dll or .o files). Note that only drivers up to Windows XP are supported."
-msgstr "Por favor seleccione el archivo descriptor del controlador de Windows (.inf), o el archivo de controlador correspondiente (archivos .dll o .o). Note que sólo se soportan los controladores hasta Windows XP."
+msgid ""
+"Please select the Windows driver description (.inf) file, or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
+"Por favor seleccione el archivo descriptor del controlador de Windows (."
+"inf), o el archivo de controlador correspondiente (archivos .dll o .o). Note "
+"que sólo se soportan los controladores hasta Windows XP."
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4970,6 +5562,103 @@ msgstr "Instalar un nuevo controlador"
 msgid "Select a device:"
 msgstr "Seleccionar un dispositivo:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Ataque de servicio"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Modo automático de Cortafuegos Interactivo"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "¿Cómo desea marcar esta conexión?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interfaz de red"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocolo"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Dirección IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Ataque de servicio"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Cortafuegos interactivo"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Conexión inalámbrica"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "¿Cómo desea marcar esta conexión?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5015,20 +5704,6 @@ msgstr "Tarjeta ISDN interna"
 msgid "Protocol for the rest of the world"
 msgstr "Protocolo para el resto del mundo"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocolo Europeo (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocolo para el resto del mundo\n"
-"Sin D-Channel (leased lines)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5079,11 +5754,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Control de conexión"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Probando su conexión..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5104,11 +5774,6 @@ msgstr "Su número de teléfono personal"
 msgid "Provider name (ex provider.net)"
 msgstr "Nombre de proveedor (ej.proveedor.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Número de teléfono del proveedor"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5119,41 +5784,6 @@ msgstr "DNS 1 de proveedor (opcional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 de proveedor (opcional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Modo de marcado"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Velocidad de conexión"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Tiempo de espera de conexión (en segundos)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ de tarjeta"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memoria de tarjeta (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO de tarjeta"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 de tarjeta"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5187,11 +5817,12 @@ 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"
-"Si posee una tarjeta ISA, los valores en la pantalla siguiente deberían estar correctos.\n"
+"Si posee una tarjeta ISA, los valores en la pantalla siguiente deberían "
+"estar correctos.\n"
 "\n"
 "Si posee una tarjeta PCMCIA, debe saber el \"irq\" e \"io\" de su tarjeta.\n"
 
@@ -5212,8 +5843,14 @@ msgstr "¿Cuál de las siguientes es su tarjeta ISDN?"
 
 #: ../lib/network/netconnect.pm:461
 #, 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 "Está disponible un controlador CAPI para este módem. Este controlador CAPI puede ofrecer más características que el controlador libre (como el envío de fax). ¿Cuál controlador desea utilizar?"
+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 ""
+"Está disponible un controlador CAPI para este módem. Este controlador CAPI "
+"puede ofrecer más características que el controlador libre (como el envío de "
+"fax). ¿Cuál controlador desea utilizar?"
 
 #: ../lib/network/netconnect.pm:475
 #, c-format
@@ -5313,16 +5950,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nombre de dominio"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primer servidor DNS (opcional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Segundo servidor DNS (opcional)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5384,13 +6011,21 @@ msgstr "Ocurrieron problemas durante las pruebas de conectividad de red."
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
-msgid "This can be caused by invalid network configuration, or problems with your modem or router."
-msgstr "Esto puede ser causado por una configuración inválida de red, o problemas con su modem o router."
+msgid ""
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+"Esto puede ser causado por una configuración inválida de red, o problemas "
+"con su modem o router."
 
 #: ../lib/network/netconnect.pm:772
 #, c-format
-msgid "You might want to relaunch the configuration to verify the connection settings."
-msgstr "Tal vez quiera relanzar la configuración para verificar las opciones de conexión."
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
+msgstr ""
+"Tal vez quiera relanzar la configuración para verificar las opciones de "
+"conexión."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
@@ -5399,12 +6034,18 @@ msgstr "Felicitaciones, la configuración de red ha finalizado."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
-msgid "However, the Internet connectivity test failed. You should test your connection manually, and verify your Internet modem or router."
-msgstr "Sin embargo, la prueba de conexión a Internet ha fallado. Debe probar su conexión manualmente, y verificar su modem Internet o router."
+msgid ""
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
+msgstr ""
+"Sin embargo, la prueba de conexión a Internet ha fallado. Debe probar su "
+"conexión manualmente, y verificar su modem Internet o router."
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
-msgid "If your connection does not work, you might want to relaunch the configuration."
+msgid ""
+"If your connection does not work, you might want to relaunch the "
+"configuration."
 msgstr "Si su conexión no funciona, tal vez quera relanzar la configuración."
 
 #: ../lib/network/netconnect.pm:778
@@ -5414,8 +6055,12 @@ msgstr "Felicidades, la configuración de red e Internet ha finalizado."
 
 #: ../lib/network/netconnect.pm:779
 #, c-format
-msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
-msgstr "Después de hacer esto, recomendamos que reinicie su ambiente X para evitar problemas relacionados al nombre de equipo."
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+"Después de hacer esto, recomendamos que reinicie su ambiente X para evitar "
+"problemas relacionados al nombre de equipo."
 
 #: ../lib/network/netconnect.pm:790
 #, c-format
@@ -5514,12 +6159,15 @@ msgstr "El nombre de equipo Zeroconf debe contener un ."
 #: ../lib/network/netconnect.pm:813
 #, 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 ""
-"Debido a que está realizando una instalación por red, su red ya está configurada.\n"
-"Presione Ok para mantener su configuración, o Cancelar para reconfigurar su conexión a red e Internet.\n"
+"Debido a que está realizando una instalación por red, su red ya está "
+"configurada.\n"
+"Presione Ok para mantener su configuración, o Cancelar para reconfigurar su "
+"conexión a red e Internet.\n"
 
 #: ../lib/network/netconnect.pm:816
 #, c-format
@@ -5561,7 +6209,6 @@ msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
-""
 msgstr ""
 "Ha configurado muchas maneras para conectarse a Internet.\n"
 "Seleccione la que desea utilizar.\n"
@@ -5579,8 +6226,12 @@ msgstr "Configurando el dispositivo de red %s (controlador %s)"
 
 #: ../lib/network/netconnect.pm:824
 #, c-format
-msgid "The following protocols can be used to configure a LAN connection. Please choose the one you want to use."
-msgstr "Los siguientes protocolos pueden ser utilizados para configurar una conexión LAN. Por favor seleccione el que desea utilizar."
+msgid ""
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use."
+msgstr ""
+"Los siguientes protocolos pueden ser utilizados para configurar una conexión "
+"LAN. Por favor seleccione el que desea utilizar."
 
 #: ../lib/network/netconnect.pm:825
 #, c-format
@@ -5593,23 +6244,20 @@ msgstr ""
 "Por favor ingrese su nombre de equipo.\n"
 "Su nombre de equipo debe ser un nombre de equipo totalmente-calificado,\n"
 "tal como ``mybox.mylab.myco.com\".\n"
-"También puede ingresar la dirección IP de la puerta de enlace si tiene alguna."
+"También puede ingresar la dirección IP de la puerta de enlace si tiene "
+"alguna."
 
 #: ../lib/network/netconnect.pm:830
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr "Por último, también puede proveer las direcciones IP de sus servidores DNS."
+msgstr ""
+"Por último, también puede proveer las direcciones IP de sus servidores DNS."
 
 #: ../lib/network/netconnect.pm:831
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "La dirección del servidor DNS debe tener formato 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "La dirección de la puerta de enlace debe tener formato 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5631,8 +6279,12 @@ msgstr "Configuraciones avanzadas de red"
 
 #: ../lib/network/network.pm:524
 #, c-format
-msgid "Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."
-msgstr "Aquí puede realizar configuraciones avanzadas de red. Por favor note que debe reiniciar la máquina para que los cambios tengan efecto."
+msgid ""
+"Here you can configure advanced network settings. Please note that you have "
+"to reboot the machine for changes to take effect."
+msgstr ""
+"Aquí puede realizar configuraciones avanzadas de red. Por favor note que "
+"debe reiniciar la máquina para que los cambios tengan efecto."
 
 #: ../lib/network/network.pm:526
 #, c-format
@@ -5691,7 +6343,9 @@ msgstr "Configuración de proxies"
 
 #: ../lib/network/network.pm:549
 #, 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 "Aquí puede configurar sus proxies (ej: http://my_caching_server:8080)"
 
 #: ../lib/network/network.pm:550
@@ -5746,12 +6400,13 @@ msgid ""
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
-""
 msgstr ""
 "Por favor elija las interfaces que serán protegidas por el cortafuegos.\n"
 "\n"
-"Todas las interfaces conectadas directamente a Internet deberían ser seleccionadas,\n"
-"mientras que las interfaces conectadas a la red local pueden no estar seleccionadas.\n"
+"Todas las interfaces conectadas directamente a Internet deberían ser "
+"seleccionadas,\n"
+"mientras que las interfaces conectadas a la red local pueden no estar "
+"seleccionadas.\n"
 "\n"
 "Si pretende usar la compartición de Conexión a Internet de Mageia,\n"
 "deseleccione las interfaces que se conectarán a la red local.\n"
@@ -5783,7 +6438,9 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:144
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Se requieren algunos componentes (%s) pero no están disponibles para el hardware %s."
+msgstr ""
+"Se requieren algunos componentes (%s) pero no están disponibles para el "
+"hardware %s."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
@@ -5794,8 +6451,11 @@ msgstr "Se requieren algunos paquetes (%s) pero no están disponibles."
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
-msgstr "Aquellos paquetes se pueden encontrar en %s, o en el repositorio de paquetes oficial %s."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
+msgstr ""
+"Aquellos paquetes se pueden encontrar en %s, o en el repositorio de paquetes "
+"oficial %s."
 
 #: ../lib/network/thirdparty.pm:152
 #, c-format
@@ -5853,8 +6513,12 @@ msgstr "Inserte disco flexible"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
-msgstr "Inserte un disco flexible con formato FAT en la unidad %s con %s en el directorio raíz y presione %s"
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
+msgstr ""
+"Inserte un disco flexible con formato FAT en la unidad %s con %s en el "
+"directorio raíz y presione %s"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
@@ -5874,7 +6538,8 @@ msgstr "Buscando controladores y aplicaciones requeridas..."
 #: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait, running device configuration commands..."
-msgstr "Por favor espere, ejecutando comandos de configuración de dispositivo..."
+msgstr ""
+"Por favor espere, ejecutando comandos de configuración de dispositivo..."
 
 #: ../lib/network/vpn/openvpn.pm:109
 #, c-format
diff --git a/po/et.po b/po/et.po
index 0638b9d..d1fbbf8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-09 16:18+0000\n"
 "Last-Translator: Marek Laane <bald@smail.ee>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../bin/drakconnect-old:45
@@ -28,14 +28,16 @@ msgid "Interface"
 msgstr "Liides"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-aadress"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
@@ -71,23 +73,27 @@ msgid "Configure Local Area Network..."
 msgstr "Kohtvõrgu (LAN) seadistamine..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Abi"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Rakenda"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
@@ -97,16 +103,17 @@ msgstr "Olgu"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Palun oodake"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Palun oodake... Rakendatakse seadistusi"
@@ -142,6 +149,7 @@ msgstr "Võrgukaart %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Võrgumask"
@@ -157,6 +165,7 @@ msgid "Started on boot"
 msgstr "Käivitub alglaadimisel"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klient"
@@ -171,17 +180,19 @@ msgstr ""
 "Käivitage Mageia juhtimiskeskuses nõustaja \"%s\""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Uue võrguliidese seadistamine (LAN, ISDN, ADSL...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IP puudub"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Mask puudub"
@@ -205,18 +216,26 @@ msgstr "Internetiühenduse jagamine"
 #, 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). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
 "Nüüd on Teil võimalik seadistada oma arvuti internetiühendust jagama.\n"
-"Selle võimaluse abil saavad teised Teie kohtvõrgu arvutid kasutada selle masina internetiühendust.\n"
+"Selle võimaluse abil saavad teised Teie kohtvõrgu arvutid kasutada selle "
+"masina internetiühendust.\n"
 "\n"
-"Kontrollige enne jätkamist, et olete seadistanud oma võrgu/internetiühenduse drakconnecti abil.\n"
+"Kontrollige enne jätkamist, et olete seadistanud oma võrgu/internetiühenduse "
+"drakconnecti abil.\n"
 "\n"
-"Märkus: kohtvõrgu (LAN) jaoks on vajalik eraldi võrgukaardi olemasolu. Palun lülitage LAN-iga seotud võrgukaardi puhul enne jätkamist välja Mageia tulemüür."
+"Märkus: kohtvõrgu (LAN) jaoks on vajalik eraldi võrgukaardi olemasolu. Palun "
+"lülitage LAN-iga seotud võrgukaardi puhul enne jätkamist välja Mageia "
+"tulemüür."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -244,12 +263,12 @@ msgstr ""
 "\n"
 "Mida soovite ette võtta?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Keelata"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Lubada"
@@ -264,8 +283,8 @@ msgstr "Uuesti seadistada"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Palun valige otse internetti ühendatud võrguliides."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Võrguseade"
@@ -273,7 +292,8 @@ msgstr "Võrguseade"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one network adapter on your system configured for LAN connections:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
@@ -289,11 +309,15 @@ msgstr ""
 "\n"
 "Kõik on valmis teie kohtvõrgu häälestamiseks seda kaarti kasutama.\n"
 "\n"
-"Kui Teil on veel mõni kohtvõrguga ühendatud kaart, keelake tööriista drakfirewall abil sellel tulemüüri kasutamine, enne kui asute internetiühenduse jagamist seadistama."
+"Kui Teil on veel mõni kohtvõrguga ühendatud kaart, keelake tööriista "
+"drakfirewall abil sellel tulemüüri kasutamine, enne kui asute "
+"internetiühenduse jagamist seadistama."
 
 #: ../bin/drakgw:156
 #, 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 "Palun valige, millist võrguliidest soovite kasutada kohtvõrgu jaoks."
 
 #: ../bin/drakgw:177
@@ -335,7 +359,11 @@ msgstr "Sisemine domeeninimi"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -350,9 +378,7 @@ msgstr "Viga"
 
 #: ../bin/drakgw:188
 #, c-format
-msgid ""
-"Potential LAN address conflict found in current config of %s!\n"
-""
+msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Võimalik kohtvõrgu aadressi konflikt %s seadistuses!\n"
 
 #: ../bin/drakgw:204
@@ -446,13 +472,19 @@ msgstr "Printeri üldleviinfo"
 #: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter configured for LAN has been detected on your system.\n"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that "
+"the Mageia firewall is not enabled for network adapter connected to your LAN "
+"network."
 msgstr ""
-"Teie süsteemis ei leitud ühtegi kohtvõrgu jaoks seadistatud Etherneti võrgukaarti.\n"
+"Teie süsteemis ei leitud ühtegi kohtvõrgu jaoks seadistatud Etherneti "
+"võrgukaarti.\n"
 "\n"
-"Palun käivitage selle seadistamiseks riistvara seadistuste tööriist ja kontrollige, et kohtvõrguga ühendatud võrgukaardil poleks sisse lülitatud Mageia tulemüür."
+"Palun käivitage selle seadistamiseks riistvara seadistuste tööriist ja "
+"kontrollige, et kohtvõrguga ühendatud võrgukaardil poleks sisse lülitatud "
+"Mageia tulemüür."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -468,11 +500,13 @@ msgstr "Internetiühendust nüüd enam ei jagata."
 #, 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 ""
 "Kõik on seadistatud.\n"
-"Nüüd saate internetiühendust jagada teistele kohtvõrgu arvutitele, kasutades automaatset võrguseadistust (DHCP) ja läbipaistvat puhverserverit (SQUID)."
+"Nüüd saate internetiühendust jagada teistele kohtvõrgu arvutitele, kasutades "
+"automaatset võrguseadistust (DHCP) ja läbipaistvat puhverserverit (SQUID)."
 
 #: ../bin/drakgw:351
 #, c-format
@@ -486,8 +520,12 @@ msgstr "Leiti tulemüüri seadistused!"
 
 #: ../bin/drakgw:366
 #, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
-msgstr "Hoiatus! Leiti olemasolevad tulemüüri seadistused. Tõenäoliselt peaksite need hiljem üle vaatama."
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+"Hoiatus! Leiti olemasolevad tulemüüri seadistused. Tõenäoliselt peaksite "
+"need hiljem üle vaatama."
 
 #: ../bin/drakgw:371
 #, c-format
@@ -622,13 +660,14 @@ msgstr "Lubatud aadressid"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiivne tulemüür"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Ühendust deemoniga ei saadud"
@@ -638,12 +677,12 @@ msgstr "Ühendust deemoniga ei saadud"
 msgid "Log"
 msgstr "Logi"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Lubatud"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokeeritud"
@@ -670,12 +709,12 @@ msgstr "Blokeeritud teenused"
 msgid "Clear logs"
 msgstr "Kustuta logid"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Must nimekiri"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Valge nimekiri"
@@ -757,8 +796,12 @@ msgstr "Parool on nõutav."
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "See tööriist võimaldab seadistada võrguliideste tõrkesiirdeid ja tulemüüri tiražeerimist."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
+msgstr ""
+"See tööriist võimaldab seadistada võrguliideste tõrkesiirdeid ja tulemüüri "
+"tiražeerimist."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -821,7 +864,7 @@ msgstr "Moodul"
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Kirjeldus"
@@ -838,8 +881,15 @@ msgstr "Uus profiil..."
 
 #: ../bin/draknetprofile:155
 #, c-format
-msgid "Please specify the name of the new network profile to be created (e.g., work, home, roaming, ..). This new profile will be created based on current settings, and you'll be able to configure your system configuration as usual afterwards."
-msgstr "Palun andke loodavale võrguprofiilile nimi (nt. kodu, töö, reisil...) Profiili loomisel võetakse aluseks olemasolevad seadistused, mida Teil on võimalik seejärel muuta vastavalt vajadustele."
+msgid ""
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
+"settings, and you'll be able to configure your system configuration as usual "
+"afterwards."
+msgstr ""
+"Palun andke loodavale võrguprofiilile nimi (nt. kodu, töö, reisil...) "
+"Profiili loomisel võetakse aluseks olemasolevad seadistused, mida Teil on "
+"võimalik seejärel muuta vastavalt vajadustele."
 
 #: ../bin/draknetprofile:166
 #, c-format
@@ -853,12 +903,18 @@ msgstr "Uus profiil on loodud"
 
 #: ../bin/draknetprofile:172
 #, c-format
-msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
-msgstr "Te kasutate nüüd võrguprofiili %s. Te võite seadistada süsteemi nii, nagu Te seda ka muidu teeksite, ning kõik Teie võrguseadistused salvestatakse nüüdsest sellesse profiili."
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+"Te kasutate nüüd võrguprofiili %s. Te võite seadistada süsteemi nii, nagu Te "
+"seda ka muidu teeksite, ning kõik Teie võrguseadistused salvestatakse "
+"nüüdsest sellesse profiili."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
@@ -870,8 +926,12 @@ msgstr "Kas tõesti soovite kustutada vaikeprofiili?"
 
 #: ../bin/draknetprofile:186
 #, c-format
-msgid "You can not delete the current profile. Please switch to a different profile first."
-msgstr "Aktiivset profiili ei saa kustutada. Palun lülituge kõigepealt mõnele muule profiilile."
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
+msgstr ""
+"Aktiivset profiili ei saa kustutada. Palun lülituge kõigepealt mõnele muule "
+"profiilile."
 
 #: ../bin/draknetprofile:194 ../bin/draknfs:356
 #, c-format
@@ -993,34 +1053,48 @@ msgstr "Peab olema kataloog."
 #: ../bin/draknfs:146
 #, 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-i klienti</span> võib määrata mitmel moel:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">üksikmasin:</span> masin kas nimelahendajale tuntud lühinime, täielikult kvalifitseeritud nime või IP-aadressi järgi\n"
+"<span foreground=\"royalblue3\">üksikmasin:</span> masin kas nimelahendajale "
+"tuntud lühinime, täielikult kvalifitseeritud nime või IP-aadressi järgi\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">võrgugrupid:</span> NIS-võrgugrupid võib anda kui @grupp.\n"
+"<span foreground=\"royalblue3\">võrgugrupid:</span> NIS-võrgugrupid võib "
+"anda kui @grupp.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">metamärgid:</span> masinanimed võivad sisaldada metamärke * ja ?. Näiteks *.cs.foo.edu korral sobivad kõik masinad domeenis cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">metamärgid:</span> masinanimed võivad "
+"sisaldada metamärke * ja ?. Näiteks *.cs.foo.edu korral sobivad kõik masinad "
+"domeenis cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">IP-võrgud:</span> kataloogid võib ka eksportida kõigile masinatele IP-(alam-)võrgus korraga, lisades näiteks `/255.255.252.0' või `/22' võrgu baasaadressile.\n"
+"<span foreground=\"royalblue3\">IP-võrgud:</span> kataloogid võib ka "
+"eksportida kõigile masinatele IP-(alam-)võrgus korraga, lisades näiteks "
+"`/255.255.252.0' või `/22' võrgu baasaadressile.\n"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1028,31 +1102,45 @@ 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\">Kasutaja ID valikud</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">administraatori sidumine anonüümsena:</span> kõik uid/gid 0 päringud seotakse anonüümse uid/gid-iga.\n"
+"<span foreground=\"royalblue3\">administraatori sidumine anonüümsena:</span> "
+"kõik uid/gid 0 päringud seotakse anonüümse uid/gid-iga.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">administraatori kaugligipääsu lubamine:</span> administraatori sidumist ei lubata. See on kasulik peamiselt kettata klientide korral.\n"
+"<span foreground=\"royalblue3\">administraatori kaugligipääsu lubamine:</"
+"span> administraatori sidumist ei lubata. See on kasulik peamiselt kettata "
+"klientide korral.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">kõigi kasutajate sidumine anonüümsena:</span> kõik uid-d ja gid-d seaotakse anonüümse kasutajaga. Kasulik NFS-eksporditud avalike FTP-kataloogide, uudiste puhverkataloogide jms, korral. Vastand on vaikimisi kasutatav kasutaja UID mittesidumine (no_all_squash).\n"
+"<span foreground=\"royalblue3\">kõigi kasutajate sidumine anonüümsena:</"
+"span> kõik uid-d ja gid-d seaotakse anonüümse kasutajaga. Kasulik NFS-"
+"eksporditud avalike FTP-kataloogide, uudiste puhverkataloogide jms, korral. "
+"Vastand on vaikimisi kasutatav kasutaja UID mittesidumine (no_all_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid ja anongid:</span> anonüümse konto uid ja gid vahetu määramine.\n"
+"<span foreground=\"royalblue3\">anonuid ja anongid:</span> anonüümse konto "
+"uid ja gid vahetu määramine.\n"
 
 #: ../bin/draknfs:177
 #, c-format
@@ -1081,23 +1169,50 @@ msgstr "Muud valikud"
 
 #: ../bin/draknfs:183
 #, 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> see nõuab, et päringud tuleksid internetipordist, mis on väiksem kui IPPORT_RESERVED (1024). Vaikimisi on sisse lülitatud."
+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> see nõuab, et päringud tuleksid "
+"internetipordist, mis on väiksem kui IPPORT_RESERVED (1024). Vaikimisi on "
+"sisse lülitatud."
 
 #: ../bin/draknfs:184
 #, 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> võimaldab lubada antud NFS-kettal kas ainult lugemis- või nii lugemis- kui ka kirjutamispäringuid. Vaikimisi on keelatud kõik päringud, mis failisüsteemi muudavad. Seda saab antud valikuga ka vahetult määrata."
+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> võimaldab lubada antud NFS-kettal "
+"kas ainult lugemis- või nii lugemis- kui ka kirjutamispäringuid. Vaikimisi "
+"on keelatud kõik päringud, mis failisüsteemi muudavad. Seda saab antud "
+"valikuga ka vahetult määrata."
 
 #: ../bin/draknfs:185
 #, 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-serveril keelatakse rikkuda NFS-i protokolli ja vastata päringutele enne, kui nende päringutega tehtud muudatused on salvestatud stabiilsele andmekandjale (nt. füüsilisele kettale)."
+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-serveril keelatakse rikkuda "
+"NFS-i protokolli ja vastata päringutele enne, kui nende päringutega tehtud "
+"muudatused on salvestatud stabiilsele andmekandjale (nt. füüsilisele "
+"kettale)."
 
 #: ../bin/draknfs:186
 #, 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> alampuu kontrolli lubamine võib mõnel juhul suurendada turvalisust, aga samas vähendada töökindlust. Täpsemalt kõneleb sellest manuaalilehekülg 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> alampuu kontrolli lubamine võib "
+"mõnel juhul suurendada turvalisust, aga samas vähendada töökindlust. "
+"Täpsemalt kõneleb sellest manuaalilehekülg exports(5)."
 
 #: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
@@ -1460,13 +1575,10 @@ msgstr "See on lihtne tööriist Samba seadistuste hõlpsaks haldamiseks."
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
-msgid ""
-"_: Translator(s) name(s) & email(s)\n"
-""
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Marek Laane <bald@smail.ee>\n"
 
 #: ../bin/draksambashare:229
@@ -1508,8 +1620,12 @@ msgstr "Kommentaar:"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
-msgstr "Sellise nimega jagatud ressurss on juba olemas või jätsite nime andmata. Palun valige uus nimi."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+"Sellise nimega jagatud ressurss on juba olemas või jätsite nime andmata. "
+"Palun valige uus nimi."
 
 #: ../bin/draksambashare:400
 #, c-format
@@ -1539,8 +1655,11 @@ msgstr "Spetsiaalse printeri ressursi lisamine"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Selle nõustaja eesmärk on Samba spetsiaalse printeri ressurssi lihtne loomine."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Selle nõustaja eesmärk on Samba spetsiaalse printeri ressurssi lihtne "
+"loomine."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -1679,8 +1798,10 @@ msgstr "Avalik:"
 
 #: ../bin/draksambashare:795
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Loomise mask, loomise režiim ja kataloogi mask peavad olema arvud, nt. 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Loomise mask, loomise režiim ja kataloogi mask peavad olema arvud, nt. 0755."
 
 #: ../bin/draksambashare:803
 #, c-format
@@ -1729,8 +1850,12 @@ msgstr "Samba serveri seadistuste nõustaja"
 
 #: ../bin/draksambashare:1057
 #, c-format
-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."
+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."
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1739,18 +1864,28 @@ msgstr "PDC server: primaarne domeenikontroller"
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
-msgstr "PDC-na seadistatud server vastutab Windowsi autentimise eest kogu domeenis."
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+"PDC-na seadistatud server vastutab Windowsi autentimise eest kogu domeenis."
 
 #: ../bin/draksambashare:1073
 #, c-format
-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"
+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"
 
 #: ../bin/draksambashare:1073
 #, 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 "Domeeni master = jah sunnib serveri registreerima NetBIOS-e nime <pdc nimi>. Seda nime tunnustavad seejärel teised serverid."
+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."
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -1774,8 +1909,18 @@ msgstr "OS-i tase:"
 
 #: ../bin/draksambashare:1092
 #, 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 "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"
+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 ""
+"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"
 
 #: ../bin/draksambashare:1096
 #, c-format
@@ -1814,8 +1959,12 @@ msgstr "Turvarežiim"
 
 #: ../bin/draksambashare:1122
 #, c-format
-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."
+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."
 
 #: ../bin/draksambashare:1122
 #, c-format
@@ -1824,8 +1973,14 @@ msgstr "Jagatud ressursi tase: klient autendib end eraldi iga ressursi puhul"
 
 #: ../bin/draksambashare:1122
 #, 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 "Domeeni tase: mehhanism kõigi kasutajate ja gruppide kontode salvestamiseks kesksesse jagatud kontohoidlasse. Keskset kontohoidlat jagavad omavahel domeeni (turvalisuse) kontrollerid."
+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 ""
+"Domeeni tase: mehhanism kõigi kasutajate ja gruppide kontode salvestamiseks "
+"kesksesse jagatud kontohoidlasse. Keskset kontohoidlat jagavad omavahel "
+"domeeni (turvalisuse) kontrollerid."
 
 #: ../bin/draksambashare:1133
 #, c-format
@@ -1839,7 +1994,9 @@ msgstr "Serveri nimi"
 
 #: ../bin/draksambashare:1138
 #, 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 "See on nimi, millega server annab end teada Windowsi tööjaamadele."
 
 #: ../bin/draksambashare:1143
@@ -1859,8 +2016,11 @@ msgstr "Samba logi"
 
 #: ../bin/draksambashare:1154
 #, c-format
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
-msgstr "Logifail: fail.%m võimaldab eraldi salvestada iga ühenduva masina logifaili"
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
+"Logifail: fail.%m võimaldab eraldi salvestada iga ühenduva masina logifaili"
 
 #: ../bin/draksambashare:1154
 #, c-format
@@ -1894,13 +2054,21 @@ msgstr "Nõustaja kogus Samba seadistamiseks järgmised andmed."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
-msgstr "Väärtustega nõustumiseks ja serveri seadistamiseks klõpsake nupule Edasi. Kui soovite neid muuta, klõpsake nupule Tagasi."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Väärtustega nõustumiseks ja serveri seadistamiseks klõpsake nupule Edasi. "
+"Kui soovite neid muuta, klõpsake nupule Tagasi."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Kui olete juba varem loonud jagatud ressursse, on need seadistuses näha. Jagatud ressursside haldamiseks käivitage 'drakwizard sambashare'."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run 'drakwizard sambashare' to manage your shares."
+msgstr ""
+"Kui olete juba varem loonud jagatud ressursse, on need seadistuses näha. "
+"Jagatud ressursside haldamiseks käivitage 'drakwizard sambashare'."
 
 #: ../bin/draksambashare:1176
 #, c-format
@@ -2291,15 +2459,18 @@ msgstr "Kohalikud andmed"
 
 #: ../bin/net_monitor:512
 #, c-format
-msgid "Warning, another internet connection has been detected, maybe using your network"
-msgstr "Hoiatus, leiti veel üks internetiühendus, mis võib-olla kasutab Teie võrku"
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"Hoiatus, leiti veel üks internetiühendus, mis võib-olla kasutab Teie võrku"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Ühendatud"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Ei ole ühendatud"
@@ -2364,7 +2535,7 @@ msgstr "Võrguliikluse arvestuse lubamine"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Liidest juhitakse NetworkManageriga"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Meetrika"
@@ -2404,19 +2575,22 @@ msgstr "Kaablimodem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin'i kasutamine (vajalik Telstrale)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentimisviis"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Kasutajatunnus"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Parool"
@@ -2541,13 +2715,15 @@ msgstr ""
 "Kõik read tuleb sisestada IP-aadressi kujul\n"
 "(näiteks 12.34.56.78)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Vaikelüüs"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Nimeserverite hankimine DHCP-lt"
@@ -2570,24 +2746,30 @@ msgstr "Otsingudomeen"
 #: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
-msgstr "Otsingudomeen määratakse vaikimisi täielikult kvalifitseeritud masinanime põhjal"
+msgstr ""
+"Otsingudomeen määratakse vaikimisi täielikult kvalifitseeritud masinanime "
+"põhjal"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP aegumine (sekundites)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP-serverite hankimine DHCP-lt"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD-serverite hankimine DHCP-t"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP masinanimi"
@@ -2598,11 +2780,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Zeroconf'i (169.254.0.0 võrk) ei kasutata"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-aadress peab olema kujul 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Võrgumaski aadress peab olema kujul 255.255.224.0"
@@ -2614,25 +2798,45 @@ msgstr "Hoiatus : IP-aadress %s on tavaliselt reserveeritud!"
 
 #: ../lib/network/connection/ethernet.pm:195
 #, c-format
-msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
-msgstr "%s on juba kasutusel alglaadimisel käivitatava ühenduse poolt (%s)). Selle aadressi kasutamiseks selle ühendusega keelake kõigepealt kõik teised seadmed, mis seda kasutavad, või seadistage nad alglaadimisel mitte käivituma."
+msgid ""
+"%s is already used by a connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start at boot"
+msgstr ""
+"%s on juba kasutusel alglaadimisel käivitatava ühenduse poolt (%s)). Selle "
+"aadressi kasutamiseks selle ühendusega keelake kõigepealt kõik teised "
+"seadmed, mis seda kasutavad, või seadistage nad alglaadimisel mitte "
+"käivituma."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Masinanimi omistatakse DHCP serverist (või luuakse uus unikaalne)"
 
 #: ../lib/network/connection/ethernet.pm:223
 #, c-format
-msgid "This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically."
-msgstr "See võimaldab serveril omistada masinale nime. Kui server ei paku korrektset masinanime, luuakse see automaatselt."
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+"See võimaldab serveril omistada masinale nime. Kui server ei paku korrektset "
+"masinanime, luuakse see automaatselt."
 
 #: ../lib/network/connection/ethernet.pm:226
 #, c-format
-msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
-msgstr "Peaksite määrama sellele masinale nime, mis tuvastaks üheselt selle arvuti. Pange tähele, et sama masinanime kasutavad kõik võrguühendused. Kui jätate selle tühjaks, kasutatakse nime 'localhost.localdomain'."
+msgid ""
+"You should define a hostname for this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections.  If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+"Peaksite määrama sellele masinale nime, mis tuvastaks üheselt selle arvuti. "
+"Pange tähele, et sama masinanime kasutavad kõik võrguühendused. Kui jätate "
+"selle tühjaks, kasutatakse nime 'localhost.localdomain'."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Võrgu kohene valmidus (hotplugging)"
@@ -2701,27 +2905,32 @@ msgstr "Lauatelefon"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analoogtelefonimodem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skriptipõhine"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalipõhine"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3880,88 +4089,95 @@ msgstr "WPA/WPA2 eeljagatud võti"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windowsi draiver"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
-msgstr "Teie juhtmeta ühenduse kaart on välja lülitatud, palun lülitage see kõigepealt sisse (RF kill)."
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
+msgstr ""
+"Teie juhtmeta ühenduse kaart on välja lülitatud, palun lülitage see "
+"kõigepealt sisse (RF kill)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Juhtmeta ühenduse seadistused"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Töörežiim"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Määratud"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Esmane"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repiiter"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Teisene"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automaatne"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Võrgu nimi (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Krüptorežiim"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Krüptovõti"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Parooli ei näidata"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Võtit kasutatakse ainult ASCII stringina (vajalik nt. Liveboxile)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP kasutajatunnus"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3972,12 +4188,12 @@ msgstr ""
 "määrama ka domeeni, võite proovida testimata süntaksit\n"
 "  DOMEEN\\kasutajanimi"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP parool"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4010,12 +4226,12 @@ msgstr ""
 "  TLS režiim on täielikult sertifikaadipõhine ning võib eirata\n"
 "siin määratud kasutajanime ja parooli."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP kliendi sertifikaat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4028,39 +4244,47 @@ msgstr ""
 "kasutajanime ja parooli kasutamise alternatiiviks.\n"
 " Märkus: täiendavad seadistused leiab muude valikute leheküljel."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Võrgu ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Töösagedus"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Tundlikkuslävi"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitikiirus (b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, 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 ""
 "RTS/CTS lisab enne iga paketi edastamist käepigistuse kontrollimaks, et\n"
@@ -4070,37 +4294,41 @@ msgstr ""
 "võrdne väärtus tühistab võimaluse. Parameetri võib määrata ka automaatseks,\n"
 "fikseerituks või üldse välja lülitada."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Killustus"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Käsu iwconfig lisaargumendid"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 ""
 "Siin saab seadistada mõningaid juhtmeta võrgu lisaparameetreid:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (hüüdnimi on juba määratud masinanimeks).\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (hüüdnimi on juba "
+"määratud masinanimeks).\n"
 "\n"
 "Täpsemat infot annab man-lehekülg iwconfig(8)."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Käsu iwspy lisaargumendid"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4119,21 +4347,25 @@ msgstr ""
 "\n"
 "Täpsemat infot annab man-lehekülg iwspy(8)."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Käsu iwpriv lisaargumendid"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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."
@@ -4148,28 +4380,28 @@ msgstr ""
 "\n"
 "Täpsemat infot annab man-lehekülg iwpriv(8)."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP protokoll"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Automaatne tuvastamine"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4178,67 +4410,67 @@ msgstr ""
 "Soovitatav on valida automaatne tuvastamine, sest see proovib\n"
 "kõigepealt WPA versiooni 2 ja seejärel WPA versiooni 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP režiim"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4247,12 +4479,12 @@ msgstr ""
 "Aktsepteeritud autenditud võtmehalduse protokollide loend.\n"
 "Võimalikud väärtused on WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP väline identiteet"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4263,12 +4495,12 @@ msgstr ""
 "identiteedina EAP tüüpide korral, mis toetavad erinevat\n"
 "tunneldatud identiteeti, nt. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP faas 2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4281,12 +4513,12 @@ msgstr ""
 "auth=MSCHAPV2 PEAP korral või\n"
 "autheap=MSCHAPV2 autheap=MD5 TTLS korral"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP SK sertifikaat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4301,12 +4533,12 @@ msgstr ""
 "Võimaluse korral tuleks TLS või TTLS või PEAP kasutamisel\n"
 "alati määrata usaldusväärne SK sertifikaat."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP sertifikaadi subjekti sobivus"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4321,12 +4553,12 @@ msgstr ""
 "määratud string. Subjektistringi vorming on järgmine:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Lisadirektiivid"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4358,42 +4590,57 @@ msgstr ""
 "\terinevate seadistuste pealesundimiseks võib kasutada\n"
 "\tka teisi direktiive, key_mgmt."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Vajalik on krüptovõti."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
-msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
-msgstr "Eeljagatud võtmel peab olema 8 kuni 63 ASCII märki või 64 16ndsüsteemis märki"
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+"Eeljagatud võtmel peab olema 8 kuni 63 ASCII märki või 64 16ndsüsteemis märki"
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
-msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
-msgstr "WEP-võtmel peab olema maksimaalselt %d ASCII märki või %d 16ndsüsteemis märki."
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+"WEP-võtmel peab olema maksimaalselt %d ASCII märki või %d 16ndsüsteemis "
+"märki."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 "Sagedus peab sisaldama sufiksit k, M või G (näiteks \"2.46G\" - 2,46 GHz sagedusel) või tuleb lisada piisavalt nulle."
+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 ""
+"Sagedus peab sisaldama sufiksit k, M või G (näiteks \"2.46G\" - 2,46 GHz "
+"sagedusel) või tuleb lisada piisavalt nulle."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "Kiirus peab sisaldama sufiksit k, M või G (näiteks \"11M\") või tuleb lisada piisavalt nulle."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Kiirus peab sisaldama sufiksit k, M või G (näiteks \"11M\") või tuleb lisada "
+"piisavalt nulle."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Tugijaama vahetumise lubamine"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Seotud juhtmeta võrguga \"%s\" liideses %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Kaotatud seos juhtmeta võrguga liideses %s"
@@ -4411,18 +4658,24 @@ msgstr "Alcatel speedtouch USB modem"
 #: ../lib/network/connection/xdsl.pm:125
 #, 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 modemil puudub toetus binaarse draiveri levitamise probleemide tõttu.\n"
+"ECI Hi-Focus modemil puudub toetus binaarse draiveri levitamise probleemide "
+"tõttu.\n"
 "\n"
 "Te leiate draiveri aadressil http://eciadsl.flashtux.org/"
 
 #: ../lib/network/connection/xdsl.pm:185
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
-msgstr "Conexant AccessRunneri kiibistikuga modemid ei ole toetatud binaarse püsivara levitamise probleemi tõttu."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
+msgstr ""
+"Conexant AccessRunneri kiibistikuga modemid ei ole toetatud binaarse "
+"püsivara levitamise probleemi tõttu."
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4535,6 +4788,285 @@ msgstr "Ühenda"
 msgid "Hostname changed to \"%s\""
 msgstr "Masinanimeks sai \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Võrguliides"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Valige seadistatav võrguliides:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Võrgu taaskäivitamisel tekkis viga: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Õnnitleme, võrgu seadistamine on lõpetatud."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "VPN-ühenduste haldamine"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Seade: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN-i seadistused"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Nimeserver 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Otsingudomeen"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automaatne"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Käivitub alglaadimisel"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Valimisviis"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Ühenduse kiirus"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Ühenduse aegumine (sekundites)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Sissehelistamiskeskuse number"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modemiühendus"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Valige fail"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuveit"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kaardi IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kaardi mälu (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kaardi IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kaardi IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Euroopa protokoll (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokoll ülejäänud maailma tarbeks\n"
+"Ilma D-kanalita (liisitud liinid)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Moodul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Tegelik aadress"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Valgevene"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Lüüsi aadress peab olema kujul 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Vaikelüüs"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Liides"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Internetiühendus pole seadistatud"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Internetiühendust ei ole veel seadistatud.\n"
+"Käivitage Mageia juhtimiskeskuses nõustaja \"%s\""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Esimene nimeserver (pole kohustuslik)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Esimene nimeserver (pole kohustuslik)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Teine nimeserver (pole kohustuslik)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Esimene nimeserver (pole kohustuslik)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Internetiühenduse seadistamine"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Printeri ligipääs"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Ühenduse kestus: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Olek"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testime Teie ühendust..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP parameetrid"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4726,10 +5258,12 @@ msgstr "Tulemüüriteadete logimine süsteemi logidesse"
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
-"Teid hoiatatakse, kui keegi üritab mõnda teenust kasutada või püüab Teie arvutisse tungida.\n"
+"Teid hoiatatakse, kui keegi üritab mõnda teenust kasutada või püüab Teie "
+"arvutisse tungida.\n"
 "Palun valige, millist laadi võrguaktiivsust jälgida."
 
 #: ../lib/network/drakfirewall.pm:316
@@ -4742,11 +5276,6 @@ msgstr "Interaktiivse tulemüüri kasutamine"
 msgid "No device found"
 msgstr "Seadet ei leitud"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Seade: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4822,9 +5351,10 @@ msgstr "Kas soovite ühenduse kohe käivitada?"
 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-ühendus on nüüd seadistatud.\n"
 "\n"
@@ -4883,11 +5413,12 @@ msgstr "\"%s\" rünnaku katse %s poolt"
 
 #: ../lib/network/ifw.pm:151
 #, 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 "Rakendus \"%s\" üritab muuta teenust (%s) võrgus kättesaadavaks."
 
-#. -PO: this should be kept lowercase since the expression is meant to be used
-#. between brackets
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -4923,8 +5454,14 @@ msgstr "Palun valige korrektne draiver"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver description (.inf) file, or corresponding driver file (.dll or .o files). Note that only drivers up to Windows XP are supported."
-msgstr "Palun valige Windowsi draiveri kirjeldusfail (.inf) või vastav draiverifail (.dll või .o). Arvestage, et toetatud on ainult Windows XP või varasemad draiverid."
+msgid ""
+"Please select the Windows driver description (.inf) file, or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
+"Palun valige Windowsi draiveri kirjeldusfail (.inf) või vastav draiverifail "
+"(.dll või .o). Arvestage, et toetatud on ainult Windows XP või varasemad "
+"draiverid."
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4970,6 +5507,103 @@ msgstr "Uue draiveri paigaldamine"
 msgid "Select a device:"
 msgstr "Seade:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Teenuse rünnak"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interaktiivse tulemüüri automaatne režiim"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Kuidas soovite ühenduse luua?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Võrguliides"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP-aadress: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Teenuse rünnak"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktiivne tulemüür"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Juhtmeta ühendus"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Kuidas soovite ühenduse luua?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5013,20 +5647,6 @@ msgstr "Sisemine ISDN kaart"
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll ülejäänud maailma tarbeks"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Euroopa protokoll (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokoll ülejäänud maailma tarbeks\n"
-"Ilma D-kanalita (liisitud liinid)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5077,11 +5697,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Ühenduse juhtimine"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testime Teie ühendust..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5102,11 +5717,6 @@ msgstr "Teie telefoninumber"
 msgid "Provider name (ex provider.net)"
 msgstr "Teenusepakkuja tunnus (näiteks minuisp.ee)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Sissehelistamiskeskuse number"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5117,41 +5727,6 @@ msgstr "DNS 1 (võib jätta tühjaks)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 (võib jätta tühjaks)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Valimisviis"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Ühenduse kiirus"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Ühenduse aegumine (sekundites)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kaardi IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kaardi mälu (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kaardi IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kaardi IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5185,8 +5760,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"
 "Kui Teil on ISA kaart, siis peaks järgmised väärtused olema õiged.\n"
@@ -5210,8 +5785,14 @@ msgstr "Milline on Teie ISDN kaart?"
 
 #: ../lib/network/netconnect.pm:461
 #, 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 "Sellele modemile on olemas CAPI draiver. CAPI draiver pakub rohkem võimalusi kui vaba draiver (näiteks fakside saatmine). Millist draiverit soovite kasutada?"
+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 ""
+"Sellele modemile on olemas CAPI draiver. CAPI draiver pakub rohkem võimalusi "
+"kui vaba draiver (näiteks fakside saatmine). Millist draiverit soovite "
+"kasutada?"
 
 #: ../lib/network/netconnect.pm:475
 #, c-format
@@ -5311,16 +5892,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domeeninimi"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Esimene nimeserver (pole kohustuslik)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Teine nimeserver (pole kohustuslik)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5382,12 +5953,18 @@ msgstr "Võrguühenduse testimisel esines probleeme."
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
-msgid "This can be caused by invalid network configuration, or problems with your modem or router."
-msgstr "Need võisid tekkida vigasest võrguseadistusest või olla seotud modemi või ruuteriga."
+msgid ""
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+"Need võisid tekkida vigasest võrguseadistusest või olla seotud modemi või "
+"ruuteriga."
 
 #: ../lib/network/netconnect.pm:772
 #, c-format
-msgid "You might want to relaunch the configuration to verify the connection settings."
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
 msgstr "Seadistus tasuks vahest üle vaadata ja kontrollida kõiki valikuid."
 
 #: ../lib/network/netconnect.pm:775
@@ -5397,12 +5974,18 @@ msgstr "Õnnitleme, võrgu seadistamine on lõpetatud."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
-msgid "However, the Internet connectivity test failed. You should test your connection manually, and verify your Internet modem or router."
-msgstr "Paraku nurjus internetiühenduse test. Teil tuleks testida ühendust käsitsi ning kontrollida oma modemit või ruuterit."
+msgid ""
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
+msgstr ""
+"Paraku nurjus internetiühenduse test. Teil tuleks testida ühendust käsitsi "
+"ning kontrollida oma modemit või ruuterit."
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
-msgid "If your connection does not work, you might want to relaunch the configuration."
+msgid ""
+"If your connection does not work, you might want to relaunch the "
+"configuration."
 msgstr "Kui ühendus ei toimi, tasuks seadistus üle vaadata."
 
 #: ../lib/network/netconnect.pm:778
@@ -5412,7 +5995,9 @@ msgstr "Õnnitleme, võrgu ja internetiühenduse seadistamine on lõpetatud."
 
 #: ../lib/network/netconnect.pm:779
 #, 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 ""
 "Soovitame uuesti käivitada ka X keskkonna, et vältida võimalikke\n"
 "masinanime muutmisest tingitud probleeme."
@@ -5515,12 +6100,14 @@ msgstr "Zeroconfi masinanimi ei tohi sisaldada punkti (.)"
 #: ../lib/network/netconnect.pm:813
 #, 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 ""
 "Võrguühendus on juba seadistatud, sest paigaldatakse ju võrgust.\n"
-"Kui soovite neid seadistusi säilitada, valige \"Olgu\", muidu loobuge ja saate seadistada uuesti.\n"
+"Kui soovite neid seadistusi säilitada, valige \"Olgu\", muidu loobuge ja "
+"saate seadistada uuesti.\n"
 
 #: ../lib/network/netconnect.pm:816
 #, c-format
@@ -5562,7 +6149,6 @@ msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
-""
 msgstr ""
 "Olete seadistanud mitu võimalust internetiga ühendumiseks.\n"
 "Valige palun see, mida soovite kasutada.\n"
@@ -5580,8 +6166,12 @@ msgstr "Võrgukaardi %s (draiver %s) seadistamine"
 
 #: ../lib/network/netconnect.pm:824
 #, c-format
-msgid "The following protocols can be used to configure a LAN connection. Please choose the one you want to use."
-msgstr "LAN-ühenduse seadistamiseks saab kasutada järgmisi protokolle. Palun valige nende seast sobilik."
+msgid ""
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use."
+msgstr ""
+"LAN-ühenduse seadistamiseks saab kasutada järgmisi protokolle. Palun valige "
+"nende seast sobilik."
 
 #: ../lib/network/netconnect.pm:825
 #, c-format
@@ -5606,11 +6196,6 @@ msgstr "Ja lõpuks tuleks määrata ka nimeserveri IP-aadressid."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Nimeserveri aadress peab olema kujul 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Lüüsi aadress peab olema kujul 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5632,8 +6217,12 @@ msgstr "Muud võrguseadistused"
 
 #: ../lib/network/network.pm:524
 #, c-format
-msgid "Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."
-msgstr "Siin saab määrata veel mõningaid võrguseadistusi. Pange tähele, et nende rakendamiseks tuleb masin taaskäivitada."
+msgid ""
+"Here you can configure advanced network settings. Please note that you have "
+"to reboot the machine for changes to take effect."
+msgstr ""
+"Siin saab määrata veel mõningaid võrguseadistusi. Pange tähele, et nende "
+"rakendamiseks tuleb masin taaskäivitada."
 
 #: ../lib/network/network.pm:526
 #, c-format
@@ -5692,8 +6281,12 @@ msgstr "Puhverserverite seadistamine"
 
 #: ../lib/network/network.pm:549
 #, c-format
-msgid "Here you can set up your proxies configuration (eg: http://my_caching_server:8080)"
-msgstr "Siin saab määrata puhverserverite seadistuse (nt: http://minu_puhverserver:8080)"
+msgid ""
+"Here you can set up your proxies configuration (eg: http://"
+"my_caching_server:8080)"
+msgstr ""
+"Siin saab määrata puhverserverite seadistuse (nt: http://"
+"minu_puhverserver:8080)"
 
 #: ../lib/network/network.pm:550
 #, c-format
@@ -5747,7 +6340,6 @@ msgid ""
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
-""
 msgstr ""
 "Palun valige liidesed, mida tulemüür peab kaitsma.\n"
 "\n"
@@ -5783,7 +6375,8 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:144
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "%s riistvara jaoks on vajalikud mõned komponendid (%s), mida pole saadaval."
+msgstr ""
+"%s riistvara jaoks on vajalikud mõned komponendid (%s), mida pole saadaval."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
@@ -5794,7 +6387,8 @@ msgstr "Mõned paketid (%s) on vajalikud, kuid pole saadaval."
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
 msgstr "Neid pakette pakub %s või ametlik %s tarkvarahoidla."
 
 #: ../lib/network/thirdparty.pm:152
@@ -5853,8 +6447,12 @@ msgstr "Sisestage diskett"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
-msgstr "Pange FAT-vormingus diskett seadmesse %s, nii et %s oleks juurkataloogis, ning klõpsakse nupule \"%s\""
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
+msgstr ""
+"Pange FAT-vormingus diskett seadmesse %s, nii et %s oleks juurkataloogis, "
+"ning klõpsakse nupule \"%s\""
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
diff --git a/po/eu.po b/po/eu.po
index 47cdc04..fb61ff8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-20 21:28+0200\n"
 "Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
 "Language-Team: Basque <kde-i18n-doc@kde.org>\n"
@@ -29,14 +29,16 @@ msgid "Interface"
 msgstr "Interfazea"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP helbidea"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoloa"
@@ -72,23 +74,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfiguratu bertako sarea (LAN)..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Laguntza"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Aplikatu"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Galarazi"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ados"
@@ -98,7 +104,8 @@ msgstr "Ados"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -107,7 +114,7 @@ msgstr "Ados"
 msgid "Please wait"
 msgstr "Itxaron mesedez"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Itxaron mesedez... Konfiguraketa aplikatzen"
@@ -143,6 +150,7 @@ msgstr "%s moldagailua: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Sare-maskara"
@@ -158,6 +166,7 @@ msgid "Started on boot"
 msgstr "Abioan abiaraztekoa"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP bezeroa"
@@ -172,17 +181,19 @@ msgstr ""
 "Mageia Aginte Guneko \"%s\" laguntzailea exekutatu"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Ezarri sareko interfaze berri bat (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IPrik ez"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Maskararik ez"
@@ -253,12 +264,12 @@ msgstr ""
 "\n"
 "Zer egin nahi duzu?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Gaitu"
@@ -273,8 +284,8 @@ msgstr "Birkonfiguratu"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Mesedez hautatu Internetera zuzenean lotzen den sare interfazea."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Sareko gailua"
@@ -349,7 +360,11 @@ msgstr "Barneko domeinuaren izena"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -649,13 +664,14 @@ msgstr "Onartutako helbideak"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Suhesi Interaktiboa"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Ezin da deabrua kontaktatu"
@@ -665,12 +681,12 @@ msgstr "Ezin da deabrua kontaktatu"
 msgid "Log"
 msgstr "Egunkaria"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Onartu"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Oztopatu"
@@ -697,12 +713,12 @@ msgstr "Oztopatutako zerbitzuak"
 msgid "Clear logs"
 msgstr "Garbitu egunkariak"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Zerrenda beltza"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Zerrenda zuria"
@@ -852,7 +868,7 @@ msgstr "Modulua"
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Deskribapena"
@@ -901,9 +917,9 @@ msgstr ""
 "konfiguratu dezakezu, eta hemendik aurrerako zure sare ezarpen guztiak "
 "profil honetan gordeko dira."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Kontuz"
@@ -2472,12 +2488,12 @@ msgstr ""
 "Kontuz, beste Internet konexio bat detektatu da, agian zure sarea erabiltzen "
 "ariko da"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Konektatuta"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Konektatu gabe"
@@ -2542,7 +2558,7 @@ msgstr "Gaitu trafikoaren kontabilitatea"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrika"
@@ -2582,19 +2598,22 @@ msgstr "Kable modema:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin erabili (Telstra-rekin beharrezkoa)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Egiaztatzea"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Kontuaren identifikatzailea (erabiltzaile-izena)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Kontuaren pasahitza"
@@ -2721,13 +2740,15 @@ msgstr ""
 "Elementu bakoitza IP helbide gisa sartu behar da puntuz\n"
 "bereizitako zenbakizko notazioan (adibidez, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Atebidea"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Eskuratu DNS zerbitzariak DHCP-tik"
@@ -2755,21 +2776,25 @@ msgstr ""
 "bilaketa-domeinua"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP denbora-muga (segundutan)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Eskuratu YP zerbitzariak DHCP-tik"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Eskuratu NTPD zerbitzariak DHCP-tik"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP ostalari-izena"
@@ -2780,11 +2805,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Zeroconf-era atzera ez egin (169.254.0.0 sarea)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP helbideak 1.2.3.4 formatua izan behar du"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Sare-maskara 255.255.224.0 formatuan egon behar luke"
@@ -2806,6 +2833,7 @@ msgstr ""
 "gailu guztiak, edo konfiguratu itzazu abioan ez hasteko"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Esleitu ostalari izena DHCP zerbitzaritik (edo sortu bakarra den bat)"
@@ -2833,6 +2861,7 @@ msgstr ""
 "partekatuko dela. Hutsik utzi ezkero, 'localhost.localdomain' erabiliko da."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Sareko Hotplugging-a"
@@ -2901,27 +2930,32 @@ msgstr "RTC"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem analogikoa (RTC)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Script-ean oinarritua"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalean oinarritua"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4080,12 +4114,12 @@ msgstr "Aurrez-Banatutako WPA/WPA2 Gakoa"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows gidaria"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4094,79 +4128,82 @@ msgstr ""
 "Zure sareko irrati txartela ezgaituta dago, mesedez gaitu irrati etengailua "
 "lehenengo."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Irrati-sare ezarpenak"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Lan egiteko modua"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Kudeatua"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Maisua"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Errepikatzailea"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Bigarren mailakoa"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatikoa"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Sare-izena (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Zifraketa modua"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Enkriptatze-gakoa"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Pasahitza ezkutatu"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Gako hau ASCII testu lerro bezala erabili dadin behartu (adib Livebox-ekin)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP Login/Erabiltzaileizena"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4177,12 +4214,12 @@ msgstr ""
 "Domeinua zehaztu behar baduzu erabili frogatu gabeko\n"
 "sintaxia  DOMEINUA\\erabitzaileizena"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP Pasahitza"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4215,12 +4252,12 @@ msgstr ""
 "  TLS modua ziurtagirietan erabat oinarrituta dago eta hemen\n"
 "zehaztutako erabiltzaileizen eta pasahitz balioak baztertu ditzake."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP bezero ziurtagiria"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4233,32 +4270,37 @@ msgstr ""
 "Erabiltzaileizen/pasahitz bikotearen ordezkotzat hartu daiteke.\n"
 "Oharra: zerikusia duten ezarpenak erakusten dira Aurreratua orrian."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Sareko ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Eragiketa-maiztasuna"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Sentikortasun-atalasea"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bit-abiadura (b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4280,17 +4322,19 @@ msgstr ""
 "dezakezu\n"
 "automatikoa, finkoa edo desaktibatuta."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentazioa"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig komandoko argumentu estrak"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4306,12 +4350,13 @@ msgstr ""
 "Informazioa lortzeko, ikus iwconfig(8) eskuliburuko orrialdea."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy komandoko argumentu estrak"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4331,12 +4376,13 @@ msgstr ""
 "\n"
 "Informazio gehiago lortzeko, ikus iwpspy(8) eskuliburuko orrialdea."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv komandoko argumentu estrak"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4367,28 +4413,28 @@ msgstr ""
 "\n"
 "Informazio gehiago lortzeko, ikus iwpriv(8) eskuliburuko orrialdea."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP Protokoloa"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Auto detektatu"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4397,67 +4443,67 @@ msgstr ""
 "Auto Detekzioa gomendatzen da lehenengo WPA 2 bertsioarekin\n"
 "saiatzen bait da eta ondoren WPA 1 bertsioarekin"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP Modua"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4466,12 +4512,12 @@ msgstr ""
 "Onartutako autentikatutako gako kudeatzeko protokoloen zerrenda.\n"
 "Izan daitezkeen balioak WPA-EAP, IEEE8021X eta NONE dira"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP kanpoko nortasuna"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4482,12 +4528,12 @@ msgstr ""
 "gabeko identitate bezela erabiltzeko tuneleratutako identitate\n"
 "desberdinak onartzen dituzten EAP motekin, adib, TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4500,12 +4546,12 @@ msgstr ""
 "auth=MSCHAPV2 PEAP-ekin edo\n"
 "autheap=MSCHAPV2 autheap=MD5 TTLS-rekin"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA ziurtagiria"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4520,12 +4566,12 @@ msgstr ""
 "Posible bada, beti konfiguratu beharko litzateke konfidantzazko\n"
 "CA ziurtagiri bat TLS edo TTLS edo PEAP erabiltzerakoan."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP ziurtagiriaren 'subject' eremua parekatu"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4540,12 +4586,12 @@ msgstr ""
 "lerro hau eduki ezkero. 'Subject' testu lerroa ondorengo formatuan dago:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Zuzentarau gehigarriak"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4576,12 +4622,12 @@ msgstr ""
 "\tBeste batzuk, key_mgmt, eap, U.I. ezarpenen ezberdinak\n"
 "\tdiren ezarpen bereziak behartzeko erabili daitezke."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Zifraketa gako bat behar da."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4590,7 +4636,7 @@ msgstr ""
 "Aurrez partekatutako gakoak 8 eta 63 ASCII karaktere bitartean izan beharko "
 "lituzke, edo 64 caractere hamaseitar."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4599,7 +4645,7 @@ msgstr ""
 "WEP gakoak gehinez %d ASCII karaktere edo %d karaktere hamaseitar izan "
 "beharko lituzke."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4608,7 +4654,7 @@ msgstr ""
 "Maiztasunak k, M edo G atzizkia izan behar du (adibidez, \"2,46G\" 2,46 GHz "
 "adierazteko), edo bestela behar adina '0' (zero) gehitu behar dira."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4617,17 +4663,17 @@ msgstr ""
 "Abiadurak k, M edo G atzizkia izan behar du (adibidez, \"11M\" 11M "
 "adierazteko), edo bestela behar adina '0' (zero) gehitu behar dira."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Sarbide puntuen ibiltaritza onartu"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "\"%s\" irrati sarera elkartuta %s interfazean"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Irrati sareara elkarketa galdu da %s interfazean"
@@ -4775,6 +4821,285 @@ msgstr "Konektatu"
 msgid "Hostname changed to \"%s\""
 msgstr "Ostalari izena \"%s\"-ra aldatu da"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Sareko Interfazea"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Hautatu konfiguratu behar den sare-interfazea:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Arazo bat izan da sarea berrabiaraztean: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Zorionak, sare konfiguraketa amaitu da."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "VPN loturak kudeatu"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Gailua: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN konfiguraketa"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS zerbitzaria 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Bilaketa-domeinua"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatikoa"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Abioan abiaraztekoa"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Markatzeko modua"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Konexioaren abiadura"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Konexioaren denbora-muga (segundotan)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Hornitzailearen telefono-zenbakia"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modem-konexioa"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Hautatu fitxategia"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modema"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Txartelaren IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Txartelaren mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Txartelaren S/I"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Txartelaren S/I_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europako protokoloa (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Gainerako munduko protokoloa \n"
+"D kanalik ez (linea alokatuak)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modulua"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Benetako helbidea"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Bielorrusia"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Atebidearen helbideak 1.2.3.4 formatua izan behar du"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Atebidea"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interfazea"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Ez dago Interneteko konexiorik konfiguratuta"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Ez daukazu konfiguratutako Internet loturarik.\n"
+"Exekutatu Mageia Aginte Guneko \"%s\" morroia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Lehen DNS zerbitzaria (aukerakoa)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Lehen DNS zerbitzaria (aukerakoa)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Bigarren DNS zerbitzaria (aukerakoa)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Lehen DNS zerbitzaria (aukerakoa)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Konexioaren konfigurazioa"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Inprimagailu sarbidea"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Lotura denbora: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Egoera"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Konexioa probatzen..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP parametroak"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4981,11 +5306,6 @@ msgstr "Erabili Suhesi Interaktiboa"
 msgid "No device found"
 msgstr "Ez da gailurik aurkitu"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Gailua: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5220,6 +5540,103 @@ msgstr "Gidari berri bat instalatu"
 msgid "Select a device:"
 msgstr "Gailu bat aukeratu:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Zerbitzu erasoa"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Suhesi Interaktiboaren modu automatikoa"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Nola markatu nahi duzu konexio hau?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Sareko Interfazea"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokoloa"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP helbidea: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Zerbitzu erasoa"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Suhesi Interaktiboa"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Irrati lotura"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Nola markatu nahi duzu konexio hau?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5263,20 +5680,6 @@ msgstr "Barneko ISDN txartela"
 msgid "Protocol for the rest of the world"
 msgstr "Gainerako munduko protokoloa"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europako protokoloa (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Gainerako munduko protokoloa \n"
-"D kanalik ez (linea alokatuak)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5327,11 +5730,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Lotura agintea"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Konexioa probatzen..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5352,11 +5750,6 @@ msgstr "Zure telefono-zenbakia"
 msgid "Provider name (ex provider.net)"
 msgstr "Hornitzailearen izena (adib. hornitzailea.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Hornitzailearen telefono-zenbakia"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5367,41 +5760,6 @@ msgstr "Hornitzailearen 1. dns (aukerakoa)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Hornitzailearen 2. dns (aukerakoa)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Markatzeko modua"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Konexioaren abiadura"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Konexioaren denbora-muga (segundotan)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Txartelaren IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Txartelaren mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Txartelaren S/I"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Txartelaren S/I_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5568,16 +5926,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domeinu-izena:"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Lehen DNS zerbitzaria (aukerakoa)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Bigarren DNS zerbitzaria (aukerakoa)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5884,11 +6232,6 @@ msgstr "Azkenik, zure DNS zerbitzariko IP helbideak idatz ditzakezu."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS zerbitzariaren helbideak 1.2.3.4 formatua izan behar du"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Atebidearen helbideak 1.2.3.4 formatua izan behar du"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/fa.po b/po/fa.po
index 325e3b1..1c285eb 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2005-02-26 06:31+0100\n"
 "Last-Translator: Abbas Izad <abbasizad@hotmail.com>\n"
 "Language-Team: Persian\n"
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "واسط‌"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "نشانی آی‌پی"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "پایان‌نامه"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "پیکربندی شبکه‌ی منطقه‌ای محلی..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "راهنما"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "اعمال"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "لغو"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "تأیید"
@@ -95,7 +101,8 @@ msgstr "تأیید"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "تأیید"
 msgid "Please wait"
 msgstr "لطفاً صبر کنید"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "لطفاً صبر کنید... در حال بکار بستن پیکربندی"
@@ -140,6 +147,7 @@ msgstr "سازوارگر %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "نقاب شبکه"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "راه‌اندازی شده در آغازگری"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "کارگیر DHCP"
@@ -169,17 +178,19 @@ msgstr ""
 "دستیار \"افزودن واسطی\" را از مرکز کنترل ماندریبا اجرا کنید"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "واسط شبکه جدیدی (LAN, ISDN, ADSL, ...( را پیکربندی کنید"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "هیچ آی‌پی"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "بدون ماسک"
@@ -249,12 +260,12 @@ msgstr ""
 "\n"
 "چکار دوست دارید بکنید؟"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "از کار انداختن"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "بکار انداختن"
@@ -269,8 +280,8 @@ msgstr "بازتنظیم"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "دستگاه شبکه"
@@ -336,7 +347,11 @@ msgstr "نام دامنه‌ی داخلی"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -628,13 +643,14 @@ msgstr "اجازه دادن به تمام کاربرها"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "دیوارآتش"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "نمی‌توان با آینه %s تماس برقرار کرد"
@@ -644,12 +660,12 @@ msgstr "نمی‌توان با آینه %s تماس برقرار کرد"
 msgid "Log"
 msgstr "ثبت وقایع"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "همه"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -676,12 +692,12 @@ msgstr "ذخیره‌ی پشتیبان پرونده‌های کاربر"
 msgid "Clear logs"
 msgstr "پاک کردن همه"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -829,7 +845,7 @@ msgstr "حالت"
 msgid "Enabled"
 msgstr "بکار انداختن"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "توصیف"
@@ -871,9 +887,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "هشدار"
@@ -2342,12 +2358,12 @@ msgid ""
 msgstr ""
 "اخطار، یک اتصال اینترنتی دیگر شناسایی شده است، شاید از شبکه شما استفاده می‌کند"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "وصل شده"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "متصل نشده"
@@ -2412,7 +2428,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "متری"
@@ -2452,19 +2468,22 @@ msgstr "مدل کارت:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "استفاده از BPALogin )برای Telstra مورد نیاز است("
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "تأیید هویت"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "ثبت‌ورود حساب (نام کاربر)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "گذرواژه‌ی حساب"
@@ -2589,13 +2608,15 @@ msgstr ""
 "هر آیتم باید مانند یک نشانی IP به صورت عدد-نقطه‌ای\n"
 "وارد گردد (مثال، ۱.۲.۳.۴)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "دروازه"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "آی‌پی کارگزار DNS"
@@ -2621,21 +2642,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "بوسیله‌ی پیش‌فرض دامنه‌ی جستجو از نام میزبان کاملاً معتبر گذاشته خواهد شد"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "زمان‌انتظار اتصال (ثانیه)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "نام میزبان DHCP"
@@ -2646,11 +2671,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "نشانی آی‌پی باید در قالب ۱.۲.۳.۴باشد"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "نشانی دروازه باید در قالب ۱.۲.۳.۴باشد"
@@ -2669,6 +2696,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "تعیین کردن نام میزبان از نشانی DHCP"
@@ -2690,6 +2718,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "اتصال‌گرم شبکه"
@@ -2758,27 +2787,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "بر اساس دست‌نویس"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "بر اساس-پایانه"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3937,90 +3971,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "اتصال بی‌سیم"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "حالت کاری"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "سازمان داده شده"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "ارشد"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "تکرار کننده"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "دومی"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "خودکار"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "نام شبکه (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "کلید رمزی"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "گذرواژه"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "ثبت‌ورود حساب (نام کاربر)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4028,12 +4065,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "گذرواژه"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4052,12 +4089,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "نام گواهینامه"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4066,32 +4103,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "شناسه‌ی شبکه"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "فرکانس کاری"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "آستانه‌ی حساسیت"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4111,17 +4153,19 @@ msgstr ""
 "مقداری برابر با حداکثر اندازه‌ی پاکت طرح را از کار می‌اندازد. همچنین\n"
 "این پارامتر را می‌توانید به خودکار، ثابت یا خاموش بگذارید."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "درهم‌ریختگی"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "آرگومان‌های اضافی فرمان iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4137,12 +4181,13 @@ msgstr ""
 "برای اطلاعات بیشتر نگاهی به صفحه‌ی دستورالعمل iwconfig(8) بیاندازید."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "آرگومان‌های اضافی فرمان iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4161,12 +4206,13 @@ msgstr ""
 "\n"
 "برای اطلاعات بیشتر نگاهی به صفحه‌ی دستورالعمل iwpspy(8) بیاندازید."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "آرگومان‌های اضافی فرمان iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4196,107 +4242,107 @@ msgstr ""
 "\n"
 "دستورالعمل iwpriv(8( را برای اطلاعات بیشتر مطالعه کنید"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "پایان‌نامه"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "کشف-خودکار"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "حالت"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4304,12 +4350,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4318,12 +4364,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "نوع گواهینامه"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4333,12 +4379,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4348,12 +4394,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4371,26 +4417,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4399,7 +4445,7 @@ msgstr ""
 "فرکانس باید پسوند k, M یا G داشته باشد (برای مثال، \"2.46G\" برای فرکانس "
 "2.46 GHz)، یا به قدر کافی '0' (صفر) اضافه کنید."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4408,17 +4454,17 @@ msgstr ""
 "میزان باید پسوند k, M یا G (برای مثال, \"11M\" برای 11M) داشته باشد, یا بقدر "
 "کافی '0' (صفر) اضافه کنید."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4564,6 +4610,287 @@ msgstr "اتصال"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"هیچ کارت شبکه‌ی ایثرنتی بر سیستم شما شناسایی نشد. لطفاً ابزار پیکربندی "
+"سخت‌افزار را اجرا کنید."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "برداشتن واسط شبکه"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "انتخاب واسط شبکه برای پیکربندی کردن:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"خطائی هنگام حذف واسط شبکه‌ی \"%s\" رخ داد: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "تبریک می‌گوئیم، واسط شبکه‌ی \"%s\" با موفقیت حذف شده است"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "سازماندهی اتصالات"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "دستگاه: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "پیکربندی آی‌پی"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "کارگزارهای DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "دامنه‌ی جستجو"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "هیچکدام"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "ثابت"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "شروع در آغازگری"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "حالت شماره‌گیری"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "سرعت اتصال"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "زمان‌انتظار اتصال (ثانیه)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "شماره تلفن شرکت عرضه کننده‌ی اینترنت"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "کنترل جریان"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "پایان دادن خط"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "زمان وقفه‌ی مودم"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "استفاده از پرونده‌ی قفل"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "انتظار برای نوای شماره‌گیری پیش از شماره گرفتن"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "اشغال است، صبر کنید"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "صوت مودم"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ کارت"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Card mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO کارت"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Card IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "پایان‌نامه‌ی اروپایی (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"پایان‌نامه برای بقیه‌ی جهان\n"
+"بدون D-Channel (خطوط اجاره‌‌ای)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "فروشنده"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "رده‌ی رسانه"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "نام بخش"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "نشانی Mac"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "گذرگاه"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "مکان بر گذرگاه"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "نشانی دروازه باید در قالب ۱.۲.۳.۴باشد"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "دروازه:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "واسط:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "پیکربندی اتصال اینترنت"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"شما هیچ اتصال اینترنتی پیکربندی شده ندارید.\n"
+"دستیار \"%s\" را از مرکز کنترل لینوکس ماندریبا اجرا کنید"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "نام میزبان (اختیاری)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "اولین کارگزار DNS (اختیاری)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "دومین کارگزار DNS (اختیاری)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "سومین کارگزار DNS (اختیاری)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "پیکربندی اتصال اینترنت"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "دستیابی اینترنت"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "نوع اتصال: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "وضعیت:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "آزمایش اتصال شما..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "پارامترها"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4767,11 +5094,6 @@ msgstr ""
 msgid "No device found"
 msgstr "هیچ دستگاهی یافت نشد"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "دستگاه: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4994,6 +5316,103 @@ msgstr "نصب یک راه‌انداز تازه"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "سرویس مورد حمله: %s"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr " دیوارآتش فعال: رخنه شناسایی شد"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "آیا می‌خواهید حمله کننده را در لیست سیاه بگذارید؟"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "جزئیات حمله"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "زمان حمله: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "واسط شبکه: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "نوع حمله: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "پروتوکل: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "نشانی آی‌پی حمله کننده: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "نام میزبان حمله کننده: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "سرویس مورد حمله: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "درگاه مورد حمله: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "نوع حمله ICMP : %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "لیست سیاه همیشه (دیگر سوال نکن)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "نادیده گرفتن"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr " دیوارآتش فعال: رخنه شناسایی شد"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "اتصال بی‌سیم"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "آیا میخواهید آن را اکنون پیکربندی کنید؟"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "بخاطر سپردن این گذرواژه"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5037,20 +5456,6 @@ msgstr "کارت درونی  ISDN"
 msgid "Protocol for the rest of the world"
 msgstr "پایان‌نامه برای بقیه جهان"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "پایان‌نامه‌ی اروپایی (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"پایان‌نامه برای بقیه‌ی جهان\n"
-"بدون D-Channel (خطوط اجاره‌‌ای)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5099,11 +5504,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "آزمایش اتصال شما..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5124,11 +5524,6 @@ msgstr "شماره تلفن شخصی شما"
 msgid "Provider name (ex provider.net)"
 msgstr "نام عرضه کننده (مثل provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "شماره تلفن شرکت عرضه کننده‌ی اینترنت"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5139,41 +5534,6 @@ msgstr "عرضه کننده‌ی dns ۱ (اختیاری)"
 msgid "Provider DNS 2 (optional)"
 msgstr "عرضه کننده dns ۲ (اختیاری)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "حالت شماره‌گیری"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "سرعت اتصال"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "زمان‌انتظار اتصال (ثانیه)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ کارت"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Card mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO کارت"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Card IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5339,16 +5699,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "نام دامنه"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "اولین کارگزار DNS (اختیاری)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "دومین کارگزار DNS (اختیاری)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5656,11 +6006,6 @@ msgstr "در آخر می‌توانید نشانی‌های آی‌پی کارگ
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "نشانی کارگزار DNS باید در قالب ۱.۲.۳.۴باشد"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "نشانی دروازه باید در قالب ۱.۲.۳.۴باشد"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6105,16 +6450,6 @@ msgstr ""
 #~ "\n"
 #~ "من بزودی شبکه‌ی محلی‌تان را با آن کارت برپاسازی می‌کنم."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "هیچ کارت شبکه‌ی ایثرنتی بر سیستم شما شناسایی نشد. لطفاً ابزار پیکربندی "
-#~ "سخت‌افزار را اجرا کنید."
-
-#~ msgid "Connection type: "
-#~ msgstr "نوع اتصال: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s از قبل استفاده می‌شود\n"
 
@@ -7098,9 +7433,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "دور انداختن"
 
-#~ msgid "none"
-#~ msgstr "هیچکدام"
-
 #~ msgid "tunnel"
 #~ msgstr "تونل"
 
@@ -7128,180 +7460,12 @@ msgstr ""
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "باید ثبت خروج کرده و باز برگردید برای اینکه تغییرات تأثیر کنند"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "سرویس مورد حمله: %s"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr " دیوارآتش فعال: رخنه شناسایی شد"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "آیا می‌خواهید حمله کننده را در لیست سیاه بگذارید؟"
-
-#~ msgid "Attack details"
-#~ msgstr "جزئیات حمله"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "زمان حمله: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "واسط شبکه: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "نوع حمله: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "پروتوکل: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "نشانی آی‌پی حمله کننده: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "نام میزبان حمله کننده: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "سرویس مورد حمله: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "درگاه مورد حمله: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "نوع حمله ICMP : %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "لیست سیاه همیشه (دیگر سوال نکن)"
-
-#~ msgid "Ignore"
-#~ msgstr "نادیده گرفتن"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr " دیوارآتش فعال: رخنه شناسایی شد"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "اتصال بی‌سیم"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "آیا میخواهید آن را اکنون پیکربندی کنید؟"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "بخاطر سپردن این گذرواژه"
-
-#~ msgid "Gateway:"
-#~ msgstr "دروازه:"
-
-#~ msgid "Interface:"
-#~ msgstr "واسط:"
-
-#~ msgid "Manage connections"
-#~ msgstr "سازماندهی اتصالات"
-
-#~ msgid "IP configuration"
-#~ msgstr "پیکربندی آی‌پی"
-
-#~ msgid "DNS servers"
-#~ msgstr "کارگزارهای DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "دامنه‌ی جستجو"
-
-#~ msgid "static"
-#~ msgstr "ثابت"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "شروع در آغازگری"
-
-#~ msgid "Flow control"
-#~ msgstr "کنترل جریان"
-
-#~ msgid "Line termination"
-#~ msgstr "پایان دادن خط"
-
-#~ msgid "Modem timeout"
-#~ msgstr "زمان وقفه‌ی مودم"
-
-#~ msgid "Use lock file"
-#~ msgstr "استفاده از پرونده‌ی قفل"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "انتظار برای نوای شماره‌گیری پیش از شماره گرفتن"
-
-#~ msgid "Busy wait"
-#~ msgstr "اشغال است، صبر کنید"
-
-#~ msgid "Modem sound"
-#~ msgstr "صوت مودم"
-
-#~ msgid "Vendor"
-#~ msgstr "فروشنده"
-
-#~ msgid "Media class"
-#~ msgstr "رده‌ی رسانه"
-
-#~ msgid "Module name"
-#~ msgstr "نام بخش"
-
-#~ msgid "Mac Address"
-#~ msgstr "نشانی Mac"
-
-#~ msgid "Bus"
-#~ msgstr "گذرگاه"
-
-#~ msgid "Location on the bus"
-#~ msgstr "مکان بر گذرگاه"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "برداشتن واسط شبکه"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "خطائی هنگام حذف واسط شبکه‌ی \"%s\" رخ داد: \n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "تبریک می‌گوئیم، واسط شبکه‌ی \"%s\" با موفقیت حذف شده است"
-
 #~ msgid "Disconnect..."
 #~ msgstr "قطع اتصال..."
 
 #~ msgid "Connect..."
 #~ msgstr "اتصال..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "پیکربندی اتصال اینترنت"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "نام میزبان (اختیاری)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "سومین کارگزار DNS (اختیاری)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "پیکربندی اتصال اینترنت"
-
-#~ msgid "Internet access"
-#~ msgstr "دستیابی اینترنت"
-
-#~ msgid "Status:"
-#~ msgstr "وضعیت:"
-
-#~ msgid "Parameters"
-#~ msgstr "پارامترها"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "جزئیات حمله"
diff --git a/po/fi.po b/po/fi.po
index 344ba6c..74b5d33 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net-fi\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-06 17:49+0300\n"
 "Last-Translator: Jani Välimaa <wally@mageia.org>\n"
 "Language-Team: Finnish <mageia-i18n@mageia.org>\n"
@@ -36,14 +36,16 @@ msgid "Interface"
 msgstr "Liitäntä"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-osoite"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokolla"
@@ -79,23 +81,27 @@ msgid "Configure Local Area Network..."
 msgstr "Aseta lähiverkko..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ohje"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Toteuta"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Peruuta"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -105,7 +111,8 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -114,7 +121,7 @@ msgstr "OK"
 msgid "Please wait"
 msgstr "Odota hetki"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Odota hetki... Otetaan asetukset käyttöön"
@@ -150,6 +157,7 @@ msgstr "Sovitin %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Verkkopeite"
@@ -165,6 +173,7 @@ msgid "Started on boot"
 msgstr "Käynnistetty koneen käynnistämisen yhteydessä"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-asiakas"
@@ -179,17 +188,19 @@ msgstr ""
 "Suorita \"%s\"-avustaja Mageian Ohjauskeskuksesta"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Aseta uusi verkkoliitäntä"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Ei IP-osoitetta"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Ei verkkopeitettä"
@@ -259,12 +270,12 @@ msgstr ""
 "\n"
 "Mitä tehdään?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Ota käyttöön"
@@ -279,8 +290,8 @@ msgstr "Aseta uudelleen"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Valitse Internetiin yhteydessä oleva verkkoliitäntä."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Verkkoliitäntä"
@@ -356,7 +367,11 @@ msgstr "Sisäinen verkkoalueen nimi"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -655,13 +670,14 @@ msgstr "Sallitut osoitteet"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiivinen palomuuri"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Yhteyttä taustaprosessiin voitu muodostaa"
@@ -671,12 +687,12 @@ msgstr "Yhteyttä taustaprosessiin voitu muodostaa"
 msgid "Log"
 msgstr "Loki"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Salli"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Estä"
@@ -704,12 +720,12 @@ msgstr "Estetyt palvelut"
 msgid "Clear logs"
 msgstr "Tyhjennä lokitiedostot"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Kiellettyjen lista"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Sallittujen lista"
@@ -859,7 +875,7 @@ msgstr "Moduuli"
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Kuvaus"
@@ -906,9 +922,9 @@ msgstr ""
 "Käytössä on verkkoprofiili %s. Järjestelmän asetukset voidaan määritellä "
 "normaalisti, kaikki verkkoasetukset tallentuvat profiiliin."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Varoitus"
@@ -2457,12 +2473,12 @@ msgstr ""
 "Varoitus! Toinen, mahdollisesti sinun verkkoa käyttävä, Internet-yhteys on "
 "havaittu"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Yhteys muodostettu"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Ei yhteyttä"
@@ -2527,7 +2543,7 @@ msgstr "Ota käyttöön verkkoliikenteen laskenta"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Salli Network Managerin hallita liitäntää"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metric"
@@ -2567,19 +2583,22 @@ msgstr "Kaapelimodeemi"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Käytä BPALogin:a (tarvitaan Telstralle)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Tunnistustapa"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Käyttäjätunnus (käyttäjän nimi)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Salasana"
@@ -2703,13 +2722,15 @@ msgstr ""
 "Syötä koneen IP-asetukset. Kukin kohta tulee syöttää IP-osoitteena,\n"
 "pisteillä eroteltuna nelinumeroisena sarjana (esim. 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Yhdyskäytävä"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Hae nimipalvelimet DHCP-palvelimelta"
@@ -2737,21 +2758,25 @@ msgstr ""
 "perusteella"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP:n aikakatkaisu (sekuntia)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Hae YP-palvelimet DHCP-palvelimelta"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Hae aikapalvelimet DHCP-palvelimelta"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-verkkonimi"
@@ -2762,11 +2787,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Älä käytä Zeroconf-varmistusta (169.254.0.0-verkkoa)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-osoitteen tulee olla muotoa 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Verkon peitteen tulee olla muotoa 255.255.224.0"
@@ -2789,6 +2816,7 @@ msgstr ""
 "käynnistyminen pois käytöstä."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Määritä verkkonimi DHCP-palvelimen avulla (tai luo ainutlaatuinen)"
@@ -2815,6 +2843,7 @@ msgstr ""
 "ei anneta, käytetään oletusarvoa (localhost.localdomain)."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Verkon pikakytkentä (Hotplugging)"
@@ -2883,27 +2912,32 @@ msgstr "Modeemi"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analoginen modeemi"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skriptipohjainen"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminaalipohjainen"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4062,12 +4096,12 @@ msgstr "WPA / WPA2 PSK"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA / WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows-ajuri"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4076,79 +4110,82 @@ msgstr ""
 "Langaton verkkokortti on poistettu käytöstä, kortti tulee ottaa käyttöön "
 "ensin."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Langattoman verkon asetukset"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Toimintatila"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
 # Asennuksen sivuvalikko
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Hallittu"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Ensisijainen"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Toistin"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Toissijainen"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Verkon nimi (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Salaustapa"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Salausavain"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Piilota salasana"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Pakota avaimen käyttö ASCII-merkkijonona (esim. Liveboxille)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP-käyttäjätunnus"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4159,12 +4196,12 @@ msgstr ""
 "Jos toimialue täytyy määritellä, kokeile testaamatonta muotoa\n"
 "  TOIMIALUE\\käyttäjätunnus"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP-salasana"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4197,12 +4234,12 @@ msgstr ""
 "sertifikaattipohjainen ja ohittaa mahdollisesti käyttäjätunnus-\n"
 "ja salasana-asetukset."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP-asiakassertifikaatti"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4218,32 +4255,37 @@ msgstr ""
 "HUOM! Muut tähän asetukseen liittyvät asetukset löytyvät\n"
 "lisäasetuksista."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Verkon tunnus"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Toimintataajuus"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Herkkyyskynnys"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Siirtonopeus (bit/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4264,17 +4306,19 @@ msgstr ""
 "Parametri voidaan asettaa myös arvoon auto (automaattinen), fixed\n"
 "(kiinteä) tai off (pois käytöstä)."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Pirstoutuminen"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Komennon iwconfig ylimääräiset argumentit"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4290,12 +4334,13 @@ msgstr ""
 "Katso lisätietoja komennolla \"man iwconfig\"."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Komennon iwspy ylimääräiset argumentit"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4314,12 +4359,13 @@ msgstr ""
 "\n"
 "Katso lisätietoja komennolla \"man iwpspy\"."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Komennon iwpriv ylimääräiset argumentit"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4347,28 +4393,28 @@ msgstr ""
 "\n"
 "Katso lisätietoja komennolla \"man iwpriv\"."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP-protokolla"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Automaattinen tunnistaminen"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4377,67 +4423,67 @@ msgstr ""
 "Automaattinen tunnistaminen on suositeltua; ensin kokeillaan\n"
 "WPA2:ta ja tämän jälkeen WPA:ta."
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP-tila"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP-avaimenhallinta"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4446,12 +4492,12 @@ msgstr ""
 "Lista hyväksytyistä avaimenhallintaprotokollista.\n"
 "Mahdolliset arvot: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP:n ulompi identiteetti"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4462,12 +4508,12 @@ msgstr ""
 "identiteettinä EAP-tyyppien kanssa, jotka tukevat erilaisia\n"
 "tunneloituja identiteettejä, esim. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP-vaihe 2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4480,12 +4526,12 @@ msgstr ""
 "auth=MSCHAPV2 (PEAP:lle) tai\n"
 "autheap=MSCHAPV2 autheap=MD5 (TTLS:lle)"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA-sertifikaatti"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4501,12 +4547,12 @@ msgstr ""
 "tulisi aina määritellä käytettäessä TLS:ää, TTLS:ää tai\n"
 "PEAP:ia."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP-sertifikaatin tietojen täsmäys"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4521,12 +4567,12 @@ msgstr ""
 "sisältää määritellyt merkkijonot. Merkkijono on muotoa:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Lisätoimintaohjeet"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4558,19 +4604,19 @@ msgstr ""
 "\tOthers such as key_mgmt, eap maybe used to force\n"
 "\tspecial settings different from the U.I settings."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Salausavain vaaditaan."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr "Salausavaimessa tulisi olla 8-63 ASCII-merkkiä tai 64 heksadesimaalia."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4578,7 +4624,7 @@ msgid ""
 msgstr ""
 "WEP-avaimessa tulisi olla enintään %d ASCII-merkkiä tai %d heksadesimaalia."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4587,7 +4633,7 @@ msgstr ""
 "Taajuuden tulisi loppua päätteeseen k, M tai G (esim. \"2.46G\" jos taajuus "
 "on 2.46 GHz) tai loppuun tulee lisätä tarpeeksi nollia."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4596,17 +4642,17 @@ msgstr ""
 "Nopeuden tulisi loppua päätteeseen k, M tai G (esim. \"11M\" jos nopeus on "
 "11M) tai tai loppuun tulee lisätä tarpeeksi nollia."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Salli tukiaseman vaihtaminen"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Yhdistettiin langattomaan verkkoon %s liitännässä %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Yhteys katkesi langattomaan verkkoon liitännässä %s"
@@ -4754,6 +4800,286 @@ msgstr "Yhdistä"
 msgid "Hostname changed to \"%s\""
 msgstr "Uusi verkkonimi: %s"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Koneestasi ei löytynyt yhtään verkkokorttia. Aja laitteistonasetustyökalu."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Poista verkkoliitäntä"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Valitse asetettava verkkoliitäntä:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Ilmeni ongelma poistettaessa verkkoliitäntää \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Onnittelut, verkkoliitäntä \"%s\" on onnistuneesti poistettu"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Yhteyksien hallinta"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Laite: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP asetukset"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Nimipalvelimet"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Etsi verkkoalueelta"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ei mikään"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "Staattinen"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Käynnistä koneen käynnistyksen yhteydessä"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Soittotila"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Yhteyden nopeus"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Yhteyden aikakatkaisu (sekuntia)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Palveluntarjoajan puhelinnumero"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Vuonohjaus"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Linjan katkaiseminen"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Modeemin aikaviive"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Käytä lukkotiedostoa"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Odota valintaääntä ennen numeronvalintaa"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Busy wait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Modeemi ääni"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kortin IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kortin muisti (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kortin IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kortin IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Eurooppalainen protokolla (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Muun maailman käyttämä protokolla \n"
+"Ei D-kanavaa (vuokralinjat)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Valmistaja"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Media luokka"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Moduulin nimi"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "MAC-osoite"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Väylä"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Sijainti väylässä"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Yhdyskäytävän osoite pitää olla muotoa 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Yhdyskäytävä:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Liitäntä:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Internetyhteyden asetukset"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Yhtään verkkoliitäntää ei ole vielä asetettu.\n"
+"Suorita Mageian Ohjauskeskuksesta työkalu \"%s\"."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Konenimi (ei pakollinen)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Ensisijainen nimipalvelin (valinnainen)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Toissijainen nimipalvelin (valinnainen)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Kolmas nimipalvelin (ei pakollinen)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Internetyhteyden asetukset"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internetyhteys"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Yhteyden nimi: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Tila:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testataan yhteyttä..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametrit"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4964,11 +5290,6 @@ msgstr "Käytä interaktiivista palomuuria"
 msgid "No device found"
 msgstr "Laitetta ei löytynyt"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Laite: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5202,6 +5523,103 @@ msgstr "Asenna uusi ajuri"
 msgid "Select a device:"
 msgstr "Valitse laite:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Hyökätty palvelu: %s"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Aktiivinen Palomuuri: tunkeutuminen tunnistettu"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Haluatko asettaa hyökkääjän \"mustalle listalle\"?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Hyökkäyksen yksityiskohdat"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Hyökkäyksen aika: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Verkkoliitäntä: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Hyökkäyksen tyyppi: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokolla: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Hyökkääjän IP-osoite: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Hyökkääjän verkkonimi: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Hyökätty palvelu: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Hyökätty portti: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "ICMP hyökkäyksen tyyppi: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Laita aina \"mustalle listalle\" (älä kysy enää)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Älä huomioi"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Aktiivinen Palomuuri: tunkeutuminen tunnistettu"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Langaton yhteys"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Haluatko määritellä asetukset nyt?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Muista tämä salasana"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5245,20 +5663,6 @@ msgstr "Sisäinen ISDN-kortti"
 msgid "Protocol for the rest of the world"
 msgstr "Muun maailman käyttämä protokolla"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Eurooppalainen protokolla (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Muun maailman käyttämä protokolla \n"
-"Ei D-kanavaa (vuokralinjat)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5309,11 +5713,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Yhteyden hallinta"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testataan yhteyttä..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5334,11 +5733,6 @@ msgstr "Henkilökohtainen puhelinnumero"
 msgid "Provider name (ex provider.net)"
 msgstr "Palveluntarjoajan nimi (esim. tarjoaja.fi)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Palveluntarjoajan puhelinnumero"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5349,41 +5743,6 @@ msgstr "Palveluntarjoajan nimipalvelin 1 (vapaaehtoinen)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Palveluntarjoajan nimipalvelin 2 (vapaaehtoinen)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Soittotila"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Yhteyden nopeus"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Yhteyden aikakatkaisu (sekuntia)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kortin IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kortin muisti (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kortin IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kortin IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5550,16 +5909,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Verkkoalueen nimi"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Ensisijainen nimipalvelin (valinnainen)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Toissijainen nimipalvelin (valinnainen)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5867,11 +6216,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Nimipalvelimen osoite pitää olla muotoa 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Yhdyskäytävän osoite pitää olla muotoa 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6357,15 +6701,6 @@ msgstr "Käytä määriteltyä UDP-porttia"
 #~ "\n"
 #~ "Lähiverkkosi asetetaan käyttämään kyseistä laitetta."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Koneestasi ei löytynyt yhtään verkkokorttia. Aja laitteistonasetustyökalu."
-
-#~ msgid "Connection type: "
-#~ msgstr "Yhteyden nimi: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s on jo käytössä\n"
 
@@ -6396,9 +6731,6 @@ msgstr "Käytä määriteltyä UDP-porttia"
 #~ msgid "Flag"
 #~ msgstr "Lippu"
 
-#~ msgid "none"
-#~ msgstr "ei mikään"
-
 #~ msgid "Level"
 #~ msgstr "Taso"
 
@@ -6407,180 +6739,12 @@ msgstr "Käytä määriteltyä UDP-porttia"
 #~ "Sinun pitää kirjautua ulos ja takaisin sisään jotta muutokset tulevat "
 #~ "voimaan."
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Hyökätty palvelu: %s"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Aktiivinen Palomuuri: tunkeutuminen tunnistettu"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Haluatko asettaa hyökkääjän \"mustalle listalle\"?"
-
-#~ msgid "Attack details"
-#~ msgstr "Hyökkäyksen yksityiskohdat"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Hyökkäyksen aika: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Verkkoliitäntä: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Hyökkäyksen tyyppi: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokolla: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Hyökkääjän IP-osoite: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Hyökkääjän verkkonimi: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Hyökätty palvelu: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Hyökätty portti: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "ICMP hyökkäyksen tyyppi: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Laita aina \"mustalle listalle\" (älä kysy enää)"
-
-#~ msgid "Ignore"
-#~ msgstr "Älä huomioi"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Aktiivinen Palomuuri: tunkeutuminen tunnistettu"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Langaton yhteys"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Haluatko määritellä asetukset nyt?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Muista tämä salasana"
-
-#~ msgid "Gateway:"
-#~ msgstr "Yhdyskäytävä:"
-
-#~ msgid "Interface:"
-#~ msgstr "Liitäntä:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Yhteyksien hallinta"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP asetukset"
-
-#~ msgid "DNS servers"
-#~ msgstr "Nimipalvelimet"
-
-#~ msgid "Search Domain"
-#~ msgstr "Etsi verkkoalueelta"
-
-#~ msgid "static"
-#~ msgstr "Staattinen"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Käynnistä koneen käynnistyksen yhteydessä"
-
-#~ msgid "Flow control"
-#~ msgstr "Vuonohjaus"
-
-#~ msgid "Line termination"
-#~ msgstr "Linjan katkaiseminen"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Modeemin aikaviive"
-
-#~ msgid "Use lock file"
-#~ msgstr "Käytä lukkotiedostoa"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Odota valintaääntä ennen numeronvalintaa"
-
-#~ msgid "Busy wait"
-#~ msgstr "Busy wait"
-
-#~ msgid "Modem sound"
-#~ msgstr "Modeemi ääni"
-
-#~ msgid "Vendor"
-#~ msgstr "Valmistaja"
-
-#~ msgid "Media class"
-#~ msgstr "Media luokka"
-
-#~ msgid "Module name"
-#~ msgstr "Moduulin nimi"
-
-#~ msgid "Mac Address"
-#~ msgstr "MAC-osoite"
-
-#~ msgid "Bus"
-#~ msgstr "Väylä"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Sijainti väylässä"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Poista verkkoliitäntä"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ilmeni ongelma poistettaessa verkkoliitäntää \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Onnittelut, verkkoliitäntä \"%s\" on onnistuneesti poistettu"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Katkaise yhteys..."
 
 #~ msgid "Connect..."
 #~ msgstr "Yhdistä..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Internetyhteyden asetukset"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Konenimi (ei pakollinen)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Kolmas nimipalvelin (ei pakollinen)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Internetyhteyden asetukset"
-
-#~ msgid "Internet access"
-#~ msgstr "Internetyhteys"
-
-#~ msgid "Status:"
-#~ msgstr "Tila:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametrit"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Hyökkäyksen yksityiskohdat"
diff --git a/po/fr.po b/po/fr.po
index 634ea9b..9d01194 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,18 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-12 23:39+0000\n"
 "Last-Translator: Yann Ciret Yann Ciret <mageia@zamiz.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: ../bin/drakconnect-old:45
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Interface"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Adresse IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocole"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "Configurer le réseau local…"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Aide"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Appliquer"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Annuler"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -95,16 +101,17 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Veuillez patienter… Mise en place de la configuration"
@@ -140,6 +147,7 @@ msgstr "Carte réseau %s : %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Masque de sous-réseau"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "Lancer au démarrage"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Client DHCP"
@@ -169,17 +178,19 @@ msgstr ""
 "Lancez l'assistant « %s » du Centre de contrôle de Mageia Linux"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configurer une nouvelle connexion Internet (LAN, ISDN, ADSL, …)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Pas d'IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Pas de masque"
@@ -203,18 +214,27 @@ msgstr "Partage de la connexion Internet"
 #, 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). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
-"Vous êtes sur le point de configurer votre ordinateur pour partager sa connexion Internet.\n"
-"Avec cette fonction, d'autres ordinateurs sur votre réseau local pourront utiliser la connexion Internet de cet ordinateur.\n"
+"Vous êtes sur le point de configurer votre ordinateur pour partager sa "
+"connexion Internet.\n"
+"Avec cette fonction, d'autres ordinateurs sur votre réseau local pourront "
+"utiliser la connexion Internet de cet ordinateur.\n"
 "\n"
-"Assurez-vous d'avoir configuré votre accès réseau/Internet grâce à drakconnect avant d'aller plus loin.\n"
+"Assurez-vous d'avoir configuré votre accès réseau/Internet grâce à "
+"drakconnect avant d'aller plus loin.\n"
 "\n"
-"Veuillez noter que vous avez besoin d'une carte réseau dédiée pour configurer un réseau local (LAN). Veuillez désactiver le pare-feu Mageia sur la carte réseau connectée à votre LAN avant de continuer."
+"Veuillez noter que vous avez besoin d'une carte réseau dédiée pour "
+"configurer un réseau local (LAN). Veuillez désactiver le pare-feu Mageia sur "
+"la carte réseau connectée à votre LAN avant de continuer."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -242,12 +262,12 @@ msgstr ""
 "\n"
 "Que souhaitez-vous faire ?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Désactiver"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Activer"
@@ -262,8 +282,8 @@ msgstr "Reconfigurer"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Veuillez indiquer l'interface réseau directement connectée à Internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Périphérique réseau"
@@ -271,7 +291,8 @@ msgstr "Périphérique réseau"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one network adapter on your system configured for LAN connections:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
@@ -281,7 +302,8 @@ msgid ""
 "disable the firewall protection on it using drakfirewall before\n"
 "configuring Internet Connection sharing."
 msgstr ""
-"Il n'y a qu'un seul adaptateur réseau configuré pour les connexions LAN sur votre système :\n"
+"Il n'y a qu'un seul adaptateur réseau configuré pour les connexions LAN sur "
+"votre système :\n"
 "\n"
 "%s\n"
 "Cet adaptateur va être utilisé pour configurer votre réseau local.\n"
@@ -292,8 +314,11 @@ msgstr ""
 
 #: ../bin/drakgw:156
 #, c-format
-msgid "Please choose what network adapter will be connected to your Local Area Network."
-msgstr "Veuillez choisir quelle carte réseau sera connectée à votre réseau local."
+msgid ""
+"Please choose what network adapter will be connected to your Local Area "
+"Network."
+msgstr ""
+"Veuillez choisir quelle carte réseau sera connectée à votre réseau local."
 
 #: ../bin/drakgw:177
 #, c-format
@@ -334,7 +359,11 @@ msgstr "Le nom de domaine interne"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -349,10 +378,10 @@ msgstr "Erreur"
 
 #: ../bin/drakgw:188
 #, c-format
-msgid ""
-"Potential LAN address conflict found in current config of %s!\n"
-""
-msgstr "Conflit potentiel d'adresses du réseau local trouvé dans la configuration de %s !\n"
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr ""
+"Conflit potentiel d'adresses du réseau local trouvé dans la configuration de "
+"%s !\n"
 
 #: ../bin/drakgw:204
 #, c-format
@@ -445,13 +474,19 @@ msgstr "Diffuser les informations de l'imprimante"
 #: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter configured for LAN has been detected on your system.\n"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that "
+"the Mageia firewall is not enabled for network adapter connected to your LAN "
+"network."
 msgstr ""
-"Aucun adaptateur réseau configuré pour le LAN n'a été détecté sur votre système.\n"
+"Aucun adaptateur réseau configuré pour le LAN n'a été détecté sur votre "
+"système.\n"
 "\n"
-"Veuillez lancer l'outil de configuration du matériel pour le configurer et assurez-vous que le pare-feu Mageia n'est pas activé pour l'adaptateur réseau connecté à votre réseau local."
+"Veuillez lancer l'outil de configuration du matériel pour le configurer et "
+"assurez-vous que le pare-feu Mageia n'est pas activé pour l'adaptateur "
+"réseau connecté à votre réseau local."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -467,11 +502,14 @@ msgstr "Le partage de la connexion à Internet est maintenant désactivé."
 #, 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 ""
 "Tout a été configuré.\n"
-"Vous pouvez maintenant partager votre connexion Internet avec d'autres ordinateurs sur votre réseau local, en utilisant la configuration réseau automatique (DHCP) et un serveur de cache (proxy) transparent (SQUID)."
+"Vous pouvez maintenant partager votre connexion Internet avec d'autres "
+"ordinateurs sur votre réseau local, en utilisant la configuration réseau "
+"automatique (DHCP) et un serveur de cache (proxy) transparent (SQUID)."
 
 #: ../bin/drakgw:351
 #, c-format
@@ -485,8 +523,12 @@ msgstr "Configuration du pare-feu détectée !"
 
 #: ../bin/drakgw:366
 #, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
-msgstr "Attention ! Une configuration existante du pare-feu a été détectée. Vous devrez peut-être modifier la configuration manuellement après l'installation."
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+"Attention ! Une configuration existante du pare-feu a été détectée. Vous "
+"devrez peut-être modifier la configuration manuellement après l'installation."
 
 #: ../bin/drakgw:371
 #, c-format
@@ -621,13 +663,14 @@ msgstr "Adresses autorisées"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Pare-feu interactif"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Impossible de contacter le démon"
@@ -637,12 +680,12 @@ msgstr "Impossible de contacter le démon"
 msgid "Log"
 msgstr "Journal"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Autoriser"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Bloquer"
@@ -669,12 +712,12 @@ msgstr "Services bloqués"
 msgid "Clear logs"
 msgstr "Nettoyer les journaux"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Liste noire"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Liste blanche"
@@ -756,8 +799,12 @@ msgstr "Un mot de passe est nécessaire."
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "Cet outil permet de configurer le mode repli des interfaces réseau et la réplication du pare-feu."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
+msgstr ""
+"Cet outil permet de configurer le mode repli des interfaces réseau et la "
+"réplication du pare-feu."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -820,7 +867,7 @@ msgstr "Module"
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Description"
@@ -837,8 +884,16 @@ msgstr "Nouveau profil…"
 
 #: ../bin/draknetprofile:155
 #, c-format
-msgid "Please specify the name of the new network profile to be created (e.g., work, home, roaming, ..). This new profile will be created based on current settings, and you'll be able to configure your system configuration as usual afterwards."
-msgstr "Veuillez préciser le nom du nouveau profil réseau à créer (ex. travail, maison, itinérant…). Ce nouveau profil s'appuiera sur les paramètres actuels et vous pourrez ensuite configurer votre système comme vous le faites habituellement."
+msgid ""
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
+"settings, and you'll be able to configure your system configuration as usual "
+"afterwards."
+msgstr ""
+"Veuillez préciser le nom du nouveau profil réseau à créer (ex. travail, "
+"maison, itinérant…). Ce nouveau profil s'appuiera sur les paramètres actuels "
+"et vous pourrez ensuite configurer votre système comme vous le faites "
+"habituellement."
 
 #: ../bin/draknetprofile:166
 #, c-format
@@ -852,12 +907,18 @@ msgstr "Nouveau profil créé"
 
 #: ../bin/draknetprofile:172
 #, c-format
-msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
-msgstr "Vous utilisez désormais le profil réseau %s. Vous pouvez configurer votre système comme d'habitude et tous vos paramètres réseau modifiés seront conservés dans ce profil."
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+"Vous utilisez désormais le profil réseau %s. Vous pouvez configurer votre "
+"système comme d'habitude et tous vos paramètres réseau modifiés seront "
+"conservés dans ce profil."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Attention"
@@ -869,8 +930,12 @@ msgstr "Êtes-vous sûr de vouloir effacer le profil par défaut ?"
 
 #: ../bin/draknetprofile:186
 #, c-format
-msgid "You can not delete the current profile. Please switch to a different profile first."
-msgstr "Vous ne pouvez pas effacer le profil courant. Veuillez d'abord basculer sur un profil différent."
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
+msgstr ""
+"Vous ne pouvez pas effacer le profil courant. Veuillez d'abord basculer sur "
+"un profil différent."
 
 #: ../bin/draknetprofile:194 ../bin/draknfs:356
 #, c-format
@@ -992,34 +1057,51 @@ msgstr "Cela devrait être un répertoire."
 #: ../bin/draknfs:146
 #, 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\">Client NFS</span> peut être précisé de plusieurs manières :\n"
+"<span weight=\"bold\">Client NFS</span> peut être précisé de plusieurs "
+"manières :\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">hôte unique :</span> un client identifié par un nom abrégé connu de la résolution de nom, un nom complet qualifié (FQDN) ou une adresse IP\n"
+"<span foreground=\"royalblue3\">hôte unique :</span> un client identifié par "
+"un nom abrégé connu de la résolution de nom, un nom complet qualifié (FQDN) "
+"ou une adresse IP\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Nom de groupe réseau</span> un nom de groupe réseau NIS peut être donné au format @groupe.\n"
+"<span foreground=\"royalblue3\">Nom de groupe réseau</span> un nom de groupe "
+"réseau NIS peut être donné au format @groupe.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Caractères jokers</span> un nom pouvant contenir les caractères joker * et ?. Par exemple : *.cs.foo.edu correspond à toutes les machines du domaine cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">Caractères jokers</span> un nom pouvant "
+"contenir les caractères joker * et ?. Par exemple : *.cs.foo.edu correspond "
+"à toutes les machines du domaine cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Réseaux IP :</span> vous pouvez aussi exporter des répertoires à toutes les machines d'un (sous) réseau IP simultanément en ajoutant un masque à la fin de l'adresse du (sous) réseau. Exemple : 192.168.1.0/255.255.255.0' ou 192.168.1.0/24\n"
+"<span foreground=\"royalblue3\">Réseaux IP :</span> vous pouvez aussi "
+"exporter des répertoires à toutes les machines d'un (sous) réseau IP "
+"simultanément en ajoutant un masque à la fin de l'adresse du (sous) réseau. "
+"Exemple : 192.168.1.0/255.255.255.0' ou 192.168.1.0/24\n"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1027,31 +1109,48 @@ 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\">Options des identifiants des utilisateurs</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Associer l'utilisateur root à l'utilisateur anonymous (root_squash) :</span> transforme les requêtes des UID/GID 0 en UID/GID anonymes (root_squash).\n"
+"<span foreground=\"royalblue3\">Associer l'utilisateur root à l'utilisateur "
+"anonymous (root_squash) :</span> transforme les requêtes des UID/GID 0 en "
+"UID/GID anonymes (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Autoriser les accès distants de root :</span> ne pas transformer les UID/GID 0 (no_root_squash). Cette option est particulièrement utiles pour les stations sans disque.\n"
+"<span foreground=\"royalblue3\">Autoriser les accès distants de root :</"
+"span> ne pas transformer les UID/GID 0 (no_root_squash). Cette option est "
+"particulièrement utiles pour les stations sans disque.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Associer tous les utilisateurs à l'utilisateur anonymous :</span> convertit tous les UID/GID en utilisateur anonyme (all_squash). Utile pour exporter avec NFS des répertoires publics de FTP, des répertoires de News, etc… L'option inverse est no_all_squash, qui s'applique par défaut.\n"
+"<span foreground=\"royalblue3\">Associer tous les utilisateurs à "
+"l'utilisateur anonymous :</span> convertit tous les UID/GID en utilisateur "
+"anonyme (all_squash). Utile pour exporter avec NFS des répertoires publics "
+"de FTP, des répertoires de News, etc… L'option inverse est no_all_squash, "
+"qui s'applique par défaut.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Utilisateur et groupe anonymous (anonuid et anongid) :</span> ces options donnent explicitement l'UID et le GID du compte anonymous.\n"
+"<span foreground=\"royalblue3\">Utilisateur et groupe anonymous (anonuid et "
+"anongid) :</span> ces options donnent explicitement l'UID et le GID du "
+"compte anonymous.\n"
 
 #: ../bin/draknfs:177
 #, c-format
@@ -1080,23 +1179,51 @@ msgstr "Options avancées"
 
 #: ../bin/draknfs:183
 #, 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> cette option nécessite que la requête soit initiée à partir d'un port IP inférieur à IPPORT_RESERVED (1024). Cette option est activée par défaut."
+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> cette option nécessite que la "
+"requête soit initiée à partir d'un port IP inférieur à IPPORT_RESERVED "
+"(1024). Cette option est activée par défaut."
 
 #: ../bin/draknfs:184
 #, 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> permet soit la lecture seule, soit la lecture/écriture sur ce volume NFS. Par défaut, les requêtes de modification sont refusées. Cette option permet de rendre ce comportement explicite."
+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> permet soit la lecture seule, "
+"soit la lecture/écriture sur ce volume NFS. Par défaut, les requêtes de "
+"modification sont refusées. Cette option permet de rendre ce comportement "
+"explicite."
 
 #: ../bin/draknfs:185
 #, 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> interdit au serveur NFS de violer le protocole NFS en répondant aux requêtes avant que les traitements associés ne soient réellement effectués sur le support de stockage (disque par exemple)."
+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> interdit au serveur NFS de "
+"violer le protocole NFS en répondant aux requêtes avant que les traitements "
+"associés ne soient réellement effectués sur le support de stockage (disque "
+"par exemple)."
 
 #: ../bin/draknfs:186
 #, 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> active la vérification des sous-répertoires qui permet d'améliorer la sécurité dans certains cas, mais qui peut dégrader la fiabilité. Voir la page du manuel exports(5) pour plus de détails."
+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> active la vérification des sous-"
+"répertoires qui permet d'améliorer la sécurité dans certains cas, mais qui "
+"peut dégrader la fiabilité. Voir la page du manuel exports(5) pour plus de "
+"détails."
 
 #: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
@@ -1452,20 +1579,18 @@ msgstr "Copyright (C) %s par Mandriva"
 #: ../bin/draksambashare:198
 #, c-format
 msgid "This is a simple tool to easily manage Samba configuration."
-msgstr "Ceci est un outil simple pour gérer facilement la configuration de Samba."
+msgstr ""
+"Ceci est un outil simple pour gérer facilement la configuration de Samba."
 
 #: ../bin/draksambashare:200
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
-msgid ""
-"_: Translator(s) name(s) & email(s)\n"
-""
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "David Baudens\n"
 "David Odin\n"
@@ -1523,8 +1648,12 @@ msgstr "Commentaire :"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
-msgstr "Un partage de même nom existe déjà ou alors le nom de partage est vide, veuillez choisir un autre nom."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+"Un partage de même nom existe déjà ou alors le nom de partage est vide, "
+"veuillez choisir un autre nom."
 
 #: ../bin/draksambashare:400
 #, c-format
@@ -1554,8 +1683,11 @@ msgstr "Ajouter un partage imprimante particulier"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Le rôle de cet assistant est de faciliter la création d'un partage imprimante particulier."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Le rôle de cet assistant est de faciliter la création d'un partage "
+"imprimante particulier."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -1580,7 +1712,9 @@ msgstr "L'assistant a ajouté une imprimante partagée Samba avec succès"
 #: ../bin/draksambashare:552
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
-msgstr "Veuillez ajouter ou sélectionner une imprimante partagée Samba afin de pouvoir la modifier."
+msgstr ""
+"Veuillez ajouter ou sélectionner une imprimante partagée Samba afin de "
+"pouvoir la modifier."
 
 #: ../bin/draksambashare:570
 #, c-format
@@ -1660,7 +1794,9 @@ msgstr "Entrée DrakSamba"
 #: ../bin/draksambashare:695
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Veuillez ajouter ou sélectionner un partage Samba afin de pouvoir le modifier."
+msgstr ""
+"Veuillez ajouter ou sélectionner un partage Samba afin de pouvoir le "
+"modifier."
 
 #: ../bin/draksambashare:718
 #, c-format
@@ -1694,8 +1830,11 @@ msgstr "Public :"
 
 #: ../bin/draksambashare:795
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Le masque de création et le masque des droits sur les répertoires et fichiers doivent être des numériques. Ex : 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Le masque de création et le masque des droits sur les répertoires et "
+"fichiers doivent être des numériques. Ex : 0755."
 
 #: ../bin/draksambashare:803
 #, c-format
@@ -1744,8 +1883,12 @@ msgstr "Assistant de configuration du serveur Samba"
 
 #: ../bin/draksambashare:1057
 #, c-format
-msgid "Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
-msgstr "Samba permet à votre machine de se comporter comme un serveur de fichiers ou d'imprimantes au profit des postes clients non-Linux."
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
+msgstr ""
+"Samba permet à votre machine de se comporter comme un serveur de fichiers ou "
+"d'imprimantes au profit des postes clients non-Linux."
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1754,18 +1897,29 @@ msgstr "Serveur PDC : contrôleur principal de domaine"
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
-msgstr "Un serveur configuré en tant que contrôleur principal de domaine est responsable de l'authentification Windows dans tout le domaine :"
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+"Un serveur configuré en tant que contrôleur principal de domaine est "
+"responsable de l'authentification Windows dans tout le domaine :"
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Les installations de serveur simple peuvent utiliser les utilitaires de mots de passe smbpasswd ou tdbsam"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Les installations de serveur simple peuvent utiliser les utilitaires de mots "
+"de passe smbpasswd ou tdbsam"
 
 #: ../bin/draksambashare:1073
 #, 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, implique que le serveur se déclarera sous le nom NetBIOS <pdc name>. Ce nom sera reconnu par les autres serveurs."
+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, implique que le serveur se déclarera sous le nom "
+"NetBIOS <pdc name>. Ce nom sera reconnu par les autres serveurs."
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -1789,8 +1943,18 @@ msgstr "Niveau OS :"
 
 #: ../bin/draksambashare:1092
 #, 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 "L'option globale « Niveau OS » détermine la valeur de système d'exploitation que simulera Samba lors des élections entre serveurs. Si vous souhaitez que Samba gagne l'élection et devienne le serveur maître, vous devez saisir un niveau supérieur à celui du système d'exploitation ayant la valeur la plus élevée de votre réseau. Ex : Niveau OS = 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 ""
+"L'option globale « Niveau OS » détermine la valeur de système d'exploitation "
+"que simulera Samba lors des élections entre serveurs. Si vous souhaitez que "
+"Samba gagne l'élection et devienne le serveur maître, vous devez saisir un "
+"niveau supérieur à celui du système d'exploitation ayant la valeur la plus "
+"élevée de votre réseau. Ex : Niveau OS = 34"
 
 #: ../bin/draksambashare:1096
 #, c-format
@@ -1805,7 +1969,8 @@ msgstr "Groupe de travail"
 #: ../bin/draksambashare:1103
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Samba doit connaître le nom du groupe de travail Windows qu'il servira."
+msgstr ""
+"Samba doit connaître le nom du groupe de travail Windows qu'il servira."
 
 #: ../bin/draksambashare:1110 ../bin/draksambashare:1177
 #, c-format
@@ -1829,8 +1994,13 @@ msgstr "Mode de sécurité"
 
 #: ../bin/draksambashare:1122
 #, c-format
-msgid "User level: the client sends a session setup request directly following protocol negotiation. This request provides a username and password."
-msgstr "Niveau utilisateur : le client envoie directement une demande d'ouverture de session après la négociation du protocole. Cette demande contient un nom d'utilisateur et un mot de passe."
+msgid ""
+"User level: the client sends a session setup request directly following "
+"protocol negotiation. This request provides a username and password."
+msgstr ""
+"Niveau utilisateur : le client envoie directement une demande d'ouverture de "
+"session après la négociation du protocole. Cette demande contient un nom "
+"d'utilisateur et un mot de passe."
 
 #: ../bin/draksambashare:1122
 #, c-format
@@ -1839,8 +2009,14 @@ msgstr "Niveau partage : le client s'identifie séparément pour chaque partage
 
 #: ../bin/draksambashare:1122
 #, 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 "Niveau domaine : permet de stocker tous les comptes et groupes d'utilisateurs dans un espace centralisé de comptes, partagé entre les contrôleurs (sécurité) du domaine."
+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 ""
+"Niveau domaine : permet de stocker tous les comptes et groupes "
+"d'utilisateurs dans un espace centralisé de comptes, partagé entre les "
+"contrôleurs (sécurité) du domaine."
 
 #: ../bin/draksambashare:1133
 #, c-format
@@ -1854,8 +2030,12 @@ msgstr "Bannière du serveur."
 
 #: ../bin/draksambashare:1138
 #, c-format
-msgid "The banner is the way this server will be described in the Windows workstations."
-msgstr "La bannière est la façon dont le serveur sera décrit sur les postes clients Windows."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"La bannière est la façon dont le serveur sera décrit sur les postes clients "
+"Windows."
 
 #: ../bin/draksambashare:1143
 #, c-format
@@ -1874,18 +2054,24 @@ msgstr "Journaux de Samba"
 
 #: ../bin/draksambashare:1154
 #, c-format
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
-msgstr "Fichier journal : utilisez fichier.%m pour disposer d'un fichier journal différent pour chaque machine qui se connecte"
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
+"Fichier journal : utilisez fichier.%m pour disposer d'un fichier journal "
+"différent pour chaque machine qui se connecte"
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Niveau des journaux : détermine le niveau de détail (0 <= niveau <= 10)"
+msgstr ""
+"Niveau des journaux : détermine le niveau de détail (0 <= niveau <= 10)"
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Taille max des journaux : limite la taille des fichiers journaux (en ko)"
+msgstr ""
+"Taille max des journaux : limite la taille des fichiers journaux (en ko)"
 
 #: ../bin/draksambashare:1161 ../bin/draksambashare:1179
 #, c-format
@@ -1909,13 +2095,21 @@ msgstr "L'assistant a collecté les paramètres suivants pour configurer Samba."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
-msgstr "Pour accepter ces valeurs et configurer votre serveur, cliquez sur le bouton Suivant. Sinon utilisez le bouton Précédent pour les corriger."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Pour accepter ces valeurs et configurer votre serveur, cliquez sur le bouton "
+"Suivant. Sinon utilisez le bouton Précédent pour les corriger."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Si vous avez précédemment créé des partages, ils apparaîtront dans cette configuration. Lancez « drakwizard sambashare » pour gérer vos partages."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run 'drakwizard sambashare' to manage your shares."
+msgstr ""
+"Si vous avez précédemment créé des partages, ils apparaîtront dans cette "
+"configuration. Lancez « drakwizard sambashare » pour gérer vos partages."
 
 #: ../bin/draksambashare:1176
 #, c-format
@@ -2306,15 +2500,19 @@ msgstr "Mesure locale"
 
 #: ../bin/net_monitor:512
 #, c-format
-msgid "Warning, another internet connection has been detected, maybe using your network"
-msgstr "Attention, une autre connexion Internet a été détectée, utilisant peut-être votre réseau"
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"Attention, une autre connexion Internet a été détectée, utilisant peut-être "
+"votre réseau"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Non connecté"
@@ -2379,7 +2577,7 @@ msgstr "Activer les statistiques réseau"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Permettre le contrôle de l'interface par Network Manager"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Métrique"
@@ -2392,7 +2590,8 @@ msgstr "MTU"
 #: ../lib/network/connection.pm:253
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
-msgstr "Taille maximale des messages réseau (MTU). En cas de doute, laissez vide."
+msgstr ""
+"Taille maximale des messages réseau (MTU). En cas de doute, laissez vide."
 
 #: ../lib/network/connection.pm:333
 #, c-format
@@ -2419,19 +2618,22 @@ msgstr "Modem cable"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Utiliser BPALogin (nécessaire pour Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Authentification"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Nom d'utilisateur du compte"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Mot de passe du compte"
@@ -2528,7 +2730,9 @@ msgstr "Interface virtuelle"
 #: ../lib/network/connection/ethernet.pm:60
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Impossible de trouver l'interface réseau pour le périphérique sélectionné (utilisation du pilote %s)."
+msgstr ""
+"Impossible de trouver l'interface réseau pour le périphérique sélectionné "
+"(utilisation du pilote %s)."
 
 #: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
@@ -2556,13 +2760,15 @@ msgstr ""
 "Chaque champ doit être rempli avec une adresse IP en notation\n"
 "décimale pointée (par exemple, 192.168.1.20)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Passerelle"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Récupérer les serveurs DNS depuis le serveur DHCP"
@@ -2585,24 +2791,30 @@ msgstr "Domaine recherché"
 #: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
-msgstr "Par défaut, le domaine de recherche sera déduit du nom de machine pleinement qualifié"
+msgstr ""
+"Par défaut, le domaine de recherche sera déduit du nom de machine pleinement "
+"qualifié"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Délai d'expiration DHCP (en sec.)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Récupérer les serveurs YP depuis le serveur DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Récupérer les serveurs NTPD depuis le serveur DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nom d'hôte DHCP"
@@ -2613,14 +2825,17 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Ne pas se rabattre vers Zeroconf (réseau 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "L'adresse IP doit avoir un format similaire à « 192.168.1.20 »"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
-msgstr "Le masque de sous-réseau doit avoir un format similaire à « 255.255.224.0 »"
+msgstr ""
+"Le masque de sous-réseau doit avoir un format similaire à « 255.255.224.0 »"
 
 #: ../lib/network/connection/ethernet.pm:186
 #, c-format
@@ -2629,25 +2844,47 @@ msgstr "Attention : l'adresse IP %s est habituellement réservée !"
 
 #: ../lib/network/connection/ethernet.pm:195
 #, c-format
-msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
-msgstr "%s est déjà utilisée par une connexion lancée au démarrage (%s). Pour utiliser cette adresse avec cette connexion, vous devez d'abord désactiver tous les périphériques qui l'utilisent ou bien ne pas les activer au démarrage"
+msgid ""
+"%s is already used by a connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start at boot"
+msgstr ""
+"%s est déjà utilisée par une connexion lancée au démarrage (%s). Pour "
+"utiliser cette adresse avec cette connexion, vous devez d'abord désactiver "
+"tous les périphériques qui l'utilisent ou bien ne pas les activer au "
+"démarrage"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
-msgstr "Affecter le nom d'hôte depuis le serveur DHCP (ou en générer un unique)"
+msgstr ""
+"Affecter le nom d'hôte depuis le serveur DHCP (ou en générer un unique)"
 
 #: ../lib/network/connection/ethernet.pm:223
 #, c-format
-msgid "This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically."
-msgstr "Cela va permettre au serveur d'attribuer un nom à cette machine. Si le serveur n'attribue pas de nom d'hôte valide, il sera généré automatiquement."
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+"Cela va permettre au serveur d'attribuer un nom à cette machine. Si le "
+"serveur n'attribue pas de nom d'hôte valide, il sera généré automatiquement."
 
 #: ../lib/network/connection/ethernet.pm:226
 #, c-format
-msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
-msgstr "Vous devriez donner un nom d'hôte à cette machine qui permettra de l'identifier. Veuillez noter que ce nom d'hôte sera utilisé par toutes les connexions réseau. Si ce champ est laissé vide, « localhost.localdomain » sera utilisé."
+msgid ""
+"You should define a hostname for this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections.  If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+"Vous devriez donner un nom d'hôte à cette machine qui permettra de "
+"l'identifier. Veuillez noter que ce nom d'hôte sera utilisé par toutes les "
+"connexions réseau. Si ce champ est laissé vide, « localhost.localdomain » "
+"sera utilisé."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Branchement à chaud du réseau"
@@ -2675,7 +2912,8 @@ msgstr "Adresse réseau attribuée pour l'interface %s (protocole %s)"
 #: ../lib/network/connection/ethernet.pm:309
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
-msgstr "Échec d'attribution d'une adresse réseau pour l'interface %s (protocole %s)"
+msgstr ""
+"Échec d'attribution d'une adresse réseau pour l'interface %s (protocole %s)"
 
 #: ../lib/network/connection/isdn.pm:8
 #, c-format
@@ -2716,27 +2954,32 @@ msgstr "RTC"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem analogique (RTC)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Basée sur un script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Manuelle par terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3895,88 +4138,96 @@ msgstr "WPA/WPA2 avec clé pré-partagée (PSK)"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Entreprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Pilote Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
-msgstr "Votre carte réseau sans fil est désactivée, veuillez d'abord l'activer par le bouton associé."
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
+msgstr ""
+"Votre carte réseau sans fil est désactivée, veuillez d'abord l'activer par "
+"le bouton associé."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Paramètres de la connexion sans fil"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Mode de fonctionnement"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Géré"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Maître"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Répéteur"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secondaire"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nom de réseau (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Mode de chiffrement"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Clé de chiffrement"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Cacher le mot de passe"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
-msgstr "Forcer l'utilisation de cette clé en tant que chaîne ASCII (ex pour Livebox)"
+msgstr ""
+"Forcer l'utilisation de cette clé en tant que chaîne ASCII (ex pour Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Utilisateur/compte EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3987,12 +4238,12 @@ msgstr ""
 "Si vous devez préciser un domaine, essayez la syntaxe\n"
 "non testée DOMAIN\\utilisateur"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Mot de passe EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4026,12 +4277,12 @@ msgstr ""
 "  Le mode TLS est basé uniquement sur un certificat et peut\n"
 "ignorer le nom d'utilisateur et le mot de passe donnés ici."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Certificat client EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4042,41 +4293,50 @@ msgstr ""
 "Chemin et nom du fichier du certificat client. Ceci est utilisé\n"
 "uniquement pour les authentifications basées sur un certificat\n"
 "EAP. C'est une alternative au couple utilisateur/mot de passe.\n"
-" Note : les autres paramètres associés sont présentés dans les Options avancées."
+" Note : les autres paramètres associés sont présentés dans les Options "
+"avancées."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Identifiant réseau"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Fréquence de fonctionnement"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Seuil de sensibilité"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Taux de transfert (bits par seconde)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, 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 ""
 "RTS/CTS réserve le canal avant chaque transmission de paquet afin de\n"
@@ -4088,41 +4348,46 @@ msgstr ""
 "taille maximale de paquet désactivera ce mécanisme. Vous pouvez\n"
 "également définir ce paramètre à « auto », « fixed » ou « off »."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentation"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 "Arguments supplémentaires\n"
 "pour la commande iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 ""
-"Ici, il est possible de configurer des paramètres supplémentaires pour la carte sans-fil, tels que :\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (nick est déjà configuré via le nom d'hôte).\n"
+"Ici, il est possible de configurer des paramètres supplémentaires pour la "
+"carte sans-fil, tels que :\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick est déjà "
+"configuré via le nom d'hôte).\n"
 "\n"
 "Consultez la page de manuel iwconfig(8) pour plus d'informations."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 "Arguments supplémentaires\n"
 "pour la commande iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4142,28 +4407,33 @@ msgstr ""
 "\n"
 "Consultez la page de manuel iwspy(8) pour plus d'informations."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 "Arguments supplémentaires\n"
 "pour la commande iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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 permet de spécifier des paramètres optionnels (et privés) d'une interface réseau sans fil.\n"
+"iwpriv permet de spécifier des paramètres optionnels (et privés) d'une "
+"interface réseau sans fil.\n"
 "\n"
 "iwpriv permet de manipuler les paramètres et réglages spécifiques à\n"
 "chaque pilote (par opposition à iwconfig qui gère les paramètres\n"
@@ -4175,28 +4445,28 @@ msgstr ""
 "\n"
 "Consultez la page de manuel iwpriv(8) pour plus d'informations."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protocole EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Auto-détecter"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4205,67 +4475,67 @@ msgstr ""
 "Auto-détecter est recommandé car cela essaye d'abord WPA\n"
 "version 2 avec en secours WPA version 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Mode EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4274,12 +4544,12 @@ msgstr ""
 "liste des protocoles de gestion de clés d'authentification acceptés.\n"
 "Valeurs possibles : WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Identité externe EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4290,12 +4560,12 @@ msgstr ""
 "comme identité non chiffrée avec les types d'EAP supportant\n"
 "différentes identités encapsulées dans des tunnels, ex. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4308,12 +4578,12 @@ msgstr ""
 "auth=MSCHAPV2 pour PEAP ou\n"
 "autheap=MSCHAPV2 autheap=MD5 pour TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Certificat de l'AC EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4328,12 +4598,12 @@ msgstr ""
 "vérifié. Si possible, un certificat d'une AC de confiance doit\n"
 "toujours être configuré lors de l'utilisation de TLS, TTLS ou PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Modèle de sujet du certificat EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4348,12 +4618,12 @@ msgstr ""
 "cette chaîne dans son sujet. Le format du sujet est le suivant :\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Directives supplémentaires"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4384,42 +4654,58 @@ msgstr ""
 "\tD'autres comme key_mgmt, eap permettent de forcer\n"
 "\tdes valeurs différentes de celles de l'interface."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Une clé de chiffrement est requise."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
-msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
-msgstr "La clé pré-partagée comporte entre 8 et 63 caractères ASCII, ou 64 caractères héxadécimaux."
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+"La clé pré-partagée comporte entre 8 et 63 caractères ASCII, ou 64 "
+"caractères héxadécimaux."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
-msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
-msgstr "La clé WEP comporte au plus %d caractères ASCII ou %d caractères héxadécimaux."
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+"La clé WEP comporte au plus %d caractères ASCII ou %d caractères "
+"héxadécimaux."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 "La fréquence doit avoir un suffixe k, M ou G (par ex. « 2.46G » pour 2,46 GHz), ou bien avoir suffisamment de zéros."
+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 ""
+"La fréquence doit avoir un suffixe k, M ou G (par ex. « 2.46G » pour "
+"2,46 GHz), ou bien avoir suffisamment de zéros."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "Le débit doit avoir un suffixe k, M ou G (par ex. « 11M » pour 11Mo), ou bien avoir suffisamment de zéros."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Le débit doit avoir un suffixe k, M ou G (par ex. « 11M » pour 11Mo), ou "
+"bien avoir suffisamment de zéros."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Autoriser les connexions itinérantes"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Associé au réseau sans fil « %s » sur l'interface %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Association perdue avec le réseau sans fil sur l'interface %s"
@@ -4437,18 +4723,24 @@ msgstr "Modem USB Alcatel Speedtouch"
 #: ../lib/network/connection/xdsl.pm:125
 #, 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 ""
-"Le modem ECI Hi-Focus ne peut pas être configuré à cause d'un problème de redistribution du pilote binaire.\n"
+"Le modem ECI Hi-Focus ne peut pas être configuré à cause d'un problème de "
+"redistribution du pilote binaire.\n"
 "\n"
 "Vous pouvez trouver un pilote sur http://eciadsl.flashtux.org/"
 
 #: ../lib/network/connection/xdsl.pm:185
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
-msgstr "Les modems utilisant les puces Conexant AccessRunner ne peuvent pas être pris en charge à cause d'un problème de redistribution du micro-code binaire."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
+msgstr ""
+"Les modems utilisant les puces Conexant AccessRunner ne peuvent pas être "
+"pris en charge à cause d'un problème de redistribution du micro-code binaire."
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4561,6 +4853,287 @@ msgstr "Connecter"
 msgid "Hostname changed to \"%s\""
 msgstr "Le nom d'hôte (hostname) a été changé en « %s »"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Interface réseau"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Choisissez l'interface réseau à configurer :"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Un problème est survenu pendant le redémarrage du réseau : \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Félicitations, la configuration du réseau est terminée."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Gérer les connexions VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Périphérique : "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Configuration VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Serveur DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Domaine recherché"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatique"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Lancer au démarrage"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Numérotation"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Vitesse de connexion"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Temps maxi pour établir la connexion (en sec.)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Numéro de téléphone pour l'accès"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Connexion par modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Sélectionnez un fichier"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Koweit"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "n° IRQ de la carte"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Plage mémoire (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "E/S de la carte"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "E/S_0 de la carte"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocole pour l'Europe (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocole pour le reste du monde \n"
+"Pas de canal D (lignes louées)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Module"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Adresse réelle"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Bélarus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+"L'adresse de la passerelle doit ressembler à quelque chose comme "
+"« 192.168.1.20 »"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Passerelle"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interface"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Aucune connexion Internet n'est configurée"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Vous n'avez configuré aucune connexion Internet.\n"
+"Lancez l'assistant « %s » du Centre de contrôle de Mageia Linux"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Serveur DNS principal (optionnel)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Serveur DNS principal (optionnel)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Serveur DNS secondaire (optionnel)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Serveur DNS principal (optionnel)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configuration de la connexion"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Accès à l'imprimante"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Durée de la connexion : "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "État"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Test de votre connexion…"
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Paramètres IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4676,7 +5249,8 @@ msgid ""
 msgstr ""
 "assistant de configuration drakfirewall\n"
 "\n"
-"Cet assistant configure un pare-feu personnel pour cet ordinateur sous Mageia."
+"Cet assistant configure un pare-feu personnel pour cet ordinateur sous "
+"Mageia."
 
 #: ../lib/network/drakfirewall.pm:228
 #, c-format
@@ -4721,7 +5295,8 @@ msgstr ""
 "Le bon format est « port/tcp » ou « port/udp », \n"
 "où le port est compris entre 1 et 65535.\n"
 "\n"
-"Vous pouvez aussi passer un intervalle de ports (par exemple : 24300:24350/udp)"
+"Vous pouvez aussi passer un intervalle de ports (par exemple : 24300:24350/"
+"udp)"
 
 #: ../lib/network/drakfirewall.pm:264
 #, c-format
@@ -4752,10 +5327,12 @@ msgstr "Enregistrer les messages du pare-feu dans le journal système"
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
-"Vous pouvez être informé lorsque quelqu'un accède à un service ou essaye de s'introduire dans votre système.\n"
+"Vous pouvez être informé lorsque quelqu'un accède à un service ou essaye de "
+"s'introduire dans votre système.\n"
 "Veuillez sélectionner les activités réseau que vous souhaitez surveiller."
 
 #: ../lib/network/drakfirewall.pm:316
@@ -4768,11 +5345,6 @@ msgstr "Utiliser le pare-feu interactif"
 msgid "No device found"
 msgstr "Aucun périphérique trouvé"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Périphérique : "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4811,7 +5383,8 @@ msgstr "Impossible d'initialiser la connexion type %s !"
 #: ../lib/network/drakvpn.pm:60
 #, c-format
 msgid "Please select an existing VPN connection or enter a new name."
-msgstr "Veuillez sélectionner une connexion VPN existante ou entrer un nouveau nom."
+msgstr ""
+"Veuillez sélectionner une connexion VPN existante ou entrer un nouveau nom."
 
 #: ../lib/network/drakvpn.pm:64
 #, c-format
@@ -4826,7 +5399,8 @@ msgstr "Nouveau nom"
 #: ../lib/network/drakvpn.pm:70
 #, c-format
 msgid "You must select an existing connection or enter a new name."
-msgstr "Vous devez sélectionner une connexion existante ou entrer un nouveau nom."
+msgstr ""
+"Vous devez sélectionner une connexion existante ou entrer un nouveau nom."
 
 #: ../lib/network/drakvpn.pm:81
 #, c-format
@@ -4848,14 +5422,17 @@ msgstr "Voulez-vous démarrer la connexion maintenant ?"
 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 ""
 "La connexion VPN est maintenant configurée.\n"
 "\n"
-"Cette connexion VPN peut être démarrée automatiquement au moment d'une connexion au réseau.\n"
-"Cela peut être fait en reconfigurant la connexion réseau et en sélectionnant cette connexion VPN.\n"
+"Cette connexion VPN peut être démarrée automatiquement au moment d'une "
+"connexion au réseau.\n"
+"Cela peut être fait en reconfigurant la connexion réseau et en sélectionnant "
+"cette connexion VPN.\n"
 
 #: ../lib/network/ifw.pm:132
 #, c-format
@@ -4909,11 +5486,14 @@ msgstr "Une attaque « %s » a été tentée par %s"
 
 #: ../lib/network/ifw.pm:151
 #, c-format
-msgid "The \"%s\" application is trying to make a service (%s) available to the network."
-msgstr "L'application « %s » tente de rendre disponible un service (%s) pour le réseau."
+msgid ""
+"The \"%s\" application is trying to make a service (%s) available to the "
+"network."
+msgstr ""
+"L'application « %s » tente de rendre disponible un service (%s) pour le "
+"réseau."
 
-#. -PO: this should be kept lowercase since the expression is meant to be used
-#. between brackets
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -4949,8 +5529,14 @@ msgstr "Veuillez choisir le pilote correct"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver description (.inf) file, or corresponding driver file (.dll or .o files). Note that only drivers up to Windows XP are supported."
-msgstr "Veuillez sélectionner le fichier de description du pilote Windows (.inf) ou le fichier pilote correspondant (fichier .dll ou .o). Veuillez noter que seuls les pilotes Windows XP ou antérieurs sont supportés."
+msgid ""
+"Please select the Windows driver description (.inf) file, or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
+"Veuillez sélectionner le fichier de description du pilote Windows (.inf) ou "
+"le fichier pilote correspondant (fichier .dll ou .o). Veuillez noter que "
+"seuls les pilotes Windows XP ou antérieurs sont supportés."
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4996,6 +5582,103 @@ msgstr "Installer un nouveau pilote"
 msgid "Select a device:"
 msgstr "Sélectionnez un périphérique :"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Attaque de service"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Mode automatique du pare-feu interactif"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Comment désirez-vous activer cette connexion ?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interface réseau"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocole"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Adresse IP : %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Attaque de service"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Pare-feu interactif"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Connexion sans fil"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Comment désirez-vous activer cette connexion ?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5039,20 +5722,6 @@ msgstr "Carte RNIS/ISDN interne"
 msgid "Protocol for the rest of the world"
 msgstr "Protocole pour le reste du monde"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocole pour l'Europe (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocole pour le reste du monde \n"
-"Pas de canal D (lignes louées)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5103,11 +5772,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Contrôle de la connexion"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Test de votre connexion…"
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5128,11 +5792,6 @@ msgstr "Votre numéro de téléphone personnel"
 msgid "Provider name (ex provider.net)"
 msgstr "Fournisseur d'accès (ex. : fournisseur.fr)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Numéro de téléphone pour l'accès"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5143,41 +5802,6 @@ msgstr "1er DNS du fournisseur (optionnel)"
 msgid "Provider DNS 2 (optional)"
 msgstr "2ème DNS du fournisseur (optionnel)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Numérotation"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Vitesse de connexion"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Temps maxi pour établir la connexion (en sec.)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "n° IRQ de la carte"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Plage mémoire (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "E/S de la carte"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "E/S_0 de la carte"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5211,8 +5835,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"
 "Si vous possédez une carte ISA, les données du prochain écran devraient\n"
@@ -5238,8 +5862,14 @@ msgstr "Parmi les choix suivants, lequel correspond à votre carte RNIS/ISDN ?"
 
 #: ../lib/network/netconnect.pm:461
 #, 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 "Un pilote CAPI est disponible pour ce modem. Ce pilote CAPI peut offrir plus de possibilités que le pilote libre (tel qu'envoyer des fax). Quel pilote voulez-vous utiliser ?"
+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 ""
+"Un pilote CAPI est disponible pour ce modem. Ce pilote CAPI peut offrir plus "
+"de possibilités que le pilote libre (tel qu'envoyer des fax). Quel pilote "
+"voulez-vous utiliser ?"
 
 #: ../lib/network/netconnect.pm:475
 #, c-format
@@ -5339,16 +5969,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nom de domaine"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Serveur DNS principal (optionnel)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Serveur DNS secondaire (optionnel)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5410,13 +6030,21 @@ msgstr "Des problèmes se sont produits pendant le test de connexion réseau."
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
-msgid "This can be caused by invalid network configuration, or problems with your modem or router."
-msgstr "Ceci est peut-être causé par une configuration réseau incorrecte, ou un problème avec votre modem ou votre routeur."
+msgid ""
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+"Ceci est peut-être causé par une configuration réseau incorrecte, ou un "
+"problème avec votre modem ou votre routeur."
 
 #: ../lib/network/netconnect.pm:772
 #, c-format
-msgid "You might want to relaunch the configuration to verify the connection settings."
-msgstr "Vous pouvez essayer de relancer la configuration pour vérifier les paramètres de connexion."
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
+msgstr ""
+"Vous pouvez essayer de relancer la configuration pour vérifier les "
+"paramètres de connexion."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
@@ -5425,13 +6053,21 @@ msgstr "Félicitations, la configuration du réseau est terminée."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
-msgid "However, the Internet connectivity test failed. You should test your connection manually, and verify your Internet modem or router."
-msgstr "Cependant, le test de connexion Internet a échoué. Vous devriez tester votre connexion manuellement et vérifier votre modem ou votre routeur."
+msgid ""
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
+msgstr ""
+"Cependant, le test de connexion Internet a échoué. Vous devriez tester votre "
+"connexion manuellement et vérifier votre modem ou votre routeur."
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
-msgid "If your connection does not work, you might want to relaunch the configuration."
-msgstr "Si votre connexion ne fonctionne pas, vous pouvez essayer de relancer la configuration."
+msgid ""
+"If your connection does not work, you might want to relaunch the "
+"configuration."
+msgstr ""
+"Si votre connexion ne fonctionne pas, vous pouvez essayer de relancer la "
+"configuration."
 
 #: ../lib/network/netconnect.pm:778
 #, c-format
@@ -5440,8 +6076,12 @@ msgstr "Félicitations, la configuration Internet et réseau est terminée."
 
 #: ../lib/network/netconnect.pm:779
 #, c-format
-msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
-msgstr "Une fois terminé, il est recommandé de redémarrer votre interface graphique, afin d'éviter les problèmes liés au changement de nom d'hôte de la machine."
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+"Une fois terminé, il est recommandé de redémarrer votre interface graphique, "
+"afin d'éviter les problèmes liés au changement de nom d'hôte de la machine."
 
 #: ../lib/network/netconnect.pm:790
 #, c-format
@@ -5540,9 +6180,10 @@ msgstr "Le nom d'hôte zeroconf ne doit pas contenir de point."
 #: ../lib/network/netconnect.pm:813
 #, 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 ""
 "Comme vous êtes en train de faire une installation réseau,\n"
 " cela veut dire que votre réseau est déjà configuré.\n"
@@ -5589,7 +6230,6 @@ msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
-""
 msgstr ""
 "Vous avez configuré plusieurs moyens d'accès à Internet.\n"
 "Choisissez celui que vous voulez utiliser.\n"
@@ -5607,9 +6247,12 @@ msgstr "Configuration du périphérique réseau %s (pilote %s)"
 
 #: ../lib/network/netconnect.pm:824
 #, 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 ""
-"Les protocoles suivants peuvent être utilisés pour configurer une connexion LAN.\n"
+"Les protocoles suivants peuvent être utilisés pour configurer une connexion "
+"LAN.\n"
 "Veuillez sélectionner celui que vous désirez utiliser."
 
 #: ../lib/network/netconnect.pm:825
@@ -5623,22 +6266,20 @@ msgstr ""
 "Veuillez indiquer un nom d'hôte pour la machine.\n"
 "Celui-ci doit être un nom de machine pleinement qualifié, par exemple :\n"
 "mamachine.monlabo.masociete.com\n"
-"Vous pouvez également indiquer l'adresse IP de la passerelle si votre réseau local en possède une."
+"Vous pouvez également indiquer l'adresse IP de la passerelle si votre réseau "
+"local en possède une."
 
 #: ../lib/network/netconnect.pm:830
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr "Enfin, vous pouvez également entrer les adresses IP de vos serveurs DNS."
+msgstr ""
+"Enfin, vous pouvez également entrer les adresses IP de vos serveurs DNS."
 
 #: ../lib/network/netconnect.pm:831
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
-msgstr "L'adresse du DNS doit ressembler à quelque chose comme « 192.168.1.20 »"
-
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "L'adresse de la passerelle doit ressembler à quelque chose comme « 192.168.1.20 »"
+msgstr ""
+"L'adresse du DNS doit ressembler à quelque chose comme « 192.168.1.20 »"
 
 #: ../lib/network/netconnect.pm:833
 #, c-format
@@ -5661,8 +6302,12 @@ msgstr "Paramètres réseau avancés"
 
 #: ../lib/network/network.pm:524
 #, c-format
-msgid "Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."
-msgstr "Vous pouvez configurer ici les paramètres avancés de votre réseau. Vous devrez relancer votre machine pour prendre en compte les modifications."
+msgid ""
+"Here you can configure advanced network settings. Please note that you have "
+"to reboot the machine for changes to take effect."
+msgstr ""
+"Vous pouvez configurer ici les paramètres avancés de votre réseau. Vous "
+"devrez relancer votre machine pour prendre en compte les modifications."
 
 #: ../lib/network/network.pm:526
 #, c-format
@@ -5721,8 +6366,12 @@ msgstr "Configuration des serveurs mandataires (proxy)"
 
 #: ../lib/network/network.pm:549
 #, c-format
-msgid "Here you can set up your proxies configuration (eg: http://my_caching_server:8080)"
-msgstr "Vous pouvez définir ici la configuration des serveurs mandataires (ex : http://mon_proxy:8080)"
+msgid ""
+"Here you can set up your proxies configuration (eg: http://"
+"my_caching_server:8080)"
+msgstr ""
+"Vous pouvez définir ici la configuration des serveurs mandataires (ex : "
+"http://mon_proxy:8080)"
 
 #: ../lib/network/network.pm:550
 #, c-format
@@ -5776,7 +6425,6 @@ msgid ""
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
-""
 msgstr ""
 "Veuillez sélectionner les interfaces qui seront protégées par le pare-feu.\n"
 "\n"
@@ -5812,19 +6460,25 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:144
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Des composants (%s) sont nécessaires mais sont indisponibles pour le matériel %s."
+msgstr ""
+"Des composants (%s) sont nécessaires mais sont indisponibles pour le "
+"matériel %s."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
 msgid "Some packages (%s) are required but aren't available."
-msgstr "Certains paquetages (%s) sont nécessaires mais ne sont pas disponibles."
+msgstr ""
+"Certains paquetages (%s) sont nécessaires mais ne sont pas disponibles."
 
 #. -PO: first argument is a list of Mageia distributions
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
-msgstr "Ces paquetages sont disponibles dans %s, ou dans le dépôt officiel de paquetages %s."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
+msgstr ""
+"Ces paquetages sont disponibles dans %s, ou dans le dépôt officiel de "
+"paquetages %s."
 
 #: ../lib/network/thirdparty.pm:152
 #, c-format
@@ -5882,7 +6536,9 @@ msgstr "Insérez une disquette"
 
 #: ../lib/network/thirdparty.pm:243
 #, 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 ""
 "Insérez une disquette formatée en FAT dans le lecteur %s avec %s dans\n"
 "le répertoire racine, puis appuyez sur %s"
@@ -5895,7 +6551,9 @@ msgstr "Suivant"
 #: ../lib/network/thirdparty.pm:253
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
-msgstr "Erreur lors de l'accès à la disquette, impossible de monter le périphérique %s"
+msgstr ""
+"Erreur lors de l'accès à la disquette, impossible de monter le périphérique "
+"%s"
 
 #: ../lib/network/thirdparty.pm:352
 #, c-format
diff --git a/po/fur.po b/po/fur.po
index 191a9dc..f57de0e 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr ""
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr ""
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr ""
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Jutori"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Apliche"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Scancele"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Va ben"
@@ -95,7 +101,8 @@ msgstr "Va ben"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "Va ben"
 msgid "Please wait"
 msgstr "Par plasè, spiete"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr ""
@@ -138,6 +145,7 @@ msgstr ""
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr ""
@@ -153,6 +161,7 @@ msgid "Started on boot"
 msgstr ""
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr ""
@@ -165,17 +174,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr ""
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr ""
@@ -228,12 +239,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr ""
@@ -248,8 +259,8 @@ msgstr "Configure"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Periferiche di rêt"
@@ -315,7 +326,11 @@ msgstr ""
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -597,13 +612,14 @@ msgstr "Permet ducj i utents"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr ""
@@ -613,12 +629,12 @@ msgstr ""
 msgid "Log"
 msgstr ""
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Ducj"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -645,12 +661,12 @@ msgstr ""
 msgid "Clear logs"
 msgstr "Scancele dut"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -798,7 +814,7 @@ msgstr "Non dal modul"
 msgid "Enabled"
 msgstr ""
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descrizion"
@@ -840,9 +856,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Avertence"
@@ -2300,12 +2316,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr ""
@@ -2370,7 +2386,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "Messic"
@@ -2410,19 +2426,22 @@ msgstr ""
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, fuzzy, c-format
 msgid "Authentication"
 msgstr "Autentificazion"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr ""
@@ -2542,13 +2561,15 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr ""
@@ -2574,21 +2595,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr ""
@@ -2599,11 +2624,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr ""
@@ -2622,6 +2649,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2643,6 +2671,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
@@ -2711,27 +2740,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr ""
@@ -3890,90 +3924,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Clâf di cifradure"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Non utent"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3981,12 +4018,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4005,12 +4042,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4019,32 +4056,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4058,17 +4100,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4079,12 +4123,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4096,12 +4141,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4119,107 +4165,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protocol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4227,12 +4273,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4241,12 +4287,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4256,12 +4302,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4271,12 +4317,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4294,50 +4340,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4479,6 +4525,278 @@ msgstr "Conetimi"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Rêt & Internet"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Rêt & Internet"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Gjestis conessions"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Periferiche: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Configurazion Xorg"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Server NFS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Control di flus"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Sielç il file"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Non dal modul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Permet ducj i utents"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Bielorussie"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interface:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Non host"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configurazion Xorg"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Acès a Internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Instalazion falade"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Stât:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametris"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4670,11 +4988,6 @@ msgstr ""
 msgid "No device found"
 msgstr ""
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Periferiche: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4897,6 +5210,103 @@ msgstr "Server mail interni"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Servizis"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Firewall"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Vuelistu doprâ cheste fature?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Black Metal"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Sorte di tabele des partizions: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Rêt & Internet"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Sorte di tabele des partizions: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocol:"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Recapit IP dal computer:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "O imposti il non di host %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Servizis"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Sorte di tabele des partizions: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Firewall"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Gjestis conessions"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Vuelistu provâ le configurazion?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4940,18 +5350,6 @@ msgstr ""
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5000,11 +5398,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr ""
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5025,11 +5418,6 @@ msgstr ""
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5040,41 +5428,6 @@ msgstr ""
 msgid "Provider DNS 2 (optional)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5229,16 +5582,6 @@ msgstr ""
 msgid "Domain name"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5511,11 +5854,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5945,64 +6283,6 @@ msgstr ""
 #~ msgstr "Nivel"
 
 #, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Servizis"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Vuelistu doprâ cheste fature?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Black Metal"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Rêt & Internet"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Sorte di tabele des partizions: %s\n"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Protocol:"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Recapit IP dal computer:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "O imposti il non di host %s: "
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Gjestis conessions"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Vuelistu provâ le configurazion?"
-
-#~ msgid "Interface:"
-#~ msgstr "Interface:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Gjestis conessions"
-
-#~ msgid "Flow control"
-#~ msgstr "Control di flus"
-
-#~ msgid "Internet access"
-#~ msgstr "Acès a Internet"
-
-#~ msgid "Status:"
-#~ msgstr "Stât:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametris"
-
-#, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Black Metal"
 
diff --git a/po/ga.po b/po/ga.po
index 452fd65..bc2dd91 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -24,14 +24,16 @@ msgid "Interface"
 msgstr "Comhéadan"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Seoladh IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Prótacal"
@@ -67,23 +69,27 @@ msgid "Configure Local Area Network..."
 msgstr "Cumraigh gréasánú"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "C_úidiú"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Deán"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Cealaigh"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ceart go Leor"
@@ -93,7 +99,8 @@ msgstr "Ceart go Leor"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -102,7 +109,7 @@ msgstr "Ceart go Leor"
 msgid "Please wait"
 msgstr "Fan tamall"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Fan tamall... ag cur na cumraíochta i bhfeidhm"
@@ -136,6 +143,7 @@ msgstr ""
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Masc líonra:"
@@ -151,6 +159,7 @@ msgid "Started on boot"
 msgstr ""
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr ""
@@ -163,17 +172,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Roghnaigh an cláréadan ghréasán"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Pacáiste mícheart"
@@ -226,12 +237,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Díchumasaigh"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Cumasaigh"
@@ -246,8 +257,8 @@ msgstr "Athchumraigh"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Freastalaí Printéir"
@@ -313,7 +324,11 @@ msgstr "Gan  Printéir"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -595,13 +610,14 @@ msgstr "Suimigh úsáideoir"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Bac slándála"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Teip ar glaoch `fork': %s"
@@ -611,12 +627,12 @@ msgstr "Teip ar glaoch `fork': %s"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Ceadaigh"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Coisc"
@@ -643,12 +659,12 @@ msgstr "Droch comhad chúltaca"
 msgid "Clear logs"
 msgstr "Glan gach ceann"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -796,7 +812,7 @@ msgstr "Mód"
 msgid "Enabled"
 msgstr "Cumasaigh"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Cuntas"
@@ -838,9 +854,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Rabhadh"
@@ -2298,12 +2314,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Ceangailte"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Níl ceangailte"
@@ -2368,7 +2384,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Méadrach:"
@@ -2408,19 +2424,22 @@ msgstr "Cuimhne Charta (DMA)"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Deimniú"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Pasfhocal"
@@ -2540,13 +2559,15 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Inneal Geata:"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "IP freastalaí SMP"
@@ -2572,21 +2593,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Ainm Nasc"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "ÓstAinm"
@@ -2597,11 +2622,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr ""
@@ -2620,6 +2647,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Teastáil an luchóg, le do thoil"
@@ -2641,6 +2669,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Cumraíocht Gréasánú"
@@ -2709,27 +2738,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Script-bhunaithe"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Teirminéal-bhunaithe"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3914,90 +3948,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Socruithe Gan Sreang"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Mód Saineolaí"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-Hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Bainistithe"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Máistir"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Aisig ó comhad"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Tánaisteach"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Uathoibríoch"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Eochair chriptiúcháin:"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Pasfhocal"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Ainm úsáideora"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4005,12 +4042,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Pasfhocal"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4029,12 +4066,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Teastas"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4043,32 +4080,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Cláréadan Gréasán"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4082,17 +4124,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Stáisiún Cluichí"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4103,12 +4147,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4120,12 +4165,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4143,107 +4189,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Prótacal"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Braith go hUathoibríoch"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Mód"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4251,12 +4297,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4265,12 +4311,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Teastas"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4280,12 +4326,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4295,12 +4341,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4318,50 +4364,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4503,6 +4549,279 @@ msgstr "Nasc"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Roghnaigh an cláréadan ghréasán"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Roghnaigh an cláréadan ghréasán"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Riaraigh ceangail"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Gaireas: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Cumraíocht IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Freastalaithe DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Fearannas NIS"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "Ar bith"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statach"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Cruthaigh an diosca "
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, fuzzy, c-format
+msgid "Connection speed"
+msgstr "Athraigh cineál ranna"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, fuzzy, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Ainm Nasc"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Uimhir fón"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Stáisiún Idirlíon"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Cumraigh nasc ghréasán"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Úsáid comhad glais"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+# KW
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Cuáit"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Luchóg"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ na Carta"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Cuimhne Charta (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "I/A Carta"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "I/A_0 Carta"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Prótacal Eorpach (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Díoltóir"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Ainm Modúl"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Seoladh IP"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "GN"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Inneal Geata:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Comhéadan:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Nasc na hIdirlíon agus cumraíocht"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "ÓstAinm (roghnach)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Cead Freastalaí DNS (roghnach)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Dara Freastalaí DNS (roghnach)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Tríú freastalaí DNS (roghnach)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Nasc na hIdirlíon agus cumraíocht"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Rochtain Idirlín"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Cineál naisc: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Stádas:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, fuzzy, c-format
+msgid "Testing your connection..."
+msgstr "Cumraigh nasc ghréasán"
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Paraiméadair"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4694,11 +5013,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Printéir áitiúl"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Gaireas: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4921,6 +5235,103 @@ msgstr "Suiteáil Tiománaí Nua"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Bainisteoir Seirbhíse"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Scríos Printéir"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "An mian leat an gné seo a úsáid?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Sonraí"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Ceangaltáin"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Cláréadan Gréasán: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Cineál: "
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Prótacal: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Seoladh IP:\t%s\n"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Teip ag leámh óstainm: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Bainisteoir Seirbhíse"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Poirt: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Poirt: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Déan neamhaird de"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Scríos Printéir"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Cumraigh nasc ghréasán"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Cuimhnigh an focal faire seo"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4964,18 +5375,6 @@ msgstr "Carta ISDN inmheánamach"
 msgid "Protocol for the rest of the world"
 msgstr "Trialaigh an cumraíocht"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Prótacal Eorpach (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5024,11 +5423,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, fuzzy, c-format
-msgid "Testing your connection..."
-msgstr "Cumraigh nasc ghréasán"
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5049,11 +5443,6 @@ msgstr "Uimhir fón"
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Uimhir fón"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5064,41 +5453,6 @@ msgstr "Roghanna Printéir"
 msgid "Provider DNS 2 (optional)"
 msgstr "Roghanna Printéir"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:353
-#, fuzzy, c-format
-msgid "Connection speed"
-msgstr "Athraigh cineál ranna"
-
-#: ../lib/network/netconnect.pm:354
-#, fuzzy, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Ainm Nasc"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ na Carta"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Cuimhne Charta (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "I/A Carta"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "I/A_0 Carta"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5253,16 +5607,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Ainm Fearannas"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Cead Freastalaí DNS (roghnach)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Dara Freastalaí DNS (roghnach)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5535,11 +5879,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5949,9 +6288,6 @@ msgstr ""
 #~ msgid "Clone"
 #~ msgstr "Clón"
 
-#~ msgid "Connection type: "
-#~ msgstr "Cineál naisc: "
-
 #~ msgid "disable"
 #~ msgstr "díchumasaigh"
 
@@ -6009,9 +6345,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "cuir i Leataobh"
 
-#~ msgid "none"
-#~ msgstr "Ar bith"
-
 #~ msgid "transport"
 #~ msgstr "iompar"
 
@@ -6027,148 +6360,6 @@ msgstr ""
 #~ msgid "unique"
 #~ msgstr "uathúil"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Bainisteoir Seirbhíse"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Scríos Printéir"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "An mian leat an gné seo a úsáid?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Sonraí"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Ceangaltáin"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Cláréadan Gréasán: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Cineál: "
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Prótacal: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Seoladh IP:\t%s\n"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Teip ag leámh óstainm: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Bainisteoir Seirbhíse"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Poirt: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Déan neamhaird de"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Scríos Printéir"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Cumraigh nasc ghréasán"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Cuimhnigh an focal faire seo"
-
-#~ msgid "Gateway:"
-#~ msgstr "Inneal Geata:"
-
-#~ msgid "Interface:"
-#~ msgstr "Comhéadan:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Riaraigh ceangail"
-
-#~ msgid "IP configuration"
-#~ msgstr "Cumraíocht IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Freastalaithe DNS"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "Fearannas NIS"
-
-#~ msgid "static"
-#~ msgstr "statach"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#, fuzzy
-#~ msgid "Start at boot"
-#~ msgstr "Cruthaigh an diosca "
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>S"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Stáisiún Idirlíon"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Cumraigh nasc ghréasán"
-
-#~ msgid "Use lock file"
-#~ msgstr "Úsáid comhad glais"
-
-# KW
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Cuáit"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Luchóg"
-
-#~ msgid "Vendor"
-#~ msgstr "Díoltóir"
-
-#~ msgid "Module name"
-#~ msgstr "Ainm Modúl"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "Seoladh IP"
-
-#~ msgid "Bus"
-#~ msgstr "GN"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Roghnaigh an cláréadan ghréasán"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Dínasc..."
 
@@ -6176,29 +6367,6 @@ msgstr ""
 #~ msgstr "Nasc..."
 
 #, fuzzy
-#~ msgid "Internet connection configuration"
-#~ msgstr "Nasc na hIdirlíon agus cumraíocht"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "ÓstAinm (roghnach)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Tríú freastalaí DNS (roghnach)"
-
-#, fuzzy
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Nasc na hIdirlíon agus cumraíocht"
-
-#~ msgid "Internet access"
-#~ msgstr "Rochtain Idirlín"
-
-#~ msgid "Status:"
-#~ msgstr "Stádas:"
-
-#~ msgid "Parameters"
-#~ msgstr "Paraiméadair"
-
-#, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Sonraí"
 
diff --git a/po/gl.po b/po/gl.po
index e497783..1106a04 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools-gl\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-05 17:41+0200\n"
 "Last-Translator: Alejo Pacín Jul <alejopj@gmail.com>\n"
 "Language-Team: Galician <mageia-i18n@mandrivalinux.org>\n"
@@ -31,14 +31,16 @@ msgid "Interface"
 msgstr "Interface"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Enderezo IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocolo"
@@ -74,23 +76,27 @@ msgid "Configure Local Area Network..."
 msgstr "Configura-la Rede de Área Local..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Axuda"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Aplicar"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Aceptar"
@@ -100,7 +106,8 @@ msgstr "Aceptar"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -109,7 +116,7 @@ msgstr "Aceptar"
 msgid "Please wait"
 msgstr "Por favor, agarde"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Por Favor, Agarde... Aplicando a configuración"
@@ -145,6 +152,7 @@ msgstr "Adaptador %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Máscara de rede"
@@ -160,6 +168,7 @@ msgid "Started on boot"
 msgstr "Iniciado ó arrincar"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Cliente DHCP"
@@ -175,17 +184,19 @@ msgstr ""
 "Centro de Control de Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configurar unha nova interface de rede (LAN, RDSI, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Sen IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Sen Máscara"
@@ -256,12 +267,12 @@ msgstr ""
 "\n"
 "¿Qué desexa facer?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Activar"
@@ -277,8 +288,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "Seleccione a interface de rede que está conectada directamente á Internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Dispositivo de Rede"
@@ -345,7 +356,11 @@ msgstr "Nome do dominio interno"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -640,13 +655,14 @@ msgstr "Enderezos permitidos"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Cortalumes Interactivo"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Non se puido contactar co daemon"
@@ -656,12 +672,12 @@ msgstr "Non se puido contactar co daemon"
 msgid "Log"
 msgstr "Rexistro"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Bloquear"
@@ -688,12 +704,12 @@ msgstr "Servizos bloqueados"
 msgid "Clear logs"
 msgstr "Borrar os rexistros"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Lista branca"
@@ -841,7 +857,7 @@ msgstr "Modo"
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descrición"
@@ -883,9 +899,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Advertencia"
@@ -2394,12 +2410,12 @@ msgstr ""
 "Advertencia, detectouse outra conexión á Internet, que pode estar usando a "
 "súa rede"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Non conectado"
@@ -2464,7 +2480,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Métrico"
@@ -2504,19 +2520,22 @@ msgstr "Cable módem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Usar BPALogin (necesario para Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autenticación"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Login da conta (nome de usuario)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Contrasinal da conta"
@@ -2644,13 +2663,15 @@ msgstr ""
 "Cada valor ten que ser introducido coma un enderezo IP en\n"
 "notación decimal con puntos (por exemplo, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Pasarela"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Conseguir servidores DNS dende DHCP"
@@ -2676,21 +2697,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Tempo de espera de DHCP (en segundos)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Conseguir servidores YP dende DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Conseguir servidores NTPD dende DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nome de máquina DHCP"
@@ -2701,11 +2726,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Os enderezos IP deben ter o formato 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "A máscara de rede debe ter o formato 255.255.224.0"
@@ -2724,6 +2751,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Asignar o nome de máquina dende o enderezo DHCP"
@@ -2745,6 +2773,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Conexión en quente da rede"
@@ -2813,27 +2842,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Baseado nun script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Baseado nun terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3992,90 +4026,93 @@ msgstr "Clave WPA Pre-Compartida"
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Driver de Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Configuración de redes sen fíos"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Modo Operativo"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Mestre"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repetidor"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secundario"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nome de rede (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Modo de cifrado"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Clave de cifrado"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Contrasinal"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4083,12 +4120,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Contrasinal EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4107,12 +4144,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Nome do certificado"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4121,32 +4158,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID da rede"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frecuencia operativa"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Limiar de sensibilidade"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4160,17 +4202,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentación"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Argumentos extra do comando iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4186,12 +4230,13 @@ msgstr ""
 "Mire a páxina do manual de iwconfig(8) para obter información adicional."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Argumentos extra do comando iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4211,12 +4256,13 @@ msgstr ""
 "\n"
 "Mire a páxina man iwpspy(8) para obter información adicional."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Argumentos extra do comando iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4244,107 +4290,107 @@ msgstr ""
 "\n"
 "Consulte a páxina man de iwpriv(8) para obter máis información."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protocolo EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Detectar Automaticamente"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4352,12 +4398,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4366,12 +4412,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4381,12 +4427,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4396,12 +4442,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4419,19 +4465,19 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Requírese unha clave de cifrado."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4440,7 +4486,7 @@ msgstr ""
 "A clave WEP debe ter como moito %d caracteres ASCII ou %d caracteres "
 "hexadecimais."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4449,7 +4495,7 @@ msgstr ""
 "Freq debe ter o sufixo k, M ou G (por exemplo, \"2.46G\" para unha "
 "frecuencia de 2.46 GHz), ou engada suficientes '0' (ceros)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4458,17 +4504,17 @@ msgstr ""
 "Rate debe ter o sufixo k, M ou G (por exemplo, \"11M\" para 11M), ou engada "
 "suficientes '0' (ceros)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Asociado á rede sen fíos \"%s\" na interface %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Perdeuse a asociación á rede sen fíos na interface %s"
@@ -4614,6 +4660,288 @@ msgstr "Conectar"
 msgid "Hostname changed to \"%s\""
 msgstr "O nome de máquina cambiou a \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Non se detectou ningún adaptador de rede ethernet no seu sistema. Execute a "
+"ferramenta de configuración de hardware."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Eliminar unha interface de rede"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Seleccione a interface de rede a configurar:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreu un erro mentres se eliminaba a interface de rede \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Noraboa, a interface de rede \"%s\" eliminouse con éxito"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Xestiona-las conexións"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Dispositivo: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Configuración do IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Servidores DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Buscar Dominio"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ningún"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "estático"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Iniciar ó arrincar"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Modo de marcación"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Velocidade da conexión"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Tempo de espera de conexión (en seg)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Número de teléfono do provedor"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>G"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Fin de liña"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Tempo de espera do módem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Usar ficheiro lock"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Saír"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Son do módem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ da tarxeta"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memoria da tarxeta (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "E/S da tarxeta"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "E/S_0 da tarxeta"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocolo europeo (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocolo para o resto do mundo\n"
+"Sen canle-D (liñas dedicadas)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Vendedor"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Clase de soporte"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Nome do módulo"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Enderezo Mac"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Localización no bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "O enderezo da pasarela debe estar no formato 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Pasarela:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interface:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Configuración da conexión á Internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Non ten configurada ningunha conexión á Internet.\n"
+"Execute o asistente \"%s\" dende o\n"
+"Centro de Control de Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Nome da máquina (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primeiro Servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Segundo Servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Terceiro Servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configuración da Conexión á Internet"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Acceso á Internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tipo de conexión: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Estado:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Probando a conexión..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parámetros"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4820,11 +5148,6 @@ msgstr "Usar Cortalumes Interactivo"
 msgid "No device found"
 msgstr "Non se atoparon dispositivos"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Dispositivo: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5051,6 +5374,103 @@ msgstr "Instalar un novo driver"
 msgid "Select a device:"
 msgstr "Seleccione un dispositivo:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Ataque a servicios"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Cortalumes Interactivo: detectouse unha intrusión"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Que desexa facer con este atacante?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Detalles do ataque"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Hora do ataque: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Interface de rede: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Tipo de ataque: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protocolo: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Enderezo IP do atacante: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Nome de máquina do atacante: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Servicio atacado: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Porto atacado: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Tipo de ataque ICMP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignorar"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Cortalumes Interactivo: novo servizo"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, c-format
+msgid "Process connection"
+msgstr "Procesar conexión"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Desexa abrir este servizo?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Lembrar esta resposta"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5094,20 +5514,6 @@ msgstr "Tarxeta RDSI interna"
 msgid "Protocol for the rest of the world"
 msgstr "Protocolo para o resto do mundo"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocolo europeo (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocolo para o resto do mundo\n"
-"Sen canle-D (liñas dedicadas)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5158,11 +5564,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Control de conexión"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Probando a conexión..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5183,11 +5584,6 @@ msgstr "O seu número de teléfono persoal"
 msgid "Provider name (ex provider.net)"
 msgstr "Nome do provedor (p.ex provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Número de teléfono do provedor"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5198,41 +5594,6 @@ msgstr "DNS 1 do provedor (opcional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 do provedor (opcional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Modo de marcación"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Velocidade da conexión"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Tempo de espera de conexión (en seg)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ da tarxeta"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memoria da tarxeta (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "E/S da tarxeta"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "E/S_0 da tarxeta"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5400,16 +5761,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nome de dominio"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primeiro Servidor DNS (opcional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Segundo Servidor DNS (opcional)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5720,11 +6071,6 @@ msgstr "Por último tamén pode introducir os enderezos IP do seu servidor DNS."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "O enderezo do servidor DNS debe estar no formato 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "O enderezo da pasarela debe estar no formato 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6196,16 +6542,6 @@ msgstr "Usar porto UDP específico"
 #~ "\n"
 #~ "Vaise configura-la Rede de Área Local usando ese adaptador."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Non se detectou ningún adaptador de rede ethernet no seu sistema. Execute "
-#~ "a ferramenta de configuración de hardware."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tipo de conexión: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s xa se está usando\n"
 
@@ -6762,9 +7098,6 @@ msgstr "Usar porto UDP específico"
 #~ msgid "discard"
 #~ msgstr "descartar"
 
-#~ msgid "none"
-#~ msgstr "ningún"
-
 #~ msgid "tunnel"
 #~ msgstr "túnel"
 
@@ -6793,166 +7126,12 @@ msgstr "Usar porto UDP específico"
 #~ msgstr ""
 #~ "Cómpre que saia do sistema e volva entrar para que os cambios teñan efecto"
 
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Cortalumes Interactivo: detectouse unha intrusión"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Que desexa facer con este atacante?"
-
-#~ msgid "Attack details"
-#~ msgstr "Detalles do ataque"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Hora do ataque: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Interface de rede: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Tipo de ataque: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protocolo: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Enderezo IP do atacante: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Nome de máquina do atacante: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Servicio atacado: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Porto atacado: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Tipo de ataque ICMP: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorar"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Cortalumes Interactivo: novo servizo"
-
-#~ msgid "Process connection"
-#~ msgstr "Procesar conexión"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Desexa abrir este servizo?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Lembrar esta resposta"
-
-#~ msgid "Gateway:"
-#~ msgstr "Pasarela:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interface:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Xestiona-las conexións"
-
-#~ msgid "IP configuration"
-#~ msgstr "Configuración do IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Servidores DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "Buscar Dominio"
-
-#~ msgid "static"
-#~ msgstr "estático"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Iniciar ó arrincar"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>G"
-
-#~ msgid "Line termination"
-#~ msgstr "Fin de liña"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Tempo de espera do módem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Usar ficheiro lock"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Saír"
-
-#~ msgid "Modem sound"
-#~ msgstr "Son do módem"
-
-#~ msgid "Vendor"
-#~ msgstr "Vendedor"
-
-#~ msgid "Media class"
-#~ msgstr "Clase de soporte"
-
-#~ msgid "Module name"
-#~ msgstr "Nome do módulo"
-
-#~ msgid "Mac Address"
-#~ msgstr "Enderezo Mac"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Localización no bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Eliminar unha interface de rede"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ocorreu un erro mentres se eliminaba a interface de rede \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Noraboa, a interface de rede \"%s\" eliminouse con éxito"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Desconectar..."
 
 #~ msgid "Connect..."
 #~ msgstr "Conectar..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Configuración da conexión á Internet"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Nome da máquina (opcional)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Terceiro Servidor DNS (opcional)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Configuración da Conexión á Internet"
-
-#~ msgid "Internet access"
-#~ msgstr "Acceso á Internet"
-
-#~ msgid "Status:"
-#~ msgstr "Estado:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parámetros"
-
 #~ msgid "Attacker"
 #~ msgstr "Atacante"
 
diff --git a/po/he.po b/po/he.po
index 76fb5ac..5ab0906 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2008-03-24 03:26+0200\n"
 "Last-Translator: Dotan Kamber <kamberd@yahoo.com>\n"
 "Language-Team: Hebrew\n"
@@ -35,14 +35,16 @@ msgid "Interface"
 msgstr "ממשק"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "כתובת IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "פרוטוקול"
@@ -78,23 +80,27 @@ msgid "Configure Local Area Network..."
 msgstr "הגדרת רשת מקומית..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "עזרה"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "החל"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "ביטול"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "אישור"
@@ -104,7 +110,8 @@ msgstr "אישור"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -113,7 +120,7 @@ msgstr "אישור"
 msgid "Please wait"
 msgstr "נא להמתין"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "נא להמתין... מיישם את ההגדרות"
@@ -149,6 +156,7 @@ msgstr "מתאם %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "מיסוך רשת"
@@ -164,6 +172,7 @@ msgid "Started on boot"
 msgstr "מופעל באתחול"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "לקוח DHCP"
@@ -178,17 +187,19 @@ msgstr ""
 "יש להפעיל את האשף \"%s\" ממרכז הבקרה של מנדריבה לינוקס"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "הגדרת ממשק רשת חדש (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "אין IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "אין מסכה"
@@ -257,12 +268,12 @@ msgstr ""
 "\n"
 "מה ברצונך לעשות?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "נטרל"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "אפשר"
@@ -277,8 +288,8 @@ msgstr "הגדרה מחדש"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "נא לבחור את התקן הרשת המחובר ישירות אל האינטרנט."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "התקן רשת"
@@ -344,7 +355,11 @@ msgstr "שם המתחם הפנימי"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -635,13 +650,14 @@ msgstr "כתובות מותרות"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "חומת אש אינטראקטיבית"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "לא יכול להתחבר לתכנת הרקע"
@@ -651,12 +667,12 @@ msgstr "לא יכול להתחבר לתכנת הרקע"
 msgid "Log"
 msgstr "רישום"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "התר"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "חסום"
@@ -683,12 +699,12 @@ msgstr "שירותים חסומים"
 msgid "Clear logs"
 msgstr "נקה דו\"חות"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "רשימה שחורה"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "רשימה לבנה"
@@ -836,7 +852,7 @@ msgstr "אופן"
 msgid "Enabled"
 msgstr "אפשר"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, fuzzy, c-format
 msgid "Description"
 msgstr "כיוון"
@@ -878,9 +894,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "אזהרה"
@@ -2417,12 +2433,12 @@ msgid ""
 "network"
 msgstr "אזהרה, חיבור אינטרנט אחר זוהה, אולי משתמש ברשת שלך"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "לא מחובר"
@@ -2487,7 +2503,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "מטרי"
@@ -2527,19 +2543,22 @@ msgstr "מודם כבלים"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "שימוש ב-BPALogin (משמש את Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "אימות"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "שם משתמש (כניסה לחשבון)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "סיסמת חשבון"
@@ -2664,13 +2683,15 @@ msgstr ""
 "על כל פריט להיות מוזן ככתובת IP עם שדות עשרוניים מופרדים\n"
 "בנקודות (לדוגמה - 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "שער"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "קבלת שרתי DNS משרות DHCP"
@@ -2696,21 +2717,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "ברירת המחדל תגדיר את מתחם החיפוש על פי שם מחשב המתאים לכך"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "תפוגת חוזה DHCP (בשניות)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "השג רשימת שרתי YP בעזרת DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "השג רשימת שרתי NTPD דרך DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "שם מארח DHCP"
@@ -2721,11 +2746,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "אל תפול להגדרת Zeroconf (רשת 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "כתובת IP צריכה להראות ככה 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "התחביר להגדרת Netmask הוא 255.255.224.0"
@@ -2744,6 +2771,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "הקצאת שם מחשב לפי כתובת DHCP"
@@ -2765,6 +2793,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "חיבור \"חם\" לרשת"
@@ -2833,27 +2862,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "מודם טלפון אנאלוגי (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "מבוסס תסריט (סקריפט)"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "מבוסס-מסוף"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4012,12 +4046,12 @@ msgstr "WPA/WPA2 Pre-Shared Key"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "הנע התקן של וינדוז"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4025,78 +4059,81 @@ msgid ""
 msgstr ""
 "פעולת כרטיס האלחוט שלך מבוטלת, נא להפעיל את מתג האלחוט (מתג ה-RF kill) תחילה."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "הגדרות אלחוט"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "אופן פעולה"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "לפי הצורך"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "מנוהל"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "ראשי"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "משחזר"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "משני"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "אוטומטי"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "שם הרשת (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "אופן הצפנה"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "מפתח הצפנה"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "סיסמה"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "משתמש EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4107,12 +4144,12 @@ msgstr ""
 "נסה את התחביר שלא נבדק -\n"
 "  מתחם\\שם משתמש"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "ססמת EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4131,12 +4168,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "אישור לקוח EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4149,32 +4186,37 @@ msgstr ""
 "שם משתמש/ססמה.\n"
 "לתשומת לבך: הגדרות קשורות נוספות מוצגות בדף המתקדם."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "זיהוי רשת"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "תדירות פעולה"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "סף רגישות"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "קצב סיביות - סל\"ש"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, fuzzy, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4194,17 +4236,19 @@ msgstr ""
 "לגודל החבילה המרבי מבטל את הסכמה. באפשרותך גם לכוון ערך זה לנקבע אוטומטית או "
 "לכבוי."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "פיצוליות"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "משתנים נוספים עבור פקודת lwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4220,12 +4264,13 @@ msgstr ""
 "מידע נוסף בנושא זה ניתן למצוא בדף ההסבר iwconfig(8) man page."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "משתנים נוספים עבור פקודת lwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4244,12 +4289,13 @@ msgstr ""
 "\n"
 "מידע נוסף בנושא זה ניתן למצוא בדף ההסבר iwpspy(8) man page."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "משתנים נוספים עבור פקודת lwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4276,28 +4322,28 @@ msgstr ""
 "\n"
 "מידע נוסף בנושא זה ניתן למצוא בדף ההסבר iwpriv(8) man page."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "פרוטוקול EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "זיהוי אוטומטי"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4306,67 +4352,67 @@ msgstr ""
 "זיהוי אוטומטי מומלץ היות והוא מנסה ראשית WPA מגרסה 2 עם\n"
 "נפילה ל-WPA מגרסה 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "מצב EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4375,12 +4421,12 @@ msgstr ""
 "רשימת פרוטוקולים מקובלים לניהול מפתחות הזדהות.\n"
 "הערכים האפשריים הם WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "זהות EAP חיצונית"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4391,12 +4437,12 @@ msgstr ""
 "בלתי מוצפנת עם סוגי EAP התומכים בזהות מוצנרת\n"
 "שונה, לדוגמה TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4405,12 +4451,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "אישור CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4424,12 +4470,12 @@ msgstr ""
 "נכללים, אישור השרת לא יאומת. אם ניתן, יש תמיד להגדיר\n"
 "אישור CA מוכר בשימוש עם TLS, TTLS או PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "התאמת נושא אישור EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4439,12 +4485,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, fuzzy, c-format
 msgid "Extra directives"
 msgstr "הנחיות EAP נוספות"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4462,26 +4508,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "דרוש מפתח הצפנה."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4490,7 +4536,7 @@ msgstr ""
 "באפשרותך להגדיר תדירות עם הסיומת k, M או G (למשל \"2.46G\" עבור תדירות 2.46 "
 "GHz). לחלופין עליך לרפד את המספר עם מספיק אפסים."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4499,17 +4545,17 @@ msgstr ""
 "על הקצב להיות בעל הסיומת k, M או G (למשל \"11M\" עבור קצב של 11M). לחלופין "
 "ניתן להוסיף את מספר האפסים המתאים."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "אפשר גישה לנקודת הגישה ממיקום בחו\"ל (roaming)"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "מקושר לרשת האלחוטית \"%s\" בהתקן %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "אבד הקישור לרשת האלחוטית בהתקן %s"
@@ -4656,6 +4702,287 @@ msgstr "התחבר"
 msgid "Hostname changed to \"%s\""
 msgstr "שם המארח שונה ל-\"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr "לא נמצא מתאם רשת במערכת שלך, נא להריץ את אשף תצורת החומרה."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "ממשק רשת"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "נא לבחור את מנשק הרשת שברצונך להגדיר:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"קרתה תקלה בעת ניסיון להפעיל מחדש את הרשת: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"ברכותינו! הגדרת הרשת והאינטרנט הסתיימה.\n"
+"\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "ניהול חיבורי VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "התקן: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "תצורת VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "שרת DNS ראשון"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "חיפוש מתחם"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "כלום"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "אוטומטי"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "מופעל באתחול"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "שיטת חיוג"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "מהירות חיבור"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "תפוגת חיבור (בשניות)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "מספר הטלפון של הספק"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "חיבור מודם"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "בחירת קובץ"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "כווית"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "מודם"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "פסיקת IRQ של הכרטיס"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "כרטיס זכרון (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "קלט פלט של הכרטיס"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "ערך IO_0 של הכרטיס"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "פרוטוקול אירופאי (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"פרוטוקול לשאר העולם\n"
+"ללא ערוץ D (קווים חכורים)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "אופן"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "כתובת אמיתית"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "שימוש"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "התחביר להגדרת כתובת שער הוא 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "שער"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "ממשק"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "לא הוגדר חיבור לאינטרנט"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"החיבור לאינטרנט לא הוגדר עדיין.\n"
+"נא להפעיל את האשף \"%s\" ממרכז הבקרה של מנדריבה לינוקס"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "שרת DNS ראשון (לא חובה)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "שרת DNS ראשון (לא חובה)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "שרת DNS שני (לא חובה)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "שרת DNS ראשון (לא חובה)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "הגדרת חיבור"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "גישה למדפסת"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "סוג חיבור: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "מצב"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "בודק את החיבור שלך..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "מאפייני IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4861,11 +5188,6 @@ msgstr "השתמש בחומת אש אינטראקטיבית"
 msgid "No device found"
 msgstr "לא נמצאו התקנים"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "התקן: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5094,6 +5416,103 @@ msgstr "התקנת מנהל התקן חדש"
 msgid "Select a device:"
 msgstr "נא לבחור התקן:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr "עיבוד התקפה"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "חומת אש אינטראקטיבית: זוהתה חדירה"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "מה ברצונך לעשות עם מתקיף זה?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "מידע אודות ההתקפה"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "משך ההתקפה: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "ממשקי רשת: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "סוג ההתקפה: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "פרוטוקול: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "כתובת ה-IP של התוקף: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "שם המחשב של התוקף %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "סוג שירות המותקף: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "הערוץ המותקף: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "סוג התקפת ICMP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "חסום באופן תמידי (אל תשאל שנית)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "התעלם"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "חומת אש אינטראקטיבית: שירות חדש"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, c-format
+msgid "Process connection"
+msgstr "עיבוד חיבור"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "האם ברצונך לפתוח שירות זה?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "זכור תשובה זאת"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5137,20 +5556,6 @@ msgstr "מודם ISDN פנימי"
 msgid "Protocol for the rest of the world"
 msgstr "פרוטוקול לשאר העולם"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "פרוטוקול אירופאי (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"פרוטוקול לשאר העולם\n"
-"ללא ערוץ D (קווים חכורים)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5201,11 +5606,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "בקרת חיבור"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "בודק את החיבור שלך..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5226,11 +5626,6 @@ msgstr "מספר הטלפון הפרטי שלך"
 msgid "Provider name (ex provider.net)"
 msgstr "שם הספק (לדוגמה provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "מספר הטלפון של הספק"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5241,41 +5636,6 @@ msgstr "שרת DNS ראשון של ספק השירות (לא חובה)"
 msgid "Provider DNS 2 (optional)"
 msgstr "שרת DNS משני של ספק השירות (לא חובה)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "שיטת חיוג"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "מהירות חיבור"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "תפוגת חיבור (בשניות)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "פסיקת IRQ של הכרטיס"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "כרטיס זכרון (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "קלט פלט של הכרטיס"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "ערך IO_0 של הכרטיס"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5439,16 +5799,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "שם מתחם"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "שרת DNS ראשון (לא חובה)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "שרת DNS שני (לא חובה)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5756,11 +6106,6 @@ msgstr "לסיום באפשרותך להגדיר גם את כתובות ה-IP ש
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "התחביר להגדרת כתובת שרת DNS הוא 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "התחביר להגדרת כתובת שער הוא 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6228,14 +6573,6 @@ msgstr "השתמש בשער UDP מסוים"
 #~ "\n"
 #~ "הרשת המקומית עומדת להיות מוגדרת עם מתאם זה."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr "לא נמצא מתאם רשת במערכת שלך, נא להריץ את אשף תצורת החומרה."
-
-#~ msgid "Connection type: "
-#~ msgstr "סוג חיבור: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s כבר בשימוש \n"
 
@@ -7217,9 +7554,6 @@ msgstr "השתמש בשער UDP מסוים"
 #~ msgid "discard"
 #~ msgstr "היפטר"
 
-#~ msgid "none"
-#~ msgstr "כלום"
-
 #~ msgid "tunnel"
 #~ msgstr "ערוץ"
 
@@ -7238,68 +7572,8 @@ msgstr "השתמש בשער UDP מסוים"
 #~ msgid "default"
 #~ msgstr "ברירת מחדל"
 
-#~ msgid "use"
-#~ msgstr "שימוש"
-
 #~ msgid "unique"
 #~ msgstr "ייחודי"
 
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "עליך לצאת ולהיכנס חזרה כדי שהשינויים יכנסו לתוקפם"
-
-#~ msgid "Process attack"
-#~ msgstr "עיבוד התקפה"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "חומת אש אינטראקטיבית: זוהתה חדירה"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "מה ברצונך לעשות עם מתקיף זה?"
-
-#~ msgid "Attack details"
-#~ msgstr "מידע אודות ההתקפה"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "משך ההתקפה: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "ממשקי רשת: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "סוג ההתקפה: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "פרוטוקול: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "כתובת ה-IP של התוקף: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "שם המחשב של התוקף %s: "
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "סוג שירות המותקף: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "הערוץ המותקף: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "סוג התקפת ICMP: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "חסום באופן תמידי (אל תשאל שנית)"
-
-#~ msgid "Ignore"
-#~ msgstr "התעלם"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "חומת אש אינטראקטיבית: שירות חדש"
-
-#~ msgid "Process connection"
-#~ msgstr "עיבוד חיבור"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "האם ברצונך לפתוח שירות זה?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "זכור תשובה זאת"
diff --git a/po/hi.po b/po/hi.po
index 378a15e..8740769 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "इन्टरफ़ेस"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "आईपी पता"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "प्रोटोकॉल"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "स्थानीय नेटवर्क क्षेत्र को संरचित किया जा रहा है..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "सहायता"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "प्रयोग करें"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "निरस्त"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "ठीक"
@@ -95,7 +101,8 @@ msgstr "ठीक"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "ठीक"
 msgid "Please wait"
 msgstr "कृपया प्रतीक्षा करें"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "कृपया प्रतीक्षा करें... संरचना को लागू करें"
@@ -140,6 +147,7 @@ msgstr "ऐडाप्टर %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "नेटमास्क"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "बूट के समय आरम्भ"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "डी०एच०सी०पी० ग्राहक"
@@ -169,17 +178,19 @@ msgstr ""
 "मैनड्रिव नियंत्रण केन्द्र से \"एक इन्टरफ़ेस को जोड़े\" सहायक को चलायें"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "एक नये नेटवर्क इन्टरफ़ेस को स्थापित करें (लैन, आईएसडीएन, ऐडीएसएल, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "कोई एलपी नहीं"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "कोई मास्क नहीं"
@@ -240,12 +251,12 @@ msgstr ""
 "\n"
 "आप क्या करना चाहते है?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "निष्क्रियता"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "सक्रियता"
@@ -260,8 +271,8 @@ msgstr "पुनःसंरचना"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "नेट उपकरण"
@@ -327,7 +338,11 @@ msgstr "आंतरिक डोमेन का नाम"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -621,13 +636,14 @@ msgstr "सभी उपयोगकर्ताओं को अनुमति
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "अग्नि-भीतिका"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "%s मिरर प्रणाली से संबंध स्थापित करने में असमर्थ"
@@ -637,12 +653,12 @@ msgstr "%s मिरर प्रणाली से संबंध स्थ�
 msgid "Log"
 msgstr "लॉग"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "सभी"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -669,12 +685,12 @@ msgstr "बैक-अप उपयोगकर्ता संचिकाये
 msgid "Clear logs"
 msgstr "सभी को साफ़"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -822,7 +838,7 @@ msgstr "मोड"
 msgid "Enabled"
 msgstr "सक्रियता"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "विवरण"
@@ -864,9 +880,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "चेतावनी"
@@ -2335,12 +2351,12 @@ msgid ""
 msgstr ""
 "चेतावनी, एक अन्य इन्टरनेट संबंध को खोजा गया है, सम्भव है कि आपका नेटवर्क उपयोग कर रहा हो"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "जुड़ा हुआ"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "संबंध-विच्छेद है"
@@ -2405,7 +2421,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "मेट्रिक"
@@ -2445,19 +2461,22 @@ msgstr "कार्ड का मॉडल:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "प्रमाणीकरण"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "खाता संत्र-आरम्भ (उपयोगकर्ता का नाम)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "खाते का कूट-शब्द"
@@ -2582,13 +2601,15 @@ msgstr ""
 "प्रत्येक प्रविष्टी को एक आईपी पते की भांति डाटेड-अंकीय \n"
 "प्रारूप में बताना चाहिए (उदाहरण हेतु, १.२.३.४) । "
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "गेटवे"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "डीएनएस सर्वर आईपी"
@@ -2615,21 +2636,25 @@ msgstr ""
 "डिफ़ाल्ट के तौर पर खोज-डोमेन को एक पूर्ण-योग्यवान होस्ट नाम से स्थापित किया जायेगा"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "संबंध समय- सीमा समाप्ति (पलों में)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "डी०एच०सी०पी० होस्ट का नाम"
@@ -2640,11 +2665,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "आई०पी० पते का प्रारूप १.२.३.४ जैसा होना चाहिए"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "गेटवे पता का प्रारूप १.२.३.४ की भांति होना चाहिए"
@@ -2663,6 +2690,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "डीएचसीपी पते से होस्ट के नाम का निर्धारण"
@@ -2684,6 +2712,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "नेटवर्क हॉटप्लगिंग"
@@ -2752,27 +2781,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "स्क्रिप्ट-पर-आधारित"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "पीऐपी"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "टर्मिनल-पर-आधारित"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "सी०एच०ऐ०पी०"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "पी०ऐ०पी०/सी०एच०ऐ०पी०"
@@ -3931,90 +3965,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "बेतार सम्बंध"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "चालन विधा"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "एड-हॉक"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "प्रबंध किया गया"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "स्वामी (ंमास्टर)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "दुहरानेवाला"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "दूसरे क्रम का"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "स्वचालित"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "नेटवर्क नाम (ईएसएसआईडी)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "सांकेतिक कुँजी"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "कूट-शब्द"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "खाता संत्र-आरम्भ (उपयोगकर्ता का नाम)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4022,12 +4059,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "कूट-शब्द"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4046,12 +4083,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "प्रमाणपत्र का नाम"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4060,32 +4097,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "नेटवर्क पहचान-संख्या"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "संचालन आवृति"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "सूक्ष्म-ग्राहिता (सेन्सटीविटी) प्रवेश-मार्ग"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "बिट दर (बी/एस में)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "आरटीएस/सीटीएस"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4107,17 +4149,19 @@ msgstr ""
 "इस योजना को निष्क्रिय करता है। आप इस पैरामीटर को स्वतः, नियत\n"
 "या ऑफ़ पर स्थापित कर सकते है।"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "विखंडीकरण"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "एलडब्लूकॉन्फ़िग कॉमाण्ड के अतिरिक्त प्राचर (आरगूमेन्ट)"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4133,12 +4177,13 @@ msgstr ""
 "iwconfig(8) मैन पृष्ट को और अधिक सूचना के लिए देखें ।"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "एलडब्लूस्पाई कॉमाण्ड के अतिरिक्त प्राचर"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4157,12 +4202,13 @@ msgstr ""
 "\n"
 "iwpspy(8) मैन पृष्ट को और अधिक सूचना के लिए देखें ।"
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "एलडब्लूप्रिव कॉमाण्ड के अतिरिक्त प्राचर"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4193,107 +4239,107 @@ msgstr ""
 "\n"
 "iwpriv(8) मैन पृष्ट को और अधिक सूचना के लिए देखें ।"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "प्रोटोकॉल"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "स्वतः-खोज़ी"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "पीऐपी"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "मोड"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "पीऐपी"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "टीएलएस"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "सी०एच०ऐ०पी०"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4301,12 +4347,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4315,12 +4361,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "प्रमाणपत्र का प्रकार"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4330,12 +4376,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4345,12 +4391,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4368,26 +4414,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4396,7 +4442,7 @@ msgstr ""
 "आवॄति के पीछे k, M या G शब्द होना चाहिए (उदाहरण हेतु, \"2.46G\" २।४६ गीगाहर्टज आवॄति "
 "के लिए), या जितने अधिक हो उतने '०' (जीरों) को जोड़ें ।"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4405,17 +4451,17 @@ msgstr ""
 "दर के पीछे k, M या G शब्द होना चाहिए (उदाहरण हेतु, \"11M\" ११एम के लिए), या जितने "
 "अधिक हो उतने '०' (जीरों) को जोड़ें ।"
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4561,6 +4607,287 @@ msgstr "कनेक्ट"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"आपके तंत्र पर कोई ईथरनेट ऐडाप्टर नहीं पहचाना जा सका । कृपया हार्डवेयर संरचना टूल को "
+"चलायें ।"
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "एक नेटवर्क इन्टरफ़ेस को हटायें"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "संरचित करने हेतु नेटवर्क इन्टरफ़ेस का चयन करें:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"\"%s\" नेटवर्क इन्टरफ़ेस को हटाने के दौरान एक त्रुटि उत्पन्न हो गई है: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "बधाई, \"%s\" नेटवर्क इन्टरफ़ेस को सफ़लतापूर्वक हटाया गया"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "कनेक्शनों का प्रबंधन"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "उपकरण:"
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "कप्स संरचना"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "डीएनएस के सर्वर"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "डोमेन जिसमें खोज़ की जाने वाली है"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "कुछ भी नहीं"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "स्थिर"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "बूट के समय आरम्भ"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "दूरभाष नम्बर मिलाने की विधा"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "संबंध गति"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "संबंध समय- सीमा समाप्ति (पलों में)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "प्रदानकर्ता की दूरभाष संख्या"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "बहाव नियंत्रण"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "लाइन का खात्मा"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "मॉडम की समय-सीमा समाप्त"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "लॉक संचिका का उपयोग"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "डायल करने के पूर्व डायल-अप टोन की प्रतीक्षा करना"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "व्यस्ता प्रतीक्षा"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "मॉडम की ध्वनि"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "कार्ड आई०आर०क्यू०"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "कार्ड मेम्म (डी०एम०ऐ०)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "कार्ड आई०ओ०"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "कार्ड IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "यूरोपियन प्रोटोकॉल (ई०डी०एस०एस०-१)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"बचे हुए संसार के लिए प्रोटोकॉल\n"
+"कोई डी-चैनल (लीस्ड लाइनें)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "विक्रेता"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "माध्यम का वर्ग"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "मॉडूयल का नाम"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "मैक पता"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "बस"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "बस पर स्थान"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "गेटवे पता का प्रारूप १.२.३.४ की भांति होना चाहिए"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "गेटवे:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "इन्टरफ़ेस:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "इन्टरनेट संबंध संरचना"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"इस इन्टरफ़ेस को अभी तक संरचित नहीं किया गया है ।\n"
+"मैनड्रिव नियंत्रण केन्द्र से \"%s\" सहायक को चलायें"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "होस्ट का नाम (वैकल्पिक)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "प्रथम डीएनएस सर्वर (वैकल्पिक)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "द्वितीय डी०एन०एस० सर्वर (वैकल्पिक)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "तॄतीय डीएनएस सर्वर (वैकल्पिक)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "इन्टरनेट संबंध संरचना"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "इन्टरनेट पहुँच"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "संबंध प्रकार: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "अवस्था:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "आपके संबंध का परीक्षण किया जा रहा है..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "पैरामीटर"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4763,11 +5090,6 @@ msgstr ""
 msgid "No device found"
 msgstr "कोई उपकरण नहीं मिला"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "उपकरण:"
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4990,6 +5312,103 @@ msgstr "आंतरिक विपत्र सर्वर"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "सेवा प्रबंधक"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "अग्नि-भीतिका संरचना खोजी गयी है !"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "कया आप खेल समाप्त करना चाहेंगे ?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "कोई विवरण नहीं"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "क्रिया: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "नेटवर्क इन्टरेफ़ेसेस्स"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "एक्सेस (पहुंचने) का तरीका : %s \n"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "प्रोटोकॉल्स"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "कम्प्यूटर का आईपी पता:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "%s होस्ट नाम की की स्थापना की जा रही है: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "सेवा प्रबंधक"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "पोर्ट: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "पोर्ट: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "ध्यान ना दें"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "अग्नि-भीतिका संरचना खोजी गयी है !"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "बेतार सम्बंध"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "क्या आप इस संरचना का परीक्षण करना चाहते है?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "इस कूट-शब्द को याद रखें"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5033,20 +5452,6 @@ msgstr "आंतरिक आईएसडीएन कार्ड"
 msgid "Protocol for the rest of the world"
 msgstr "बाकी संसार के लिए प्रोटोकॉल"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "यूरोपियन प्रोटोकॉल (ई०डी०एस०एस०-१)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"बचे हुए संसार के लिए प्रोटोकॉल\n"
-"कोई डी-चैनल (लीस्ड लाइनें)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5095,11 +5500,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "आपके संबंध का परीक्षण किया जा रहा है..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5120,11 +5520,6 @@ msgstr "आपकी व्यक्तिगत दूरभाष संख्
 msgid "Provider name (ex provider.net)"
 msgstr "प्रदानकर्ता का नाम (उदाहरण हेतु प्रोवाइडर.नेट) "
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "प्रदानकर्ता की दूरभाष संख्या"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5135,41 +5530,6 @@ msgstr "प्रदाता डीएनएस १ (वैकल्पिक)"
 msgid "Provider DNS 2 (optional)"
 msgstr "प्रदाता डीएनएस २ (वैकल्पिक)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "दूरभाष नम्बर मिलाने की विधा"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "संबंध गति"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "संबंध समय- सीमा समाप्ति (पलों में)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "कार्ड आई०आर०क्यू०"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "कार्ड मेम्म (डी०एम०ऐ०)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "कार्ड आई०ओ०"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "कार्ड IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5334,16 +5694,6 @@ msgstr "डीएनएस"
 msgid "Domain name"
 msgstr "डोमेन का नाम"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "प्रथम डीएनएस सर्वर (वैकल्पिक)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "द्वितीय डी०एन०एस० सर्वर (वैकल्पिक)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5647,11 +5997,6 @@ msgstr "अंत में कम-से-कम आप अपने डीए�
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "डी०एन०एस० सर्वर के पते का प्रारूप १.२.३.४ की भांति होना चाहिए"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "गेटवे पता का प्रारूप १.२.३.४ की भांति होना चाहिए"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6097,16 +6442,6 @@ msgstr ""
 #~ "\n"
 #~ "इस ऐडाप्टर के साथ, मै आपके स्थानीय नेटवर्क क्षेत्र को स्थापित करने जा रहा हूँ ।"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "आपके तंत्र पर कोई ईथरनेट ऐडाप्टर नहीं पहचाना जा सका । कृपया हार्डवेयर संरचना टूल को "
-#~ "चलायें ।"
-
-#~ msgid "Connection type: "
-#~ msgstr "संबंध प्रकार: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s पहिले से ही उपयोग में है\n"
 
@@ -6504,9 +6839,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "डिस्कार्ड"
 
-#~ msgid "none"
-#~ msgstr "कुछ भी नहीं"
-
 #~ msgid "tunnel"
 #~ msgstr "टनल"
 
@@ -6535,181 +6867,12 @@ msgstr ""
 #~ msgstr ""
 #~ "परिवर्तनों को प्रभाव में लाने के लिए, आपको संत्र-समाप्त करके पुन: संत्र-आरम्भ करना होगा"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "सेवा प्रबंधक"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "अग्नि-भीतिका संरचना खोजी गयी है !"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "कया आप खेल समाप्त करना चाहेंगे ?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "कोई विवरण नहीं"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "क्रिया: %s"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "नेटवर्क इन्टरेफ़ेसेस्स"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "एक्सेस (पहुंचने) का तरीका : %s \n"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "प्रोटोकॉल्स"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "कम्प्यूटर का आईपी पता:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "%s होस्ट नाम की की स्थापना की जा रही है: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "सेवा प्रबंधक"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "पोर्ट: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "ध्यान ना दें"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "अग्नि-भीतिका संरचना खोजी गयी है !"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "बेतार सम्बंध"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "क्या आप इस संरचना का परीक्षण करना चाहते है?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "इस कूट-शब्द को याद रखें"
-
-#~ msgid "Gateway:"
-#~ msgstr "गेटवे:"
-
-#~ msgid "Interface:"
-#~ msgstr "इन्टरफ़ेस:"
-
-#~ msgid "Manage connections"
-#~ msgstr "कनेक्शनों का प्रबंधन"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "कप्स संरचना"
-
-#~ msgid "DNS servers"
-#~ msgstr "डीएनएस के सर्वर"
-
-#~ msgid "Search Domain"
-#~ msgstr "डोमेन जिसमें खोज़ की जाने वाली है"
-
-#~ msgid "static"
-#~ msgstr "स्थिर"
-
-#~ msgid "Start at boot"
-#~ msgstr "बूट के समय आरम्भ"
-
-#~ msgid "Flow control"
-#~ msgstr "बहाव नियंत्रण"
-
-#~ msgid "Line termination"
-#~ msgstr "लाइन का खात्मा"
-
-#~ msgid "Modem timeout"
-#~ msgstr "मॉडम की समय-सीमा समाप्त"
-
-#~ msgid "Use lock file"
-#~ msgstr "लॉक संचिका का उपयोग"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "डायल करने के पूर्व डायल-अप टोन की प्रतीक्षा करना"
-
-#~ msgid "Busy wait"
-#~ msgstr "व्यस्ता प्रतीक्षा"
-
-#~ msgid "Modem sound"
-#~ msgstr "मॉडम की ध्वनि"
-
-#~ msgid "Vendor"
-#~ msgstr "विक्रेता"
-
-#~ msgid "Media class"
-#~ msgstr "माध्यम का वर्ग"
-
-#~ msgid "Module name"
-#~ msgstr "मॉडूयल का नाम"
-
-#~ msgid "Mac Address"
-#~ msgstr "मैक पता"
-
-#~ msgid "Bus"
-#~ msgstr "बस"
-
-#~ msgid "Location on the bus"
-#~ msgstr "बस पर स्थान"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "एक नेटवर्क इन्टरफ़ेस को हटायें"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "\"%s\" नेटवर्क इन्टरफ़ेस को हटाने के दौरान एक त्रुटि उत्पन्न हो गई है: \n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "बधाई, \"%s\" नेटवर्क इन्टरफ़ेस को सफ़लतापूर्वक हटाया गया"
-
 #~ msgid "Disconnect..."
 #~ msgstr "संबध-विच्छेद..."
 
 #~ msgid "Connect..."
 #~ msgstr "संबंध..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "इन्टरनेट संबंध संरचना"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "होस्ट का नाम (वैकल्पिक)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "तॄतीय डीएनएस सर्वर (वैकल्पिक)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "इन्टरनेट संबंध संरचना"
-
-#~ msgid "Internet access"
-#~ msgstr "इन्टरनेट पहुँच"
-
-#~ msgid "Status:"
-#~ msgstr "अवस्था:"
-
-#~ msgid "Parameters"
-#~ msgstr "पैरामीटर"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "कोई विवरण नहीं"
diff --git a/po/hr.po b/po/hr.po
index 4b58f01..3fa72fa 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2005-01-04 21:25+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "Sučelje"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adresa"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "Podesi lokalnu mrežu..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Pomoć"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Primijeni"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Odustani"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "U redu"
@@ -96,7 +102,8 @@ msgstr "U redu"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "U redu"
 msgid "Please wait"
 msgstr "Molim pričekajte"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Molimo pričekajte... Primjenjujem konfiguraciju"
@@ -141,6 +148,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Mrežna maska"
@@ -156,6 +164,7 @@ msgid "Started on boot"
 msgstr "Pokrenuto pri podizanju"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klijent"
@@ -170,17 +179,19 @@ msgstr ""
 "Pokrenite čarobnjak za postavu u glavnom prozoru"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Odaberite mrežni međusklop"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Loš paket"
@@ -247,12 +258,12 @@ msgstr ""
 "\n"
 "Što želite napraviti?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Onemogući"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Omogući"
@@ -267,8 +278,8 @@ msgstr "Ponovno namještanje"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Ispisni poslužitelj"
@@ -335,7 +346,11 @@ msgstr "Novo ime pisača"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -623,13 +638,14 @@ msgstr "Dozvoli svim korisnicima"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Vatrozid"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Ne mogu napraviti fork: %s"
@@ -639,12 +655,12 @@ msgstr "Ne mogu napraviti fork: %s"
 msgid "Log"
 msgstr "Dnevnik"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Sve"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -671,12 +687,12 @@ msgstr "Pohrani korisničke datoteke"
 msgid "Clear logs"
 msgstr "Očisti sve"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -824,7 +840,7 @@ msgstr "Način rada"
 msgid "Enabled"
 msgstr "Omogući"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Opis"
@@ -866,9 +882,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -2332,12 +2348,12 @@ msgstr ""
 "Upozorenje, otkrivena je još jedna Internet veza, koja možda koristivašu "
 "mrežu"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Spojen"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nije povezan"
@@ -2402,7 +2418,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "ograniči"
@@ -2442,19 +2458,22 @@ msgstr "Memorija kartice (DMA)"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Provjera autentičnosti"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Korisničko ime"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Korisnička Lozinka"
@@ -2579,13 +2598,15 @@ msgstr ""
 "Svaka stavka treba biti unesena kao  IP adresa odvojena\n"
 "točkama (npr. 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "IP (ovog) DHCP poslužitelja"
@@ -2611,21 +2632,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Vrijeme čekanja veze (u sek)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "Ime računala"
@@ -2636,11 +2661,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresa treba biti oblika 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "IP adresa treba biti oblika 1.2.3.4"
@@ -2659,6 +2686,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Upišite ime hosta ili IP."
@@ -2680,6 +2708,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Mrežne postavke"
@@ -2748,27 +2777,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Temeljem skripta"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal-zasnovano"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3927,90 +3961,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Bežična veze"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Ekspertni mod"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Odaberite jezik"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Pomoćni"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatski"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Enkripcijski ključ"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Lozinka"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Korisničko ime"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4018,12 +4055,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Lozinka"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4042,12 +4079,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4056,32 +4093,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Mreža"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (u b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4095,17 +4137,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Igračka radna stanica"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4116,12 +4160,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4133,12 +4178,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4156,107 +4202,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Koristi auto detekciju"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Način rada"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4264,12 +4310,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4278,12 +4324,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Tip certifikata"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4293,12 +4339,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4308,12 +4354,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4331,50 +4377,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4516,6 +4562,287 @@ msgstr "Spoji"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nije pronađen niti jedan mrežni adapter na vašem sustavu. Molimo pokrenite "
+"hardware-ski konfiguracijski alat."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Odaberite mrežni međusklop"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Odaberite mrežni međusklop"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Problem se pojavio prilikom ponovnog pokretanja mreže: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Čestitamo, \"%s\" mrežno sučelje je uspješno obrisano"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Kablovska veza"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Uređaj: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS postavke"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS poslužitelj"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS domena"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ništa"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statično"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Pokrenuto pri podizanju"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Način biranja"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Brzina"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Vrijeme čekanja veze (u sek)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telef. broj pružatelja"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Kontrola toka"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Internet stanica"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Vrijeme čekanja podizanja kernela"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Koristi datoteku za zaključavanje"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuvajt"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Miš"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ kartice"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memorija kartice (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO kartice"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 kartice"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europski protokol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol za ostatak svijeta \n"
+" bez D-kanala (za iznajmljene linije)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Proizvođač"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Media klasa "
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Ime modula"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "IP adresa"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Posl. 1"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Lokacija na sabirnici "
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "IP adresa treba biti oblika 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Pristupnik:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Međusklop:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Postava Internet veze"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Ovo sučelje još nije podešeno.\n"
+"Pokrenite čarobnjak za postavu u glavnom prozoru"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "postava upozoravanja"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Prvi DNS poslužitelj (opciono)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Drugi DNS poslužitelj (opciono)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Prvi DNS poslužitelj (opciono)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Postava Internet veze"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internet pristup"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tip veze: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Stanje:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testiram vašu vezu..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametri"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4711,11 +5038,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Nije pronađen niti jedan uređaj"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Uređaj: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4938,6 +5260,103 @@ msgstr "Instaliraj sustav"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "\tIme servera: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Detektirana je vatrozidna konfiguracija!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Želite li uključiti ljepljive tipke?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Detalji"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Priloži datoteku(e)"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Mrežni međusklop: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Tip pristupa: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP adresa:\t%s\n"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Postavljam ime računala %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "\tIme servera: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Zanemari"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Detektirana je vatrozidna konfiguracija!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Bežična veze"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Da li želite iskušati postavu ?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Zapamti ovu lozinku"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4981,20 +5400,6 @@ msgstr "Interna ISDN kartica"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol za ostatak svijeta"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europski protokol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol za ostatak svijeta \n"
-" bez D-kanala (za iznajmljene linije)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5043,11 +5448,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testiram vašu vezu..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5068,11 +5468,6 @@ msgstr "Vaš osobni telefonski broj"
 msgid "Provider name (ex provider.net)"
 msgstr "Ime ISP pružatelja (npr. provider.hr)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telef. broj pružatelja"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5083,41 +5478,6 @@ msgstr "Pružateljev DNS 1 (opciono)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Pružateljev DNS 2 (opciono)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Način biranja"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Brzina"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Vrijeme čekanja veze (u sek)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ kartice"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memorija kartice (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO kartice"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 kartice"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5279,16 +5639,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Ime domene"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Prvi DNS poslužitelj (opciono)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Drugi DNS poslužitelj (opciono)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5598,11 +5948,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "IP adresa treba biti oblika 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "IP adresa treba biti oblika 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6042,16 +6387,6 @@ msgstr ""
 #~ "\n"
 #~ "Postaviti ću lokalnu mrežu (LAN) sa tim adapterom."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Nije pronađen niti jedan mrežni adapter na vašem sustavu. Molimo "
-#~ "pokrenite hardware-ski konfiguracijski alat."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tip veze: "
-
 #~ msgid "disable"
 #~ msgstr "onemogući"
 
@@ -6133,200 +6468,18 @@ msgstr ""
 #~ msgid "Direction"
 #~ msgstr "Smjer"
 
-#~ msgid "none"
-#~ msgstr "ništa"
-
 #~ msgid "Level"
 #~ msgstr "Razina"
 
 #~ msgid "default"
 #~ msgstr "uobičajeno"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "\tIme servera: %s\n"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Detektirana je vatrozidna konfiguracija!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Želite li uključiti ljepljive tipke?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Detalji"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Priloži datoteku(e)"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Mrežni međusklop: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Tip pristupa: %s\n"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP adresa:\t%s\n"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Postavljam ime računala %s: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "\tIme servera: %s\n"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Port: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Zanemari"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Detektirana je vatrozidna konfiguracija!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Bežična veze"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Da li želite iskušati postavu ?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Zapamti ovu lozinku"
-
-#~ msgid "Gateway:"
-#~ msgstr "Pristupnik:"
-
-#~ msgid "Interface:"
-#~ msgstr "Međusklop:"
-
-#, fuzzy
-#~ msgid "Manage connections"
-#~ msgstr "Kablovska veza"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS postavke"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS poslužitelj"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS domena"
-
-#~ msgid "static"
-#~ msgstr "statično"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Pokrenuto pri podizanju"
-
-#~ msgid "Flow control"
-#~ msgstr "Kontrola toka"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Internet stanica"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Vrijeme čekanja podizanja kernela"
-
-#~ msgid "Use lock file"
-#~ msgstr "Koristi datoteku za zaključavanje"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Kuvajt"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Miš"
-
-#~ msgid "Vendor"
-#~ msgstr "Proizvođač"
-
-#~ msgid "Media class"
-#~ msgstr "Media klasa "
-
-#~ msgid "Module name"
-#~ msgstr "Ime modula"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "IP adresa"
-
-#~ msgid "Bus"
-#~ msgstr "Posl. 1"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Lokacija na sabirnici "
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Odaberite mrežni međusklop"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Problem se pojavio prilikom ponovnog pokretanja mreže: \n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Čestitamo, \"%s\" mrežno sučelje je uspješno obrisano"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Odspoji..."
 
 #~ msgid "Connect..."
 #~ msgstr "Poveži..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Postava Internet veze"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "postava upozoravanja"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Prvi DNS poslužitelj (opciono)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Postava Internet veze"
-
-#~ msgid "Internet access"
-#~ msgstr "Internet pristup"
-
-#~ msgid "Status:"
-#~ msgstr "Stanje:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametri"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Detalji"
diff --git a/po/hu.po b/po/hu.po
index 7dd2730..fce9778 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools-2010.0\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-21 10:27+0100\n"
 "Last-Translator: Gergely Lónyai <aleph@mandriva.org>\n"
 "Language-Team: Hungarian <aleph@mandriva.org>\n"
@@ -33,14 +33,16 @@ msgid "Interface"
 msgstr "Csatoló"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP cím"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
@@ -76,23 +78,27 @@ msgid "Configure Local Area Network..."
 msgstr "A helyi hálózat beállítása..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Segítség"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Alkalmazás"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Mégsem"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -102,7 +108,8 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -111,7 +118,7 @@ msgstr "OK"
 msgid "Please wait"
 msgstr "Kis türelmet..."
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Kis türelmet - a beállítások módosítása"
@@ -147,6 +154,7 @@ msgstr "%s. csatoló: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Hálózati maszk"
@@ -162,6 +170,7 @@ msgid "Started on boot"
 msgstr "Automatikus indítás"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP kliens"
@@ -176,17 +185,19 @@ msgstr ""
 "Használja a \"%s\" funkciót a Mageia Vezérlőközpontban."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Új hálózati kapcsolat beállítása (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Nincs IP cím"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Nincs maszk"
@@ -257,12 +268,12 @@ msgstr ""
 "\n"
 "Mit szeretne tenni?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Kikapcsolás"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Bekapcsolás"
@@ -279,8 +290,8 @@ msgstr ""
 "Válassza ki azt a hálózati csatolót, amely közvetlenül csatlakozik az "
 "internethez."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Hálózati eszköz"
@@ -355,7 +366,11 @@ msgstr "A belső tartománynév"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -653,13 +668,14 @@ msgstr "Engedélyezett címek"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktív tűzfal"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Nem sikerült kapcsolódni a szolgáltatáshoz"
@@ -669,12 +685,12 @@ msgstr "Nem sikerült kapcsolódni a szolgáltatáshoz"
 msgid "Log"
 msgstr "Napló"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Engedélyezés"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Tiltás"
@@ -701,12 +717,12 @@ msgstr "Tiltott szolgáltatások"
 msgid "Clear logs"
 msgstr "Naplók törlése"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Feketelista"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Fehérlista"
@@ -867,7 +883,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Engedélyez"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Leírás"
@@ -915,9 +931,9 @@ msgstr ""
 "használja, illetve a megváltoztatott hálózati beállítások is ide lesznek "
 "elmentve."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Figyelmeztetés"
@@ -2486,12 +2502,12 @@ msgstr ""
 "Figyelmeztetés: Egy másik internetkapcsolat is létezik, esetlegesen a "
 "hálózatot használva."
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Csatlakozva"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nincs csatlakozva"
@@ -2556,7 +2572,7 @@ msgstr "Forgalommérés engedélyezése"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Mérték (metric)"
@@ -2603,19 +2619,22 @@ msgstr "Kábelmodem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin használata (Telstra esetén szükséges)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Felhasználóazonosítás"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Felhasználónév"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Jelszó"
@@ -2744,13 +2763,15 @@ msgstr ""
 "Minden mezőbe IP címet írjon pontozott decimális formátumban\n"
 "(például: 192.169.10.11)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Átjáró (gateway)"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS kiszolgálók lekérése DHCP-vel"
@@ -2777,21 +2798,25 @@ msgstr ""
 "Alapértelmezésben a keresési tartomány a teljes gépnévből lesz meghatározva"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "A DHCP várakozási ideje (másodpercben)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP kiszolgálók lekérése DHCP-vel"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD kiszolgálók lekérése DHCP-vel"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP gépnév"
@@ -2802,11 +2827,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Zeroconf (169.254.0.0 hálózat) ne legyen használva"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Az IP cím formátuma 1.2.3.4 legyen"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "A hálózati maszk formátuma 255.255.224.0 legyen"
@@ -2829,6 +2856,7 @@ msgstr ""
 "rendszerindítás folyamán"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Gépnév a DHCP címből származik (vagy generál egy egyedi nevet)"
@@ -2857,6 +2885,7 @@ msgstr ""
 "localdomain' lesz a számítógép gépneve."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hálózati hotplugging"
@@ -2925,27 +2954,32 @@ msgstr "Telefon (POTS)"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analóg telefonos modem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Szkript alapú"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminál alapú"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4104,7 +4138,7 @@ msgstr "WPA/WPA2 előzetesen megosztott kulcs"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows meghajtó"
@@ -4120,7 +4154,7 @@ msgstr "Windows meghajtó"
 # 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:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4128,78 +4162,81 @@ msgid ""
 msgstr ""
 "A vezeték nélküli kártya le van tiltva. Előbb engedélyezze azt (RF kapcsoló)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Vezeték nélküli kapcsolat beállításai"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Működési mód"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Alkalmi"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Menedzselt"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Fő"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Ismétlő"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Másodlagos"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatikus"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Hálózati név (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Titkosítási mód"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Titkosítási kulcs"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Jelszó elrejtése"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Az ASCII karakterek erőltetése a használt kulcson (pl. Livebox-nak)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP Felhasználónév"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4210,12 +4247,12 @@ msgstr ""
 "Ha egyx speciális domainnév használata kötelező, akkor\n"
 "a nem tesztelt DOMAIN\\felhasználónév formát használja."
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP Jelszó"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4248,12 +4285,12 @@ msgstr ""
 "   A TLS mód teljesen tanúsítvány alapon működik és mellőzni lehet\n"
 "az ide írt felhasználónév és jelszó használatát."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP klienstanúsítvány"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4266,32 +4303,37 @@ msgstr ""
 "felhasználónév, jelszó párost használni.\n"
 " Megjegyzés: kapcsolódó beállításokat lehet találni a Speciális opciók lapon."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Hálózati azonosító"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Üzemi frekvencia"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Érzékenységi küszöb"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitráta (b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4313,17 +4355,19 @@ msgstr ""
 "beállítható automatikusra (auto), rögzítettre (fixed) és kikapcsoltra\n"
 "(off) is."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Töredezés"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Az iwconfig program extra argumentumai"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4339,12 +4383,13 @@ msgstr ""
 "További információ az iwconfig(8) kézikönyvben."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Az iwspy program extra argumentumai"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4364,12 +4409,13 @@ msgstr ""
 "\n"
 "További információ az iwspy(8) kézikönyvben."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Az iwpriv program extra argumentumai"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4398,28 +4444,28 @@ msgstr ""
 "\n"
 "További információ az iwpriv(8) kézikönyvben."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP Protokoll"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Automatikus felismerés"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4430,67 +4476,67 @@ msgstr ""
 " szeretné használni, de sikertelenség esetén a WPA 1. verzióját kell "
 "használni."
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP Mód"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4499,12 +4545,12 @@ msgstr ""
 "az elfogadott azonosítókulcs kezelő protokollok listája.\n"
 "lehetséges értékek: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP külső azonosító"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4515,12 +4561,12 @@ msgstr ""
 "használatával ehetősége lesz több alagutazott azonosító \n"
 "használatára. Pl.: TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4533,12 +4579,12 @@ msgstr ""
 "auth=MSCHAPV2 PEAP-hoz vagy\n"
 "autheap=MSCHAPV2 autheap=MD5 TTLS-hoz"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA tanúsítvány"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4553,12 +4599,12 @@ msgstr ""
 "Ha lehet, mindig használjon ellenőrzött CA tanúsítványt, hogy \n"
 " TLS-t, TTLS-t vagy PEAP-ot használhasson."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP tanúsítvány tárgyegyezés"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4573,12 +4619,12 @@ msgstr ""
 "ezt a szövegrészletet. A fejléc leírása ilyen formátumú:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Extra irányelvek"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4609,12 +4655,12 @@ msgstr ""
 "\tAz olyan értékeket, mint a key_mgmt, eap lehet erőltetni\n"
 "\t a felhasználói felület lehetőségei között."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Szükség van titkosítási kulcsra."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4623,7 +4669,7 @@ msgstr ""
 "Az előre megosztott kulcsnak vagy 8 és 63 közötti ASCII, vagy 64 "
 "hexadecimális karakterből kell állnia."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4632,7 +4678,7 @@ msgstr ""
 "A WEP kulcsnak %d ASCII karakterből vagy %d hexadecimális karakterből "
 "kellene állnia."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4641,7 +4687,7 @@ msgstr ""
 "A frekvencia k, M vagy G utótagot kaphat (például a \"2,46G\" 2,46 GHz-es "
 "frekvenciát jelöl), vagy ehelyett ki lehet írni a nullákat."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4650,17 +4696,17 @@ msgstr ""
 "Az átviteli sebesség k, M vagy G utótagot kaphat (például \"11M\"), vagy "
 "ehelyett ki lehet írni a nullákat."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Roaming engedélyezése a hozzáférési pontra"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "A(z) \"%s\" vezeték nélküli hálózathoz rendelve ezen a csatolón: %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4809,6 +4855,287 @@ msgstr "Csatlakozás"
 msgid "Hostname changed to \"%s\""
 msgstr "A gépnév módosítva erre: \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nem található Ethernet hálózati csatoló a rendszerben. Futtassa a "
+"hardverbeállítási eszközt."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Hálózati csatoló eltávolítása"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Válassza ki a beállítandó hálózati csatolót:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Hiba történt a(z) \"%s\" hálózati csatoló eltávolításakor:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "A(z) \"%s\" hálózati csatoló el lett távolítva."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Kapcsolatok kezelése"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Eszköz: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP-beállítás"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS-kiszolgálók"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Keresési tartomány"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "egyik sem"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statikus"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Indítás rendszerbetöltésnél"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Tárcsázási mód"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Csatlakozási sebesség"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "A csatlakozás várakozási ideje (másodpercben)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "A szolgáltató telefonszáma"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Áramlásvezérlés"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Sorvége"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "A modem várakozási ideje"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Zárolási fájl használata"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Tárcsázás előtt várakozás a vonalhangra"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Várakozás foglaltság esetén"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Modemhang"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kártya IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kártya DMA"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kártya IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kártya IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Európai protokoll (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokoll a világ többi részén\n"
+"D csatorna nélkül (bérelt vonal)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Gyártó"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Médiaosztály"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Modulnév"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "MAC-cím"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Busz"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "A buszon elfoglalt hely"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Az átjáró címének formátuma 1.2.3.4 legyen"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Átjáró (gateway):"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Csatoló:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Internetkapcsolat beállítása"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Internetkapcsolat még nem lett beállítva.\n"
+"Használja a \"%s\" funkciót a Mageia Vezérlőközpontban."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Gépnév (nem kötelező)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Elsődleges DNS kiszolgáló (nem kötelező)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Másodlagos DNS kiszolgáló (nem kötelező)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Harmadlagos DNS-kiszolgáló (nem kötelező)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Internetkapcsolat beállítása"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internet-hozzáférés"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "A csatlakozás típusa: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Állapot:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "A kapcsolat ellenőrzése..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Paraméterek"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -5015,11 +5342,6 @@ msgstr "Interaktív tűzfal használata"
 msgid "No device found"
 msgstr "Eszköz nem található"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Eszköz: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5257,6 +5579,103 @@ msgstr "Új meghajtóprogram telepítése"
 msgid "Select a device:"
 msgstr "Válasszon egy eszközt:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr "Folyamat támadása"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interaktív tűzfal: behatolási kísérlet történt"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Mit szeretne tenni a támadóval?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "A támadás részletei"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "A támadás ideje: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Hálózati csatoló: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "A támadás típusa: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "A támadó IP-címe: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "A támadó gépneve: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "A megtámadott szolgáltatás: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "A megtámadott port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Az ICMP-támadás típusa: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Mindig feketelistára tevés (ne legyen rákérdezés)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignorálás"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktív tűzfal: új szolgáltatás"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, c-format
+msgid "Process connection"
+msgstr "Kapcsolódó folyamat"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Szeretné megnyitni ezt a szolgáltatást?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Emlékezzen erre a válaszra"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5300,20 +5719,6 @@ msgstr "Belső ISDN kártya"
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll a világ többi részén"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Európai protokoll (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokoll a világ többi részén\n"
-"D csatorna nélkül (bérelt vonal)"
-
 # címfelirat
 #: ../lib/network/netconnect.pm:122
 #, c-format
@@ -5365,11 +5770,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Kapcsolatvezérlés"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "A kapcsolat ellenőrzése..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5390,11 +5790,6 @@ msgstr "Az Ön saját telefonszáma"
 msgid "Provider name (ex provider.net)"
 msgstr "A szolgáltató neve (pl.: provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "A szolgáltató telefonszáma"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5405,41 +5800,6 @@ msgstr "Szolgáltatói DNS 1 (nem kötelező)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Szolgáltatói DNS 2 (nem kötelező)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Tárcsázási mód"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Csatlakozási sebesség"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "A csatlakozás várakozási ideje (másodpercben)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kártya IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kártya DMA"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kártya IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kártya IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5606,16 +5966,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Tartománynév"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Elsődleges DNS kiszolgáló (nem kötelező)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Másodlagos DNS kiszolgáló (nem kötelező)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5921,11 +6271,6 @@ msgstr "Végül, de nem utolsósorban megadhatja a DNS kiszolgálók IP címeit.
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "A DNS kiszolgáló címének formátuma 1.2.3.4 legyen"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Az átjáró címének formátuma 1.2.3.4 legyen"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6410,16 +6755,6 @@ msgstr "Megadott UDP port használata"
 #~ "\n"
 #~ "A helyi hálózat paraméterei ehhez a csatolóhoz lesznek beállítva."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Nem található Ethernet hálózati csatoló a rendszerben. Futtassa a "
-#~ "hardverbeállítási eszközt."
-
-#~ msgid "Connection type: "
-#~ msgstr "A csatlakozás típusa: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s már használatban van\n"
 
@@ -7427,9 +7762,6 @@ msgstr "Megadott UDP port használata"
 #~ msgid "discard"
 #~ msgstr "eldobás"
 
-#~ msgid "none"
-#~ msgstr "egyik sem"
-
 #~ msgid "tunnel"
 #~ msgstr "alagút"
 
@@ -7457,176 +7789,15 @@ msgstr "Megadott UDP port használata"
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "A módosítások érvénybe lépéséhez ki kell lépni, majd ismét belépni"
 
-#~ msgid "Process attack"
-#~ msgstr "Folyamat támadása"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Interaktív tűzfal: behatolási kísérlet történt"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Mit szeretne tenni a támadóval?"
-
-#~ msgid "Attack details"
-#~ msgstr "A támadás részletei"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "A támadás ideje: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Hálózati csatoló: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "A támadás típusa: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokoll: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "A támadó IP-címe: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "A támadó gépneve: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "A megtámadott szolgáltatás: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "A megtámadott port: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Az ICMP-támadás típusa: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Mindig feketelistára tevés (ne legyen rákérdezés)"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorálás"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Interaktív tűzfal: új szolgáltatás"
-
-#~ msgid "Process connection"
-#~ msgstr "Kapcsolódó folyamat"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Szeretné megnyitni ezt a szolgáltatást?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Emlékezzen erre a válaszra"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Cisco-féle UDP-becsomagolás használata"
 
-#~ msgid "Gateway:"
-#~ msgstr "Átjáró (gateway):"
-
-#~ msgid "Interface:"
-#~ msgstr "Csatoló:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Kapcsolatok kezelése"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP-beállítás"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS-kiszolgálók"
-
-#~ msgid "Search Domain"
-#~ msgstr "Keresési tartomány"
-
-#~ msgid "static"
-#~ msgstr "statikus"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Indítás rendszerbetöltésnél"
-
-#~ msgid "Flow control"
-#~ msgstr "Áramlásvezérlés"
-
-#~ msgid "Line termination"
-#~ msgstr "Sorvége"
-
-#~ msgid "Modem timeout"
-#~ msgstr "A modem várakozási ideje"
-
-#~ msgid "Use lock file"
-#~ msgstr "Zárolási fájl használata"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Tárcsázás előtt várakozás a vonalhangra"
-
-#~ msgid "Busy wait"
-#~ msgstr "Várakozás foglaltság esetén"
-
-#~ msgid "Modem sound"
-#~ msgstr "Modemhang"
-
-#~ msgid "Vendor"
-#~ msgstr "Gyártó"
-
-#~ msgid "Media class"
-#~ msgstr "Médiaosztály"
-
-#~ msgid "Module name"
-#~ msgstr "Modulnév"
-
-#~ msgid "Mac Address"
-#~ msgstr "MAC-cím"
-
-#~ msgid "Bus"
-#~ msgstr "Busz"
-
-#~ msgid "Location on the bus"
-#~ msgstr "A buszon elfoglalt hely"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Hálózati csatoló eltávolítása"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Hiba történt a(z) \"%s\" hálózati csatoló eltávolításakor:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "A(z) \"%s\" hálózati csatoló el lett távolítva."
-
 #~ msgid "Disconnect..."
 #~ msgstr "A kapcsolat bontása..."
 
 #~ msgid "Connect..."
 #~ msgstr "Csatlakozás..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Internetkapcsolat beállítása"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Gépnév (nem kötelező)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Harmadlagos DNS-kiszolgáló (nem kötelező)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Internetkapcsolat beállítása"
-
-#~ msgid "Internet access"
-#~ msgstr "Internet-hozzáférés"
-
-#~ msgid "Status:"
-#~ msgstr "Állapot:"
-
-#~ msgid "Parameters"
-#~ msgstr "Paraméterek"
-
 #~ msgid "Attacker"
 #~ msgstr "Támadó"
 
diff --git a/po/id.po b/po/id.po
index 611dc51..728d933 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -36,14 +36,16 @@ msgid "Interface"
 msgstr "Antarmuka"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Alamat IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -79,23 +81,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfigurasikan Local Area Network..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Bantuan"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Terapkan"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -105,7 +111,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -114,7 +121,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Harap tunggu"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Harap tunggu... Menerapkan konfigurasi"
@@ -150,6 +157,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -165,6 +173,7 @@ msgid "Started on boot"
 msgstr "Dijalankan saat boot"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Klien DHCP"
@@ -179,17 +188,19 @@ msgstr ""
 "Jalankan asisten \"Tambahkan antarmuka\" dari Pusat Kontrol Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Tentukan antarmuka jaringan baru (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Tanpa IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Tanpa Mask"
@@ -259,12 +270,12 @@ msgstr ""
 "\n"
 "Apa yang ingin Anda lakukan?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Non-aktifkan"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Aktifkan"
@@ -280,8 +291,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "Harap memilih antarmuka jaringan yang terhubung secara langsung ke Internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Device Net"
@@ -349,7 +360,11 @@ msgstr "Nama domain internal"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -641,13 +656,14 @@ msgstr "Alamat yang diijinkan"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Firewall Interaktif"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Tidak dapat menghubungi daemon"
@@ -657,12 +673,12 @@ msgstr "Tidak dapat menghubungi daemon"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Ijinkan"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Dilarang"
@@ -689,12 +705,12 @@ msgstr "Layanan yang dilarang"
 msgid "Clear logs"
 msgstr "Bersihlah log"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Daftar Hitam"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Daftar putih"
@@ -843,7 +859,7 @@ msgstr "Mode"
 msgid "Enabled"
 msgstr "Aktifkan"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Keterangan"
@@ -885,9 +901,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Peringatan"
@@ -2418,12 +2434,12 @@ msgid ""
 msgstr ""
 "Peringatan, koneksi internet lain terdeteksi, mungkin memakai jaringan Anda"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Tersambung"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Tidak tersambung"
@@ -2488,7 +2504,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrik"
@@ -2528,19 +2544,22 @@ msgstr "Kabel modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Gunakan BPALogin (diperlukan untuk Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Otentikasi"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Login Account (nama pengguna)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Katasandi Account"
@@ -2667,13 +2686,15 @@ msgstr ""
 "Tiap item harus diberikan sebagai alamat IP dalam notasi decimal\n"
 "bertitik (misalnya 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Dapatkan server DNS dari DHCP"
@@ -2699,21 +2720,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "Secara default pencarian domain akan ditentukan dari nama host"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Timeout DHCP (dalam detik)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Dapatkan server YP dari DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Dapatkan server NTPD dari DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nama Host DHCP"
@@ -2724,11 +2749,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Tidak melakukan fallback ke Zeroconf (jaringan 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Alamat IP harus dalam format 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Netmask harus dalam format 255.255.224.0"
@@ -2747,6 +2774,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Tentukan nama host dari alamat DHCP"
@@ -2768,6 +2796,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hotplugging Jaringan"
@@ -2836,27 +2865,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem telepon analog (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Berbasis-script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Berbasis-terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4015,12 +4049,12 @@ msgstr "WPA Dengan Kunci Terbagi"
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4029,78 +4063,81 @@ msgstr ""
 "Kartu nirkabel Anda dinonaktifkan, harap aktifkan switch nirkabel (switch RF "
 "kill) dahulu."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Setting jaringan nirkabel"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Mode Operasi"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Terkelola"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Kedua"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatis"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nama Jaringan (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Mode enkripsi"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Kunci enkripsi"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Katasandi"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Login Account (nama pengguna)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4108,12 +4145,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Katasandi"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4132,12 +4169,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Nama sertifikat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4146,32 +4183,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID Jaringan"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frekuensi operasi"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Batas sensitivitas"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Kecepatan (dalam b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4192,17 +4234,19 @@ msgstr ""
 "nilai maksimal paket yang menonaktifkan skema. Anda juga bisa \n"
 "menentukan parameter ini menjadi auto, fixed, atau off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentasi"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Argumen tambahan perintah iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4218,12 +4262,13 @@ msgstr ""
 "Lihat halaman manual iwconfig(8) untuk informasi lebih lanjut."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Argumen tambahan perintah iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4243,12 +4288,13 @@ msgstr ""
 "\n"
 "Lihat halaman manual iwpspy(8) untuk informasi lebih lanjut."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Argumen tambahan perintah iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4276,107 +4322,107 @@ msgstr ""
 "\n"
 "Lihat halaman manual iwpriv(8) untuk informasi lebih lanjut."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Deteksi otomatis"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Mode"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4384,12 +4430,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4398,12 +4444,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Sertifikat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4413,12 +4459,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4428,12 +4474,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4451,26 +4497,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Kunci enkripsi diperlukan."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4479,7 +4525,7 @@ msgstr ""
 "Freq harus berakhiran k, M atau G (mis. \"2.46G\" untuk frekuensi 2.46 GHz), "
 "atau tambahkan '0' (nol) secukupnya."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4488,17 +4534,17 @@ msgstr ""
 "Kecepatan harus berakhiran k, M atau G (mis. \"11M\" untuk 11M), atau "
 "tambahkan '0' (nol) secukupnya."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Ijinkan roaming akses point"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Terasosiasi dengan jaringan nirkabel \"%s\" pada antarmuka %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Kehilangan asosiasi ke jaringan nirkabel pada antarmuka %s"
@@ -4643,6 +4689,287 @@ msgstr "Sambungkan"
 msgid "Hostname changed to \"%s\""
 msgstr "Nama host diganti ke \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Tidak ada adapter jaringan ethernet yang terdeteksi pada sistem Anda. "
+"Silahkan jalankan perkakas konfigurasi perangkat keras."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Hapus antarmuka jaringan"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Pilih interface jaringan yang akan dikonfigurasi:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Kesalahan terjadi saat menghapus antarmuka jaringan \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Selamat, antarmuka jaringan \"%s\" telah berhasil dihapus"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Mengelola koneksi"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Divais: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Konfigurasi IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Server DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Domain Pencarian"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "tidak ada"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statis"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Start saat boot"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Mode dial"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Kecepatan koneksi"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Timeout koneksi (dalam detik)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Nomor telepon provider"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Alur kontrol"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Pemutusan Jalur"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Timeout modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Gunakan pengunci file"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Tunggu hingga nada panggil sebelum memanggil"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Sibuk, tunggu"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Suara modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ kartu"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Mem kartu (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO kartu"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 kartu"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protokol Eropa (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol untuk yang lain \n"
+" tanpa D-Channel (leased lines)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Pembuat"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Kelas media"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Nama modul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Alamat Mac"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Lokasi pada bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Alamat gateway harus dalam format 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Antarmuka:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Konfigurasi koneksi Internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Anda tidak memiliki koneksi Internet yang terkonfigurasi.\n"
+"Jalankan asisten \"%s\" dari Pusat Kontrol Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Nama host (opsional)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Server DNS pertama (opsional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Server DNS kedua (opsional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Server DNS Ketiga (opsional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Konfigurasi koneksi Internet"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Akses Internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tipe koneksi"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Status:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Menguji koneksi Anda..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parameter"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4849,11 +5176,6 @@ msgstr "Gunakan Firewall Interaktif"
 msgid "No device found"
 msgstr "Tidak ada divais yang ditemukan"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Divais: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5084,6 +5406,103 @@ msgstr "Install driver baru"
 msgid "Select a device:"
 msgstr "Pilih sebuah divais:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Penyerangan layanan"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Firewall Interaktif: intrusi terdeteksi"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Apa yang hendak Anda lakukan dengan penyerang?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Detail serangan"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Waktu penyerangan: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Antarmuka jaringan: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Tipe serangan: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Alamat IP penyerang: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Nama host penyerang: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Layanan yang diserang: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Port yang diserang: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Tipe serangan ICMP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Selalu blacklist (jangan tanya lagi)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Abaikan"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Firewall Interaktif: layanan baru"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Konfigurasi jaringan nirkabel"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Apakah Anda hendak membuka layanan ini?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Ingat jawaban ini"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5127,20 +5546,6 @@ msgstr "Kartu ISDN internal"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol untuk yang lain"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protokol Eropa (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol untuk yang lain \n"
-" tanpa D-Channel (leased lines)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5191,11 +5596,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Kontrol koneksi"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Menguji koneksi Anda..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5216,11 +5616,6 @@ msgstr "Nomor telepon pribadi Anda"
 msgid "Provider name (ex provider.net)"
 msgstr "Nama provider (misalnya provider.net.id)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Nomor telepon provider"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5231,41 +5626,6 @@ msgstr "DNS Provider 1 (opsional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS Provider 2 (opsional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Mode dial"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Kecepatan koneksi"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Timeout koneksi (dalam detik)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ kartu"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Mem kartu (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO kartu"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 kartu"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5433,16 +5793,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nama domain"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Server DNS pertama (opsional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Server DNS kedua (opsional)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5753,11 +6103,6 @@ msgstr "Terakhir, Anda juga bisa memasukkan alamat IP server DNS Anda."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Alamat server DNS harus dalam format 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Alamat gateway harus dalam format 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6236,16 +6581,6 @@ msgstr "Gunakan port UDP spesifik"
 #~ "\n"
 #~ "Saya akan mensetup Local Area Network Anda dengan adapter itu."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Tidak ada adapter jaringan ethernet yang terdeteksi pada sistem Anda. "
-#~ "Silahkan jalankan perkakas konfigurasi perangkat keras."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tipe koneksi"
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s sudah dipakai\n"
 
@@ -7243,9 +7578,6 @@ msgstr "Gunakan port UDP spesifik"
 #~ msgid "discard"
 #~ msgstr "buang"
 
-#~ msgid "none"
-#~ msgstr "tidak ada"
-
 #~ msgid "tunnel"
 #~ msgstr "Kanal"
 
@@ -7273,178 +7605,15 @@ msgstr "Gunakan port UDP spesifik"
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "Anda harus log out dan kembali agar perubahan berlaku"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Penyerangan layanan"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Firewall Interaktif: intrusi terdeteksi"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Apa yang hendak Anda lakukan dengan penyerang?"
-
-#~ msgid "Attack details"
-#~ msgstr "Detail serangan"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Waktu penyerangan: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Antarmuka jaringan: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Tipe serangan: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Alamat IP penyerang: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Nama host penyerang: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Layanan yang diserang: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Port yang diserang: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Tipe serangan ICMP: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Selalu blacklist (jangan tanya lagi)"
-
-#~ msgid "Ignore"
-#~ msgstr "Abaikan"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Firewall Interaktif: layanan baru"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Konfigurasi jaringan nirkabel"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Apakah Anda hendak membuka layanan ini?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Ingat jawaban ini"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Gunakan enkapsulasi Cisco-UDP"
 
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Antarmuka:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Mengelola koneksi"
-
-#~ msgid "IP configuration"
-#~ msgstr "Konfigurasi IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Server DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "Domain Pencarian"
-
-#~ msgid "static"
-#~ msgstr "statis"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Start saat boot"
-
-#~ msgid "Flow control"
-#~ msgstr "Alur kontrol"
-
-#~ msgid "Line termination"
-#~ msgstr "Pemutusan Jalur"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Timeout modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Gunakan pengunci file"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Tunggu hingga nada panggil sebelum memanggil"
-
-#~ msgid "Busy wait"
-#~ msgstr "Sibuk, tunggu"
-
-#~ msgid "Modem sound"
-#~ msgstr "Suara modem"
-
-#~ msgid "Vendor"
-#~ msgstr "Pembuat"
-
-#~ msgid "Media class"
-#~ msgstr "Kelas media"
-
-#~ msgid "Module name"
-#~ msgstr "Nama modul"
-
-#~ msgid "Mac Address"
-#~ msgstr "Alamat Mac"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Lokasi pada bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Hapus antarmuka jaringan"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kesalahan terjadi saat menghapus antarmuka jaringan \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Selamat, antarmuka jaringan \"%s\" telah berhasil dihapus"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Putus Hubungan..."
 
 #~ msgid "Connect..."
 #~ msgstr "Terhubung..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Konfigurasi koneksi Internet"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Nama host (opsional)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Server DNS Ketiga (opsional)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Konfigurasi koneksi Internet"
-
-#~ msgid "Internet access"
-#~ msgstr "Akses Internet"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parameter"
-
 #~ msgid "Attacker"
 #~ msgstr "Penyerang"
 
diff --git a/po/is.po b/po/is.po
index ebc3a16..5310338 100644
--- a/po/is.po
+++ b/po/is.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-04-09 01:56+0000\n"
 "Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
 "Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -31,14 +31,16 @@ msgid "Interface"
 msgstr "Tengi"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-tala"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Samskiptaregla"
@@ -74,23 +76,27 @@ msgid "Configure Local Area Network..."
 msgstr "Stilla staðarnets-tengingu..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Hjálp"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Virkja"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Hætta við"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Í lagi"
@@ -100,7 +106,8 @@ msgstr "Í lagi"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -109,7 +116,7 @@ msgstr "Í lagi"
 msgid "Please wait"
 msgstr "Augnablik"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Augnablik... Framkvæmi stillingar"
@@ -145,6 +152,7 @@ msgstr "Kort %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netsía"
@@ -160,6 +168,7 @@ msgid "Started on boot"
 msgstr "Virkjað við ræsingu"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP biðlari"
@@ -174,17 +183,19 @@ msgstr ""
 "Keyrið \"%s\" ráðgjafann frá Mageia stjórnborðinu"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Setja upp nýja nettengingu (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Engin IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Engin netsía"
@@ -256,12 +267,12 @@ msgstr ""
 "\n"
 "Hvað vilt þú gera?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Slökkva"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Virkja"
@@ -276,8 +287,8 @@ msgstr "Endurstilla"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Veldu nettengið sem er beintengt við Internetið."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Nettæki"
@@ -353,7 +364,11 @@ msgstr "Nafn staðbundins léns"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -651,13 +666,14 @@ msgstr "Leyfð vistföng"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Gagnvirkur Eldveggur"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Get ekki tengst þjónustu"
@@ -667,12 +683,12 @@ msgstr "Get ekki tengst þjónustu"
 msgid "Log"
 msgstr "Annálar"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Leyfa"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokk"
@@ -699,12 +715,12 @@ msgstr "Lokaðar þjónustur"
 msgid "Clear logs"
 msgstr "Hreinsa annála"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Svartlisti"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Vinalisti"
@@ -852,7 +868,7 @@ msgstr "Mótald"
 msgid "Enabled"
 msgstr "Virkja"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, fuzzy, c-format
 msgid "Description"
 msgstr "Dulritun"
@@ -894,9 +910,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Aðvörun"
@@ -2443,12 +2459,12 @@ msgid ""
 "network"
 msgstr "Viðvörun, skynja aðra Internettengingu, kannski um staðarnetið þitt"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Tengdur"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Ótengdur"
@@ -2513,7 +2529,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Kvarði"
@@ -2554,19 +2570,22 @@ msgstr "Kapalmótald"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Nota BPALogin (þarf fyrir Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Auðkenning"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Netþjónustu-notandanafn"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Netþjónustu-lykilorð"
@@ -2692,13 +2711,15 @@ msgstr ""
 "Hver færsla á að vera IP-tala rituð með punkt á milli.\n"
 "(dæmi 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Netgátt"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Sækja vistföng DNS þjóna frá DHCP miðlara"
@@ -2724,21 +2745,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "Sjálfgefið verður leitar-lén sett út frá fullformuðu vélarnafni"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP tenging fellur á tíma eftir (í sek)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Ná í YP miðlara frá DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Ná í NTPD miðlara frá DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP vélarheiti"
@@ -2749,11 +2774,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Ekki falla til baka í ZeroConf (169.254.0.0 net)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-tala á að vera á sniðinu 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Netsía á að vera á sniðinu 255.255.224.0"
@@ -2775,6 +2802,7 @@ msgstr ""
 "eða stilltu þau þannig að þau séu ekki virkjuð við ræsingu vélar"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Skilgreina nafn vélar frá DHCP vistfangi (eða búa til einkvæmt)"
@@ -2796,6 +2824,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Netstillingar útskiptanlegra tækja"
@@ -2864,27 +2893,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Hliðrænt símamótald"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Með skriftu"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Með skjáhermi"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4043,12 +4077,12 @@ msgstr "WPA/WPA2 for-valinn lykill"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows rekill"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4057,79 +4091,82 @@ msgstr ""
 "Þráðlausa netkortið þitt er ekki virkt, vinsamlega virkjaðu nettækið (RF "
 "kill switch) fyrst."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Stillingar Þráðlausrar tengingar"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Vinnsluhamur"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Beintengt"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Netgátt"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Stjórnandi"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Endurvaki"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Aukalegur"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Sjálfvirkt"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Netnafn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Dulritunar-máti"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Dulritunar-lykill"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Lykilorð"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Þvinga notkun á þessum lykli sem texta streng (ASCII) (t.d. fyrir Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP auðkenni/notandanafn"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4140,12 +4177,12 @@ msgstr ""
 "Ef þú þarft að tilgreina lén, reyndu þá að nota\n"
 "  LÉN\\notandi"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP Lykilorð"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4164,12 +4201,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP skírteini biðlara"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4178,32 +4215,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Netauðkenni"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Vinnslutíðni"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Næmniþröskuldur"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitahraði (í b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4223,17 +4265,19 @@ msgstr ""
 "Ef gildið er jafn stórt hámarks-pakkastærð er könnunin óvirk.\n"
 "Þú getur einnig valið gildin auto, fixed, eða off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Slitnir-pakkar"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Aukaviðföng fyrir iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4250,12 +4294,13 @@ msgstr ""
 "sjá nánar á man-síðunni iwconfig(8)."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Auka viðföng fyrir iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4274,12 +4319,13 @@ msgstr ""
 "\n"
 "Sjá nánari upplýsingar á iwpspy(8) man síðu."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Auka viðföng fyrir iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4306,28 +4352,28 @@ msgstr ""
 "\n"
 "sjá nánar á man-síðunni fyrir iwpriv(8)."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP Samskiptaregla"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Finna sjálfkrafa"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4336,67 +4382,67 @@ msgstr ""
 "Mælt er með að nota \"Finna sjálfkrafa\" Því það reynir fyrst WPA útgáfu 2 "
 "og til vara WPA útgáfu 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP Hamur"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4405,12 +4451,12 @@ msgstr ""
 "listi af samþykktum auðkenningar-samskiptaferlum.\n"
 "möguleg gildi eru WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP ytra auðkenni"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4418,12 +4464,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP þrep2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4432,12 +4478,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA skírteini"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4447,12 +4493,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4462,12 +4508,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, fuzzy, c-format
 msgid "Extra directives"
 msgstr "EAP auka viðföng"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4485,12 +4531,12 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Þarf að fá dulritunarlykil."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4499,7 +4545,7 @@ msgstr ""
 "Forvaldir lyklar ættu að vera á milli 8 og 63 ASCII stafir (enskt stafróf), "
 "eða 64 sextándakerfis stafir."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4507,7 +4553,7 @@ msgid ""
 msgstr ""
 "WEP lykillinn ætti að hafa mest %d ASCII stafi eða %d sextándakerfis-stafi."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4516,7 +4562,7 @@ msgstr ""
 "Tíðni ætti að hafa viðskeyti k, M eða G (t.d. \"2.46G\" fyrir 2.46 GHz "
 "tíðni), eða bæta við nógu mörgum núllum."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4525,17 +4571,17 @@ msgstr ""
 "Hraði ætti að hafa viðskeyti k, M eða G (t.d. \"11M\" fyrir 11M) eða bæta "
 "við nógu mörgum núllum."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Leyfa flakk milli aðgangspunkta"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Tengdur þráðlausu neti \"%s\" á nettengi %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Missti tengingu við þráðlaust net á nettengi %s"
@@ -4683,6 +4729,285 @@ msgstr "Tengjast"
 msgid "Hostname changed to \"%s\""
 msgstr "Vélarnafni breytt í \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Nettengi"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Veldu netkort sem á að stilla:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Vandamál kom upp við enduræsingu nets: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Til hamingju, uppsetningu nets er lokið."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Sýsla með VPN tengingar"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Tæki: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN stillingar"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Nafnamiðlari 1 (DNS)"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Leita í léni"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Sjálfvirk"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Virkjað við ræsingu"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Hringihamur"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Tengihraði"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Tenging fellur á tíma eftir (í sek)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Símanúmer netþjónustu"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Mótaldstenging"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Veljið skrá"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kúvæt"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Mótald"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ Korts"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kortminni (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kort IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kort IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Evrópskan samskiptastaðal (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Samskiptaregla til tengingar við umheiminn\n"
+"Ekki D-rás (leigðar línur)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Mótald"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Raunverulegt vistfang"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Hvítarússland"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Vistfang netgáttar á að vera á sniðinu 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Netgátt"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Tengi"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Engin Internet uppsetning skilgreind"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Þú hefur ekki skilgreint neina Internettengingu.\n"
+"Keyrið \"%s\" ráðgjafann frá Mageia stjórnborðinu"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Aðal nafnamiðlari (ekki krafist)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Aðal nafnamiðlari (ekki krafist)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Vara nafnamiðlari (ekki krafist)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Aðal nafnamiðlari (ekki krafist)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Tengi-stillingar"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Prentara-aðgangur"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Tengitími: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Staða"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Prófa tenginguna þína..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP viðföng"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4889,11 +5214,6 @@ msgstr "Nota virkan eldvegg"
 msgid "No device found"
 msgstr "Fann enginn tæki"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Tæki: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5124,6 +5444,103 @@ msgstr "Setja inn nýjan rekil"
 msgid "Select a device:"
 msgstr "Velja tæki:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Ráðist á þjónustu"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Gagnvirkur eldveggur í sjálfvirkum ham"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Hvernig viltu hringja í þessa nettengingu?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Nettengi"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Samskiptaregla"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP-tala: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Ráðist á þjónustu"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Gagnvirkur Eldveggur"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Þráðlaus tenging"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Hvernig viltu hringja í þessa nettengingu?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5167,20 +5584,6 @@ msgstr "Innvært ISDN mótald"
 msgid "Protocol for the rest of the world"
 msgstr "Samskiptaregla til tengingar við umheiminn"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Evrópskan samskiptastaðal (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Samskiptaregla til tengingar við umheiminn\n"
-"Ekki D-rás (leigðar línur)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5231,11 +5634,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Sambandsstýring"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Prófa tenginguna þína..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5256,11 +5654,6 @@ msgstr "Þitt símanúmer"
 msgid "Provider name (ex provider.net)"
 msgstr "Nafn þjónustuaðila (t.d. simnet.is)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Símanúmer netþjónustu"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5271,41 +5664,6 @@ msgstr "Nafnamiðlari DNS 1 (ekki krafist)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Nafnamiðlari DNS 2 (ekki krafist)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Hringihamur"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Tengihraði"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Tenging fellur á tíma eftir (í sek)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ Korts"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kortminni (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kort IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kort IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5471,16 +5829,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nafn léns"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Aðal nafnamiðlari (ekki krafist)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Vara nafnamiðlari (ekki krafist)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5789,11 +6137,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Vistfang DNS-þjóns á að vera á sniðinu 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Vistfang netgáttar á að vera á sniðinu 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/it.po b/po/it.po
index 89d3d72..43abc62 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,18 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-12 19:34+0000\n"
 "Last-Translator: Marcello Anni <marcello.anni@alice.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: ../bin/drakconnect-old:45
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Interfaccia"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Indirizzo IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocollo"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "Configura rete locale (LAN)"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Guida"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Applica"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Annulla"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -95,16 +101,17 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Attendi"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Attendi... sto applicando la configurazione"
@@ -140,6 +147,7 @@ msgstr "Scheda %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Maschera di rete"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "Attivato al boot"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Client DHCP"
@@ -169,17 +178,19 @@ msgstr ""
 "Esegui l'assistente \"%s\" dal Centro di Controllo Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configura una nuova interfaccia di rete (LAN, ISDN, ADSL,...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Nessun IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Nessuna maschera"
@@ -203,18 +214,26 @@ msgstr "Condivisione della connessione Internet"
 #, 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). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
 "Stai per configurare il computer per condividere la connessione Internet.\n"
-"Con questa funzione, altri computer della rete locale saranno in grado di utilizzare la connessione internet di questo computer.\n"
+"Con questa funzione, altri computer della rete locale saranno in grado di "
+"utilizzare la connessione internet di questo computer.\n"
 "\n"
-"Assicurati di aver configurato l'accesso alla rete/internet tramite Drakconnect prima di proseguire. \n"
+"Assicurati di aver configurato l'accesso alla rete/internet tramite "
+"Drakconnect prima di proseguire. \n"
 "\n"
-"Nota: è necessario un apposito adattatore di rete per configurare una rete locale (LAN). Si prega di disattivare il firewall Mageia per la scheda di rete collegata alla connessione LAN prima di procedere."
+"Nota: è necessario un apposito adattatore di rete per configurare una rete "
+"locale (LAN). Si prega di disattivare il firewall Mageia per la scheda di "
+"rete collegata alla connessione LAN prima di procedere."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -242,12 +261,12 @@ msgstr ""
 "\n"
 "Cosa vuoi fare?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Disattiva"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Attiva"
@@ -260,10 +279,11 @@ msgstr "Riconfigura"
 #: ../bin/drakgw:122
 #, c-format
 msgid "Please select the network interface directly connected to the internet."
-msgstr "Devi selezionare l'interfaccia di rete direttamente connessa ad Internet"
+msgstr ""
+"Devi selezionare l'interfaccia di rete direttamente connessa ad Internet"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Interfaccia di rete"
@@ -271,7 +291,8 @@ msgstr "Interfaccia di rete"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one network adapter on your system configured for LAN connections:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
@@ -281,7 +302,8 @@ msgid ""
 "disable the firewall protection on it using drakfirewall before\n"
 "configuring Internet Connection sharing."
 msgstr ""
-"Nel sistema c'è un solo dispositivo configurato per connettersi alla rete LAN:\n"
+"Nel sistema c'è un solo dispositivo configurato per connettersi alla rete "
+"LAN:\n"
 " \n"
 "%s\n"
 "\n"
@@ -293,7 +315,9 @@ msgstr ""
 
 #: ../bin/drakgw:156
 #, 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 "Scegli quale scheda di rete sarà connessa alla rete locale (LAN)."
 
 #: ../bin/drakgw:177
@@ -335,7 +359,11 @@ msgstr "Nome del dominio interno"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -350,10 +378,10 @@ msgstr "Errore"
 
 #: ../bin/drakgw:188
 #, c-format
-msgid ""
-"Potential LAN address conflict found in current config of %s!\n"
-""
-msgstr "C'è un potenziale conflitto di indirizzo LAN nell'attuale configurazione di %s!\n"
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr ""
+"C'è un potenziale conflitto di indirizzo LAN nell'attuale configurazione di "
+"%s!\n"
 
 #: ../bin/drakgw:204
 #, c-format
@@ -446,13 +474,19 @@ msgstr "Diffondi informazioni su stampante"
 #: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter configured for LAN has been detected on your system.\n"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that "
+"the Mageia firewall is not enabled for network adapter connected to your LAN "
+"network."
 msgstr ""
-"Nessuna scheda di rete ethernet configurata per la LAN è stata rilevata sul tuo sistema. \n"
+"Nessuna scheda di rete ethernet configurata per la LAN è stata rilevata sul "
+"tuo sistema. \n"
 "\n"
-"Si prega di eseguire lo strumento di configurazione hardware per configurarla, e assicurati che il firewall Mageia non sia abilitato per scheda di rete connessa alla rete LAN."
+"Si prega di eseguire lo strumento di configurazione hardware per "
+"configurarla, e assicurati che il firewall Mageia non sia abilitato per "
+"scheda di rete connessa alla rete LAN."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -468,11 +502,14 @@ msgstr "La condivisione della connessione ad Internet è ora disattivata."
 #, 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 ""
 "La configurazione è completa.\n"
-"Ora puoi condividere il collegamento a Internet con gli altri computer della tua rete locale, utilizzando la configurazione automatica della rete (DHCP) ed\n"
+"Ora puoi condividere il collegamento a Internet con gli altri computer della "
+"tua rete locale, utilizzando la configurazione automatica della rete (DHCP) "
+"ed\n"
 " un server proxy trasparente (SQUID)."
 
 #: ../bin/drakgw:351
@@ -487,8 +524,12 @@ msgstr "Rilevata configurazione di un firewall!"
 
 #: ../bin/drakgw:366
 #, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
-msgstr "Attenzione! È stata rilevata una configurazione di firewall pre-esistente. Potrebbe avere bisogno di alcuni aggiustamenti manuali dopo l'installazione."
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+"Attenzione! È stata rilevata una configurazione di firewall pre-esistente. "
+"Potrebbe avere bisogno di alcuni aggiustamenti manuali dopo l'installazione."
 
 #: ../bin/drakgw:371
 #, c-format
@@ -623,13 +664,14 @@ msgstr "Indirizzi permessi"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Firewall interattivo"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Non si riesce a contattare il demone"
@@ -639,12 +681,12 @@ msgstr "Non si riesce a contattare il demone"
 msgid "Log"
 msgstr "Registro"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Permetti"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blocca"
@@ -671,12 +713,12 @@ msgstr "Servizi bloccati"
 msgid "Clear logs"
 msgstr "Azzera registro"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Lista nera"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Lista bianca"
@@ -758,8 +800,12 @@ msgstr "Serve una password"
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "Questa applicazione permette di gestire la replicazione delle interfacce di rete e dei firewall."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
+msgstr ""
+"Questa applicazione permette di gestire la replicazione delle interfacce di "
+"rete e dei firewall."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -822,7 +868,7 @@ msgstr "Modulo"
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descrizione"
@@ -839,8 +885,16 @@ msgstr "Nuovo profilo..."
 
 #: ../bin/draknetprofile:155
 #, c-format
-msgid "Please specify the name of the new network profile to be created (e.g., work, home, roaming, ..). This new profile will be created based on current settings, and you'll be able to configure your system configuration as usual afterwards."
-msgstr "Specifica il nome del nuovo profilo di rete da creare (es. lavoro, casa, roaming etc.). Il nuovo profilo verrà creato usando le impostazioni attuali,  in seguito potrai modificare la configurazione del sistema nel modo consueto."
+msgid ""
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
+"settings, and you'll be able to configure your system configuration as usual "
+"afterwards."
+msgstr ""
+"Specifica il nome del nuovo profilo di rete da creare (es. lavoro, casa, "
+"roaming etc.). Il nuovo profilo verrà creato usando le impostazioni "
+"attuali,  in seguito potrai modificare la configurazione del sistema nel "
+"modo consueto."
 
 #: ../bin/draknetprofile:166
 #, c-format
@@ -854,12 +908,18 @@ msgstr "Creato nuovo profilo"
 
 #: ../bin/draknetprofile:172
 #, c-format
-msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
-msgstr "Ora stai usando il profilo di rete %s. Puoi configurare il sistema nel modo consueto e da questo momento, tutte le modifiche alle impostazioni della rete saranno salvate in questo profilo."
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+"Ora stai usando il profilo di rete %s. Puoi configurare il sistema nel modo "
+"consueto e da questo momento, tutte le modifiche alle impostazioni della "
+"rete saranno salvate in questo profilo."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Attenzione"
@@ -871,8 +931,12 @@ msgstr "Sei sicuro di volere eliminare il profilo predefinito?"
 
 #: ../bin/draknetprofile:186
 #, c-format
-msgid "You can not delete the current profile. Please switch to a different profile first."
-msgstr "Non puoi cancellare il profilo attualmente in uso, prima passa ad un differente profilo."
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
+msgstr ""
+"Non puoi cancellare il profilo attualmente in uso, prima passa ad un "
+"differente profilo."
 
 #: ../bin/draknetprofile:194 ../bin/draknfs:356
 #, c-format
@@ -994,34 +1058,51 @@ msgstr "Deve essere una directory."
 #: ../bin/draknfs:146
 #, 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\">I client NFS</span> possono essere specificati in diversi modi:\n"
+"<span weight=\"bold\">I client NFS</span> possono essere specificati in "
+"diversi modi:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Un'unica macchina</span> può essere identificata tramite un nome abbreviato presente in resolv.conf, da un nome completo e qualificato (FQDN) o da un indirizzo IP\n"
+"<span foreground=\"royalblue3\">Un'unica macchina</span> può essere "
+"identificata tramite un nome abbreviato presente in resolv.conf, da un nome "
+"completo e qualificato (FQDN) o da un indirizzo IP\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Netgroup</span> il nome di un gruppo di rete NIS può essere fornito nel formato @gruppo.\n"
+"<span foreground=\"royalblue3\">Netgroup</span> il nome di un gruppo di rete "
+"NIS può essere fornito nel formato @gruppo.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Caratteri jolly</span> i nomi delle macchine possono contenere i caratteri jolly  * e ?. Per esempio : *.cs.foo.edu corrisponde a tutte le macchine del dominio cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">Caratteri jolly</span> i nomi delle macchine "
+"possono contenere i caratteri jolly  * e ?. Per esempio : *.cs.foo."
+"edu corrisponde a tutte le macchine del dominio cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Reti IP :</span> si può anche esportare simultaneamente delle directory a tutte le macchine di una (sotto) rete IP. Per esempio, si può aggiungere  \"/255.255.252.0\" o  \"/22\" alla fine dell'indirizzo base. \n"
+"<span foreground=\"royalblue3\">Reti IP :</span> si può anche "
+"esportare simultaneamente delle directory a tutte le macchine di "
+"una (sotto) rete IP. Per esempio, si può aggiungere  \"/255.255.252.0\" o  "
+"\"/22\" alla fine dell'indirizzo base. \n"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1029,31 +1110,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\">Opzioni per ID utenti</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">mappa l'utente root come anonymous:</span> mappa le richieste di UID/GID 0 su UID/GID anonymous (root_squash).\n"
+"<span foreground=\"royalblue3\">mappa l'utente root come anonymous:</span> "
+"mappa le richieste di UID/GID 0 su UID/GID anonymous (root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">permetti l'accesso remoto come root:</span> disattiva il root_squash. Questa opzione è molto utile per i client senza disco (no_root_squash).\n"
+"<span foreground=\"royalblue3\">permetti l'accesso remoto come root:</span> "
+"disattiva il root_squash. Questa opzione è molto utile per i client senza "
+"disco (no_root_squash).\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">tratta tutti gli utenti come anonymous:</span> mappa tutti gli UID e GID su quelli dell'utente anonimo (all_squash). Utile per le directory FTP pubbliche esportate in NFS, le directory news spool, etc. L'opzione opposta è quella di non mappare nessun UID di utente (no_all_squash), che è l'opzione predefinita.\n"
+"<span foreground=\"royalblue3\">tratta tutti gli utenti come anonymous:</"
+"span> mappa tutti gli UID e GID su quelli dell'utente anonimo (all_squash). "
+"Utile per le directory FTP pubbliche esportate in NFS, le directory news "
+"spool, etc. L'opzione opposta è quella di non mappare nessun UID di utente "
+"(no_all_squash), che è l'opzione predefinita.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">anonuid e anongid:</span> definiscono esplicitamente UID e GID dell'utente anonymous.\n"
+"<span foreground=\"royalblue3\">anonuid e anongid:</span> definiscono "
+"esplicitamente UID e GID dell'utente anonymous.\n"
 
 #: ../bin/draknfs:177
 #, c-format
@@ -1082,23 +1178,50 @@ msgstr "Opzioni avanzate"
 
 #: ../bin/draknfs:183
 #, 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> Questa opzione impone che la richiesta sia originata da una porta con IP inferiore a IPPORT_RESERVED (1024). Questa è l'opzione predefinita."
+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> Questa opzione impone che la "
+"richiesta sia originata da una porta con IP inferiore a IPPORT_RESERVED "
+"(1024). Questa è l'opzione predefinita."
 
 #: ../bin/draknfs:184
 #, 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> permette su questo volume NFS sia le richieste in sola lettura che quelle in lettura e scrittura. La politica predefinita è di rifiutare qualsiasi richiesta che modifichi il filesystem. Questa opzione permette di esplicitare questo comportamento."
+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> permette su questo volume NFS "
+"sia le richieste in sola lettura che quelle in lettura e scrittura. La "
+"politica predefinita è di rifiutare qualsiasi richiesta che modifichi il "
+"filesystem. Questa opzione permette di esplicitare questo comportamento."
 
 #: ../bin/draknfs:185
 #, 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> vieta al server NFS di violare il protocollo NFS e di rispondere alle richieste prima che le modifiche da esse provocate siano realmente effettuate sul supporto (es. sul disco fisso)."
+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> vieta al server NFS di violare "
+"il protocollo NFS e di rispondere alle richieste prima che le modifiche da "
+"esse provocate siano realmente effettuate sul supporto (es. sul disco fisso)."
 
 #: ../bin/draknfs:186
 #, 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> attiva la verifica delle ramificazioni che permette, in certi casi, di migliorare la sicurezza, ma che può ridurne l'affidabilità. Vedi la pagina man export (5) per maggiori dettagli."
+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> attiva la verifica delle "
+"ramificazioni che permette, in certi casi, di migliorare la sicurezza, ma "
+"che può ridurne l'affidabilità. Vedi la pagina man export (5) per maggiori "
+"dettagli."
 
 #: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
@@ -1461,13 +1584,10 @@ msgstr "Questo è una semplice applicazione per configurare facilmente Samba."
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
-msgid ""
-"_: Translator(s) name(s) & email(s)\n"
-""
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Andrea Celli <a.celli@caltanet.it>\n"
 
 #: ../bin/draksambashare:229
@@ -1509,8 +1629,12 @@ msgstr "Commento:"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
-msgstr "Esiste già una condivisione con questo nome o non hai fornito alcun nome. Scrivi un nuovo nome."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+"Esiste già una condivisione con questo nome o non hai fornito alcun nome. "
+"Scrivi un nuovo nome."
 
 #: ../bin/draksambashare:400
 #, c-format
@@ -1540,8 +1664,11 @@ msgstr "Aggiungi condivisione di una stampante speciale"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Lo scopo di questa procedura è di aiutarti a creare una condivisione per stampati speciali."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Lo scopo di questa procedura è di aiutarti a creare una condivisione per "
+"stampati speciali."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -1566,7 +1693,9 @@ msgstr "L'assistente ha aggiunto una stampante in condivisione Samba"
 #: ../bin/draksambashare:552
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
-msgstr "Aggiungi o seleziona una condivisione Samba di stampanti, prima di tentare di modificarla."
+msgstr ""
+"Aggiungi o seleziona una condivisione Samba di stampanti, prima di tentare "
+"di modificarla."
 
 #: ../bin/draksambashare:570
 #, c-format
@@ -1646,7 +1775,8 @@ msgstr "Voce di DrakSamba"
 #: ../bin/draksambashare:695
 #, c-format
 msgid "Please add or select a Samba share to be able to modify it."
-msgstr "Aggiungi o seleziona una condivisione Samba, prima di tentare di modificarla."
+msgstr ""
+"Aggiungi o seleziona una condivisione Samba, prima di tentare di modificarla."
 
 #: ../bin/draksambashare:718
 #, c-format
@@ -1680,8 +1810,11 @@ msgstr "Pubblico:"
 
 #: ../bin/draksambashare:795
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "I parametri create mask, create mode e directory mask devono essere numerici. Cioè del tipo: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"I parametri create mask, create mode e directory mask devono essere "
+"numerici. Cioè del tipo: 0755."
 
 #: ../bin/draksambashare:803
 #, c-format
@@ -1730,8 +1863,12 @@ msgstr "Assistente per configurare il server Samba"
 
 #: ../bin/draksambashare:1057
 #, c-format
-msgid "Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
-msgstr "Samba permette ad un computer di funzionare come server di file e di stampa per delle workstation basate su sistemi operativi diversi da Linux."
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
+msgstr ""
+"Samba permette ad un computer di funzionare come server di file e di stampa "
+"per delle workstation basate su sistemi operativi diversi da Linux."
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1740,18 +1877,29 @@ msgstr "Server PDC: Controllore principale del dominio"
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
-msgstr "Un server configurato come PDC è responsabile delle autenticazioni Windows all'interno del dominio."
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+"Un server configurato come PDC è responsabile delle autenticazioni Windows "
+"all'interno del dominio."
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Le installazioni isolate di server possono gestire le password con smbpasswd o tdbsam"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Le installazioni isolate di server possono gestire le password con smbpasswd "
+"o tdbsam"
 
 #: ../bin/draksambashare:1073
 #, 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, causa che il server se si registri in NetBIOS con il nome <pdc name>. Questo nome verrà riconosciuto dagli altri server."
+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, causa che il server se si registri in NetBIOS con il "
+"nome <pdc name>. Questo nome verrà riconosciuto dagli altri server."
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -1775,8 +1923,18 @@ msgstr "Os level:"
 
 #: ../bin/draksambashare:1092
 #, 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 "L'opzione globale «os level» determina il valore di sistema operativo simulato da Samba durante le «elezioni» tra server. Se desideri che Samba vinca l'elezione e diventi il server principale, devi impostare un livello superiore a quello del sistema operativo con il valore più alto nella tua LAN. Ad es.: 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 ""
+"L'opzione globale «os level» determina il valore di sistema operativo "
+"simulato da Samba durante le «elezioni» tra server. Se desideri che Samba "
+"vinca l'elezione e diventi il server principale, devi impostare un livello "
+"superiore a quello del sistema operativo con il valore più alto nella tua "
+"LAN. Ad es.: os level = 34"
 
 #: ../bin/draksambashare:1096
 #, c-format
@@ -1815,18 +1973,31 @@ msgstr "Modalità sicurezza"
 
 #: ../bin/draksambashare:1122
 #, c-format
-msgid "User level: the client sends a session setup request directly following protocol negotiation. This request provides a username and password."
-msgstr "Livello Utente: il client manda direttamente la richiesta di inizio sessione secondo la negoziazione di protocollo. Questa richiesta fornisce utente e password."
+msgid ""
+"User level: the client sends a session setup request directly following "
+"protocol negotiation. This request provides a username and password."
+msgstr ""
+"Livello Utente: il client manda direttamente la richiesta di inizio sessione "
+"secondo la negoziazione di protocollo. Questa richiesta fornisce utente e "
+"password."
 
 #: ../bin/draksambashare:1122
 #, c-format
 msgid "Share level: the client authenticates itself separately for each share"
-msgstr "Livello Condivisione: Il client si autentica separatamente ad ogni condivisione."
+msgstr ""
+"Livello Condivisione: Il client si autentica separatamente ad ogni "
+"condivisione."
 
 #: ../bin/draksambashare:1122
 #, 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 "Livello Dominio: fornisce un meccanismo per memorizzare tutti gli account utente e gruppi in un archivio centralizzato condiviso. tale archivio è condiviso tra i controller di dominio."
+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 ""
+"Livello Dominio: fornisce un meccanismo per memorizzare tutti gli account "
+"utente e gruppi in un archivio centralizzato condiviso. tale archivio è "
+"condiviso tra i controller di dominio."
 
 #: ../bin/draksambashare:1133
 #, c-format
@@ -1840,8 +2011,11 @@ msgstr "Banner del server"
 
 #: ../bin/draksambashare:1138
 #, c-format
-msgid "The banner is the way this server will be described in the Windows workstations."
-msgstr "Il banner è ciò che descrive un server nelle stazioni di lavoro Windows."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"Il banner è ciò che descrive un server nelle stazioni di lavoro Windows."
 
 #: ../bin/draksambashare:1143
 #, c-format
@@ -1860,18 +2034,26 @@ msgstr "Registro di Samba"
 
 #: ../bin/draksambashare:1154
 #, c-format
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
-msgstr "File registro: utilizza file.%m per disporre di un file di registro separato per ogni macchina che si collega"
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
+"File registro: utilizza file.%m per disporre di un file di registro separato "
+"per ogni macchina che si collega"
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Livello del registro: imposta il dettaglio delle registrazioni (0 <= livello <= 10)"
+msgstr ""
+"Livello del registro: imposta il dettaglio delle registrazioni (0 <= livello "
+"<= 10)"
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Max Log size: put a capping on the size of the log files (in Kb)."
-msgstr "Dimensione massima del registro: limita la grandezza dei file registro (in Kb)."
+msgstr ""
+"Dimensione massima del registro: limita la grandezza dei file registro (in "
+"Kb)."
 
 #: ../bin/draksambashare:1161 ../bin/draksambashare:1179
 #, c-format
@@ -1891,19 +2073,27 @@ msgstr "Livello di registrazione:"
 #: ../bin/draksambashare:1168
 #, c-format
 msgid "The wizard collected the following parameters to configure Samba."
-msgstr "L'assistente ha raccolto questi parametri per la configurazione di Samba."
+msgstr ""
+"L'assistente ha raccolto questi parametri per la configurazione di Samba."
 
 #: ../bin/draksambashare:1168
 #, 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 ""
 "Se accetti questi valori per configurare il server, premi il tasto Avanti.\n"
 "Altrimenti, premi il tasto Indietro per correggerli."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Se in precedenza hai configurato delle condivisioni, esse saranno inserite in questa configurazione. Puoi usare 'drakwizard sambashare' per gestire le condivisioni."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run 'drakwizard sambashare' to manage your shares."
+msgstr ""
+"Se in precedenza hai configurato delle condivisioni, esse saranno inserite "
+"in questa configurazione. Puoi usare 'drakwizard sambashare' per gestire le "
+"condivisioni."
 
 #: ../bin/draksambashare:1176
 #, c-format
@@ -2294,15 +2484,19 @@ msgstr "Misura locale"
 
 #: ../bin/net_monitor:512
 #, c-format
-msgid "Warning, another internet connection has been detected, maybe using your network"
-msgstr "Attenzione, è stata individuata un'altra connessione ad Internet, forse attraverso la rete locale"
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"Attenzione, è stata individuata un'altra connessione ad Internet, forse "
+"attraverso la rete locale"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Non connesso"
@@ -2367,7 +2561,7 @@ msgstr "Attiva la contabilizzazione del traffico"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Consenti a Network Manager di controllare l'interfaccia"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrica"
@@ -2380,7 +2574,8 @@ msgstr "MTU"
 #: ../lib/network/connection.pm:253
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
-msgstr "Dimensione massima dei messaggi in rete (MTU). Nel dubbio, lascia in bianco."
+msgstr ""
+"Dimensione massima dei messaggi in rete (MTU). Nel dubbio, lascia in bianco."
 
 #: ../lib/network/connection.pm:333
 #, c-format
@@ -2407,19 +2602,22 @@ msgstr "Modem via cavo"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Usa BPALogin (necessario per Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autenticazione"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Login dell'account (nome utente)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Password dell'account"
@@ -2516,7 +2714,9 @@ msgstr "Interfaccia virtuale"
 #: ../lib/network/connection/ethernet.pm:60
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Impossibile trovare l'interfaccia di rete per la periferica scelta (con il driver %s)"
+msgstr ""
+"Impossibile trovare l'interfaccia di rete per la periferica scelta (con il "
+"driver %s)"
 
 #: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
@@ -2544,13 +2744,15 @@ msgstr ""
 "Ogni dato dovrebbe essere inserito come indirizzo IP\n"
 "in notazione decimale puntata (ad esempio 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Ottieni i server DNS da DHCP"
@@ -2573,24 +2775,30 @@ msgstr "Dominio di ricerca"
 #: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
-msgstr "Salvo modifiche, si usa un dominio di ricerca estratto dal nome completo dell'host "
+msgstr ""
+"Salvo modifiche, si usa un dominio di ricerca estratto dal nome completo "
+"dell'host "
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Timeout DHCP (in secondi)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Ottieni i server YP da DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Ottieni i server NTPD da DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nome host DHCP"
@@ -2601,11 +2809,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Non ricorrere a ZeroConf (rete 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "L'indirizzo IP deve essere nel formato 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "La maschera di rete (netmask) deve avere il formato 255.255.224.0"
@@ -2617,25 +2827,46 @@ msgstr "Attenzione: di solito l'indirizzo IP %s è riservato!"
 
 #: ../lib/network/connection/ethernet.pm:195
 #, c-format
-msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
-msgstr "%s è già utilizzato dalla connessione avviata al boot (%s). Per usare questo indirizzo con questa connessione, prima devi disattivare tutti gli altri dispositivi che lo usano o configurarli in modo che non partano al boot"
+msgid ""
+"%s is already used by a connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start at boot"
+msgstr ""
+"%s è già utilizzato dalla connessione avviata al boot (%s). Per usare questo "
+"indirizzo con questa connessione, prima devi disattivare tutti gli altri "
+"dispositivi che lo usano o configurarli in modo che non partano al boot"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
-msgstr "Assegna il nome host con quello fornito dal server DHCP (o generane uno univoco)"
+msgstr ""
+"Assegna il nome host con quello fornito dal server DHCP (o generane uno "
+"univoco)"
 
 #: ../lib/network/connection/ethernet.pm:223
 #, c-format
-msgid "This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically."
-msgstr "Questo permetterà al server di fornire un nome a questa macchina. Se il server non fornisce un nome host valido, esso verrà generato automaticamente."
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+"Questo permetterà al server di fornire un nome a questa macchina. Se il "
+"server non fornisce un nome host valido, esso verrà generato automaticamente."
 
 #: ../lib/network/connection/ethernet.pm:226
 #, c-format
-msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
-msgstr "Devi definire un nome host per questa macchina che la identificherà. Nota che il nome host sarà condiviso con tutte le connessioni di rete. Se non definito sarà usato il nome host \"'localhost.localdomain\"."
+msgid ""
+"You should define a hostname for this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections.  If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+"Devi definire un nome host per questa macchina che la identificherà. Nota "
+"che il nome host sarà condiviso con tutte le connessioni di rete. Se non "
+"definito sarà usato il nome host \"'localhost.localdomain\"."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Collegamento a caldo della rete"
@@ -2653,7 +2884,9 @@ msgstr "Segnale di linea rilevato sull'interfaccia %s"
 #: ../lib/network/connection/ethernet.pm:307
 #, c-format
 msgid "Requesting a network address on interface %s (%s protocol)..."
-msgstr "Richiesta in corso di un indirizzo di rete per l'interfaccia %s (protocollo %s)..."
+msgstr ""
+"Richiesta in corso di un indirizzo di rete per l'interfaccia %s (protocollo "
+"%s)..."
 
 #: ../lib/network/connection/ethernet.pm:308
 #, c-format
@@ -2663,7 +2896,9 @@ msgstr "Ottenuto un indirizzo di rete per l'interfaccia %s (protocollo %s)"
 #: ../lib/network/connection/ethernet.pm:309
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
-msgstr "Non è stato possibile ottenere un indirizzo di rete per l'interfaccia %s (protocollo %s)"
+msgstr ""
+"Non è stato possibile ottenere un indirizzo di rete per l'interfaccia %s "
+"(protocollo %s)"
 
 #: ../lib/network/connection/isdn.pm:8
 #, c-format
@@ -2704,27 +2939,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem telefonico analogico (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Basata su script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Basata su terminale"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3883,88 +4123,95 @@ msgstr "Chiave WPA/WPA2 pre-condivisa"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 aziendale"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Driver Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
-msgstr "La scheda wireless è disattivata, abilitare prima lo switch (Interruttore disabilitazione RF)."
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
+msgstr ""
+"La scheda wireless è disattivata, abilitare prima lo switch (Interruttore "
+"disabilitazione RF)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Impostazioni wireless"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Modo di operare"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Punto punto (Ad-hoc)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Con access point (Managed)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Come access point (Master)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Ripetitore"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secondario"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nome rete (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Modalità cifratura"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Chiave di cifratura"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Nasconde la password"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Forza l'uso di questa chiave come una stringa ASCII (es. per Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Login/nome utente EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3975,12 +4222,12 @@ msgstr ""
 "Se devi specificare il dominio allora prova la sintassi non collaudata\n"
 "  DOMINO\\ nomeutente"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Password EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4005,19 +4252,20 @@ msgstr ""
 "usare per l'autenticazione. Modi EAP\n"
 "   Auto Detect: vengono provati tutti i modi.\n"
 "\n"
-"Se l'Auto Detect fallisce, prova la combinazione PEAP TTLS prima delle altre\n"
+"Se l'Auto Detect fallisce, prova la combinazione PEAP TTLS prima delle "
+"altre\n"
 "Nota:\n"
 "I parametri MD5, MSCHAPV2, OTP e GTC implicano\n"
 "automaticamente i modi PEAP e TTLS.\n"
 "Il modo TLS è basato completamente su certificati e potrebbe ignorare\n"
 "i valori nomeutente e password qui specificati."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Certificato client EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4030,83 +4278,98 @@ msgstr ""
 "considerata un'alternativa all'accoppiata nomeutente/password.\n"
 "Nota: gli altri parametri sono mostrati nella pagina Impostazioni Avanzate."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID rete"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frequenza operativa"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Soglia di sensibilità"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, 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 ""
-"RTS/CTS antepone un carattere di controllo alla trasmissione di ogni pacchetto  per\n"
-"essere sicuri che il canale sia libero. Ciò aumenta il traffico, ma anche la performance\n"
+"RTS/CTS antepone un carattere di controllo alla trasmissione di ogni "
+"pacchetto  per\n"
+"essere sicuri che il canale sia libero. Ciò aumenta il traffico, ma anche la "
+"performance\n"
 "se ci sono nodi nascosti o molti nodi attivi. Questi parametri fissano la\n"
 "dimensione del pacchetto più piccolo per cui il nodo invia un RTS, un\n"
-"valore uguale a quello massimo disabilita lo schema. Puoi anche porre questo\n"
+"valore uguale a quello massimo disabilita lo schema. Puoi anche porre "
+"questo\n"
 "parametro uguale a \"auto\", \"fixed\" o \"off\"."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Frammentazione"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 "Argomenti aggiuntivi per il\n"
 "comando iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 ""
 "Qui puoi assegnare alcuni parametri supplementari per il wireless, ad es.:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (nick è già messo uguale all'hostname).\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick è già messo "
+"uguale all'hostname).\n"
 "\n"
 "Vedi la pagina man di iwconfig(8) per ulteriori informazioni."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 "Argomenti aggiuntivi per il\n"
 "comando iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4117,7 +4380,8 @@ msgid ""
 "\n"
 "See iwpspy(8) man page for further information."
 msgstr ""
-"iwspy è utilizzato per preparare un elenco di indirizzi di una interfaccia di\n"
+"iwspy è utilizzato per preparare un elenco di indirizzi di una interfaccia "
+"di\n"
 "rete wireless e verificare la qualità del collegamento con ognuno di essi.\n"
 "\n"
 "L'informazione ottenuta è la stessa disponibile in /proc/net/wireless :\n"
@@ -4125,23 +4389,27 @@ msgstr ""
 "\n"
 "Sulla pagina man di iwpspy(8) puoi trovare ulteriori informazioni."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 "Argomenti aggiuntivi per\n"
 "il comando iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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."
@@ -4156,28 +4424,28 @@ msgstr ""
 "\n"
 "Sulla pagina man di iwpriv(8) puoi trovare ulteriori informazioni."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protocollo EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Riconoscimento Automatico"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4186,67 +4454,67 @@ msgstr ""
 "È preferibile usare il Riconoscimento Automatico in quanto prova prima il \n"
 "WPA versione 2 e poi passa al WPA versione 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Modo EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4255,12 +4523,12 @@ msgstr ""
 "lista dei protocolli di gestione delle chiavi di autenticazione accettati.\n"
 "I valori possibili sono WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Identità EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4271,12 +4539,12 @@ msgstr ""
 "come l'identità non crittografata per i tipi di EAS che supportano\n"
 " differenti identità incanalate; es. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP Fase 2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4289,12 +4557,12 @@ msgstr ""
 "auth=MSCHAPV2 per PEAP o\n"
 "autheap=MSCHAPV2 autheap=MD5 per TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Certificato EAP CA"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4304,16 +4572,18 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 "Percorso completo per il file contenente il certificato CA (PEM/DER).\n"
-"Questo file può contenere uno o più certificati CA. Se i ca_cert non sono inclusi\n"
-"il certificato del server non potrà essere verificato. Qualora sia possibile si dovrebbe sempre usare un certificato CA verificato\n"
+"Questo file può contenere uno o più certificati CA. Se i ca_cert non sono "
+"inclusi\n"
+"il certificato del server non potrà essere verificato. Qualora sia possibile "
+"si dovrebbe sempre usare un certificato CA verificato\n"
 "quando si usa TLS, TTLS o PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Corrispondenza nel certificato EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4325,15 +4595,16 @@ msgstr ""
 "Stringa da confrontare con il soggetto del\n"
 "certificato del server di autenticazione. Se si usa questa stringa\n"
 " il certificato del server verrà accettato solo se contiene\n"
-"questa stringa nel soggetto. La stringa del soggetto è nel seguente formato:\n"
+"questa stringa nel soggetto. La stringa del soggetto è nel seguente "
+"formato:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Direttive aggiuntive"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4351,7 +4622,8 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 "Qui si possono specificare parametri extra per il wpa_supplicant\n"
-"Il formato da usare per le stringhe è quello delle coppie campo=valore. Si possono specificare più valori, separandoli col carattere #.\n"
+"Il formato da usare per le stringhe è quello delle coppie campo=valore. Si "
+"possono specificare più valori, separandoli col carattere #.\n"
 "Nota: i parametri sono passati senza controllo e possono \n"
 " causare il fallimento della negoziazione wpa senza avviso alcuno\n"
 "I parametri supportati sono preservati durante l'editing.\n"
@@ -4363,42 +4635,58 @@ msgstr ""
 "\tAltri come key_mgmt, eap possono essere usati per forzare\n"
 "\tparametri speciali, differenti da quelli presenti nell'interfaccia utente."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "È richiesta una chiave di cifratura"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
-msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
-msgstr "La chiave pre.condivisa dovrebbe avere tra gli 8 ed i 63 caratteri ASCII, o 64 caratteri esadecimali."
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+"La chiave pre.condivisa dovrebbe avere tra gli 8 ed i 63 caratteri ASCII, o "
+"64 caratteri esadecimali."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
-msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
-msgstr "La chiave WEP dovrebbe avere al massimo %d caratteri ASCII o %d caratteri esadecimali."
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+"La chiave WEP dovrebbe avere al massimo %d caratteri ASCII o %d caratteri "
+"esadecimali."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 "La frequenza deve avere un suffisso k, M o G (ad es. \"2.46G\" per 2.46 GHz), o un numero sufficiente di \"0\" (zeri)."
+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 ""
+"La frequenza deve avere un suffisso k, M o G (ad es. \"2.46G\" per 2.46 "
+"GHz), o un numero sufficiente di \"0\" (zeri)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "Il \"rate\" dovrebbe avere un suffisso k, M o G (ad es. \"11M\" per 11Mb), o un numero sufficiente di \"0\" (zeri)."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Il \"rate\" dovrebbe avere un suffisso k, M o G (ad es. \"11M\" per 11Mb), o "
+"un numero sufficiente di \"0\" (zeri)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Permetti access point roaming"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Associata alla rete wireless \"%s\" l'interfaccia %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Persa l'associazione alla rete wireless sull'interfaccia %s"
@@ -4416,18 +4704,24 @@ msgstr "Modem USB Alcatel speedtouch"
 #: ../lib/network/connection/xdsl.pm:125
 #, 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 ""
-"Il modem ECI Hi-Focus non è supportato per problemi di distribuzione del driver binario.\n"
+"Il modem ECI Hi-Focus non è supportato per problemi di distribuzione del "
+"driver binario.\n"
 "\n"
 "Puoi trovare un driver su http://eciadsl.flashtux.org/"
 
 #: ../lib/network/connection/xdsl.pm:185
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
-msgstr "I modem che usano i chipset Conexant AccessRunner non possono essere supportati per problemi di distribuzione del firmware binario."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
+msgstr ""
+"I modem che usano i chipset Conexant AccessRunner non possono essere "
+"supportati per problemi di distribuzione del firmware binario."
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4540,6 +4834,285 @@ msgstr "Connetti"
 msgid "Hostname changed to \"%s\""
 msgstr "Il nome dell'host è diventato \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Interfaccia di rete"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Indica l'interfaccia di rete da configurare:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Si è verificato un problema durante il riavvio della rete: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Ottimo, hai completato la configurazione della rete e di Internet."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Gestione delle connessioni VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Dispositivo: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Configurazione VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Server DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Dominio di ricerca"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatico"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Attivato al boot"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Modalità di chiamata"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Velocità connessione"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Timeout connessione (in sec.)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Numero telefonico del provider"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Connessione Modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Scegli file"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ della scheda"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memoria della scheda (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO della scheda"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 della scheda"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocollo europeo (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocollo per il resto del mondo \n"
+"senza D-Channel (linee in affitto)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modulo"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Indirizzo reale"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Bielorussia"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "L'indirizzo del Gateway deve essere nel formato 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interfaccia"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Connessione a Internet non configurata"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Non hai nessuna connessione internet configurata.\n"
+"Esegui l'assistente \"%s\" dal Centro di Controllo Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Primo server DNS (opzionale)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primo server DNS (opzionale)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Secondo server DNS (opzionale)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Primo server DNS (opzionale)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configurazione della connessione"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Accesso stampanti"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Tempo di connessione: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Stato"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Sto provando la connessione..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Parametri IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4731,10 +5304,12 @@ msgstr "Registra i messaggi del firewall nel registro di sistema"
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
-"Puoi essere avvisato quando qualcuno accede ad un servizio o tenta un'intrusione.\n"
+"Puoi essere avvisato quando qualcuno accede ad un servizio o tenta "
+"un'intrusione.\n"
 "Seleziona quali attività di rete devono essere monitorate."
 
 #: ../lib/network/drakfirewall.pm:316
@@ -4747,11 +5322,6 @@ msgstr "Usa il firewall interattivo"
 msgid "No device found"
 msgstr "Nessun dispositivo rilevato"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Dispositivo: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4780,7 +5350,8 @@ msgstr "Scegli il tipo di VPN"
 #: ../lib/network/drakvpn.pm:49
 #, c-format
 msgid "Initializing tools and detecting devices for %s..."
-msgstr "Inizializzazione degli strumenti e rilevamento delle periferiche per %s..."
+msgstr ""
+"Inizializzazione degli strumenti e rilevamento delle periferiche per %s..."
 
 #: ../lib/network/drakvpn.pm:52
 #, c-format
@@ -4827,14 +5398,17 @@ msgstr "Vuoi avviare la connessione ora?"
 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 ""
 "La connessione VPN ora è configurata.\n"
 "\n"
-"Questa connessione VPN può essere avviata automaticamente con una connessione di rete.\n"
-"Questo può esser fatto riconfigurando la connessione di rete e selezionando questa VPN.\n"
+"Questa connessione VPN può essere avviata automaticamente con una "
+"connessione di rete.\n"
+"Questo può esser fatto riconfigurando la connessione di rete e selezionando "
+"questa VPN.\n"
 
 #: ../lib/network/ifw.pm:132
 #, c-format
@@ -4888,11 +5462,14 @@ msgstr "Un attacco \"%s\" è stato tentato da %s"
 
 #: ../lib/network/ifw.pm:151
 #, c-format
-msgid "The \"%s\" application is trying to make a service (%s) available to the network."
-msgstr "L'applicazione \"%s\" sta tentando di fornire un servizio (%s) disponibile per la rete."
+msgid ""
+"The \"%s\" application is trying to make a service (%s) available to the "
+"network."
+msgstr ""
+"L'applicazione \"%s\" sta tentando di fornire un servizio (%s) disponibile "
+"per la rete."
 
-#. -PO: this should be kept lowercase since the expression is meant to be used
-#. between brackets
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -4919,7 +5496,8 @@ msgstr "Automatico"
 #: ../lib/network/ndiswrapper.pm:30
 #, c-format
 msgid "No device supporting the %s ndiswrapper driver is present!"
-msgstr "Non è presente alcun dispositivo che supporti il driver ndiswrapper %s!"
+msgstr ""
+"Non è presente alcun dispositivo che supporti il driver ndiswrapper %s!"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
@@ -4928,8 +5506,14 @@ msgstr "Seleziona il driver corretto"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver description (.inf) file, or corresponding driver file (.dll or .o files). Note that only drivers up to Windows XP are supported."
-msgstr "Seleziona il file Windows di descrizione del driver (.inf), o il corrispondente file driver (.dll o .o). Nota che sono supportati i driver solo sino a Windows XP."
+msgid ""
+"Please select the Windows driver description (.inf) file, or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
+"Seleziona il file Windows di descrizione del driver (.inf), o il "
+"corrispondente file driver (.dll o .o). Nota che sono supportati i driver "
+"solo sino a Windows XP."
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4975,6 +5559,103 @@ msgstr "Installa un nuovo driver"
 msgid "Select a device:"
 msgstr "Seleziona un dispositivo:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Attacco ad un servizio"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Modalità automatica del firewall interattivo"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Come vuoi attivare questa connessione?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interfaccia di rete"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocollo"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Indirizzo IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Attacco ad un servizio"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Firewall interattivo"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Connessione wireless"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Come vuoi attivare questa connessione?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5018,20 +5699,6 @@ msgstr "Scheda ISDN interna"
 msgid "Protocol for the rest of the world"
 msgstr "Protocollo per il resto del mondo"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocollo europeo (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocollo per il resto del mondo \n"
-"senza D-Channel (linee in affitto)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5082,11 +5749,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Controllo connessione"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Sto provando la connessione..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5107,11 +5769,6 @@ msgstr "Il tuo numero di telefono"
 msgid "Provider name (ex provider.net)"
 msgstr "Nome del provider (es. provider.it)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Numero telefonico del provider"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5122,41 +5779,6 @@ msgstr "DNS 1 del provider (opzionale)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 del provider (opzionale)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Modalità di chiamata"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Velocità connessione"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Timeout connessione (in sec.)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ della scheda"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memoria della scheda (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO della scheda"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 della scheda"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5190,11 +5812,12 @@ 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"
-"Se hai una scheda ISA, i valori nella prossima schermata dovrebbero essere giusti.\n"
+"Se hai una scheda ISA, i valori nella prossima schermata dovrebbero essere "
+"giusti.\n"
 "\n"
 "Se hai una scheda PCMCIA, ti serve conoscere IRQ e I/O della tua scheda.\n"
 
@@ -5215,8 +5838,14 @@ msgstr "Qual tra queste è la tua scheda ISDN?"
 
 #: ../lib/network/netconnect.pm:461
 #, 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 "È disponibile un driver CAPI per questo modem. Il driver CAPI può offrire più funzionalità rispetto al driver \"free\" (per es. inviare fax). Che driver vuoi utilizzare?"
+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 ""
+"È disponibile un driver CAPI per questo modem. Il driver CAPI può offrire "
+"più funzionalità rispetto al driver \"free\" (per es. inviare fax). Che "
+"driver vuoi utilizzare?"
 
 #: ../lib/network/netconnect.pm:475
 #, c-format
@@ -5316,16 +5945,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nome dominio"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primo server DNS (opzionale)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Secondo server DNS (opzionale)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5383,16 +6002,23 @@ msgstr ""
 #: ../lib/network/netconnect.pm:770
 #, c-format
 msgid "Problems occurred during the network connectivity test."
-msgstr "Si è verificato un problema mentre si verificava la connessione alla rete."
+msgstr ""
+"Si è verificato un problema mentre si verificava la connessione alla rete."
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
-msgid "This can be caused by invalid network configuration, or problems with your modem or router."
-msgstr "Potrebbe essere stato causato da una configurazione errata o da problemi con modem o router."
+msgid ""
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+"Potrebbe essere stato causato da una configurazione errata o da problemi con "
+"modem o router."
 
 #: ../lib/network/netconnect.pm:772
 #, c-format
-msgid "You might want to relaunch the configuration to verify the connection settings."
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
 msgstr "Devi rilanciare la configurazione per verificare le impostazioni date."
 
 #: ../lib/network/netconnect.pm:775
@@ -5402,12 +6028,18 @@ msgstr "Ottimo, hai completato la configurazione della rete e di Internet."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
-msgid "However, the Internet connectivity test failed. You should test your connection manually, and verify your Internet modem or router."
-msgstr "Comunque, il test di connessione a Internet non è riuscito. Devi controllare manualmente il collegamento e verificare il tuo modem Internet o il router."
+msgid ""
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
+msgstr ""
+"Comunque, il test di connessione a Internet non è riuscito. Devi controllare "
+"manualmente il collegamento e verificare il tuo modem Internet o il router."
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
-msgid "If your connection does not work, you might want to relaunch the configuration."
+msgid ""
+"If your connection does not work, you might want to relaunch the "
+"configuration."
 msgstr "Se la connessione non funziona, devi rilanciare la configurazione."
 
 #: ../lib/network/netconnect.pm:778
@@ -5417,7 +6049,9 @@ msgstr "Ottimo, hai completato la configurazione della rete e di Internet."
 
 #: ../lib/network/netconnect.pm:779
 #, 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 ""
 "Quando avrai finito, ti raccomando di riavviare l'ambiente X\n"
 "per evitare problemi relativi al cambio di hostname."
@@ -5519,12 +6153,15 @@ msgstr "Il nome Zeroconf della macchina non può contenere un \".\""
 #: ../lib/network/netconnect.pm:813
 #, 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 ""
-"Dato che stai effettuando un'installazione via rete, quest'ultima è già configurata.\n"
-"Clicca su OK per mantenere questa configurazione, o su Annulla per riconfigurare la rete e la connessione ad Internet.\n"
+"Dato che stai effettuando un'installazione via rete, quest'ultima è già "
+"configurata.\n"
+"Clicca su OK per mantenere questa configurazione, o su Annulla per "
+"riconfigurare la rete e la connessione ad Internet.\n"
 
 #: ../lib/network/netconnect.pm:816
 #, c-format
@@ -5566,7 +6203,6 @@ msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
-""
 msgstr ""
 "Hai configurato diversi tipi di connessione ad Internet.\n"
 "Scegli quello che vuoi usare.\n"
@@ -5584,8 +6220,12 @@ msgstr "Sto configurando il dispositivo di rete %s (driver %s)"
 
 #: ../lib/network/netconnect.pm:824
 #, c-format
-msgid "The following protocols can be used to configure a LAN connection. Please choose the one you want to use."
-msgstr "Puoi usare uno di questi protocolli per configurare la connessione LAN. Devi indicare quello che vuoi usare."
+msgid ""
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use."
+msgstr ""
+"Puoi usare uno di questi protocolli per configurare la connessione LAN. Devi "
+"indicare quello che vuoi usare."
 
 #: ../lib/network/netconnect.pm:825
 #, c-format
@@ -5603,18 +6243,14 @@ msgstr ""
 #: ../lib/network/netconnect.pm:830
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr "Per finire, ma è importante, puoi anche inserire i tuoi indirizzi DNS e IP."
+msgstr ""
+"Per finire, ma è importante, puoi anche inserire i tuoi indirizzi DNS e IP."
 
 #: ../lib/network/netconnect.pm:831
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "L'indirizzo del server DNS deve essere nel formato 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "L'indirizzo del Gateway deve essere nel formato 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5636,8 +6272,12 @@ msgstr "Impostazioni di rete avanzate"
 
 #: ../lib/network/network.pm:524
 #, c-format
-msgid "Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."
-msgstr "Qui puoi configurare le impostazioni avanzate per la rete. Attento che occorre riavviare la macchina affinché i cambiamenti abbiano effetto."
+msgid ""
+"Here you can configure advanced network settings. Please note that you have "
+"to reboot the machine for changes to take effect."
+msgstr ""
+"Qui puoi configurare le impostazioni avanzate per la rete. Attento che "
+"occorre riavviare la macchina affinché i cambiamenti abbiano effetto."
 
 #: ../lib/network/network.pm:526
 #, c-format
@@ -5696,8 +6336,12 @@ msgstr "Configurazione dei proxy"
 
 #: ../lib/network/network.pm:549
 #, c-format
-msgid "Here you can set up your proxies configuration (eg: http://my_caching_server:8080)"
-msgstr "Qui puoi impostare la configurazione dei proxy (es. http://my_caching_server:8080)"
+msgid ""
+"Here you can set up your proxies configuration (eg: http://"
+"my_caching_server:8080)"
+msgstr ""
+"Qui puoi impostare la configurazione dei proxy (es. http://"
+"my_caching_server:8080)"
 
 #: ../lib/network/network.pm:550
 #, c-format
@@ -5751,7 +6395,6 @@ msgid ""
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
-""
 msgstr ""
 "Seleziona le interfacce che saranno protette dal firewall.\n"
 "\n"
@@ -5783,13 +6426,16 @@ msgid ""
 "What do you want to do?"
 msgstr ""
 "La configurazione del firewall è stata modificata a mano e contiene\n"
-"regole che potrebbero entrare in conflitto con la configurazione appena impostata.\n"
+"regole che potrebbero entrare in conflitto con la configurazione appena "
+"impostata.\n"
 "Cosa si vuole fare?"
 
 #: ../lib/network/thirdparty.pm:144
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Servirebbero alcune componenti (%s), ma non sono disponibili per i dispositivi %s."
+msgstr ""
+"Servirebbero alcune componenti (%s), ma non sono disponibili per i "
+"dispositivi %s."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
@@ -5800,8 +6446,11 @@ msgstr "Servono alcuni pacchetti (%s) ma non sono disponibili."
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
-msgstr "Questi pacchetti si trovano nella nel %s o nel repository ufficiale dei pacchetti %s."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
+msgstr ""
+"Questi pacchetti si trovano nella nel %s o nel repository ufficiale dei "
+"pacchetti %s."
 
 #: ../lib/network/thirdparty.pm:152
 #, c-format
@@ -5859,8 +6508,12 @@ msgstr "Inserisci floppy"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
-msgstr "Inserisci un floppy formattato FAT nell'unità %s con %s nella directory root e premi %s"
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
+msgstr ""
+"Inserisci un floppy formattato FAT nell'unità %s con %s nella directory root "
+"e premi %s"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
diff --git a/po/ja.po b/po/ja.po
index 957c75e..3aaa82b 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-03-22 21:05+0900\n"
 "Last-Translator: Yukiko Bando <ybando@k6.dion.ne.jp>\n"
 "Language-Team: Japanese <mageia-i18n@mandrivalinux.org>\n"
@@ -30,14 +30,16 @@ msgid "Interface"
 msgstr "インターフェース"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP アドレス"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "プロトコル"
@@ -73,23 +75,27 @@ msgid "Configure Local Area Network..."
 msgstr "LAN を設定..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "ヘルプ"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "適用"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "キャンセル"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -99,7 +105,8 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -108,7 +115,7 @@ msgstr "OK"
 msgid "Please wait"
 msgstr "お待ちください"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "設定を適用しています。お待ちください..."
@@ -144,6 +151,7 @@ msgstr "アダプタ %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "ネットマスク"
@@ -159,6 +167,7 @@ msgid "Started on boot"
 msgstr "起動時に開始"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP クライアント"
@@ -173,17 +182,19 @@ msgstr ""
 "Mageia コントロールセンターの「%s」を実行してください。"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "新しいネットワーク・インターフェースを設定 (LAN/ISDN/ADSL...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IP なし"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "マスクなし"
@@ -249,12 +260,12 @@ msgstr ""
 "\n"
 "どうしますか？"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "無効にする"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "有効にする"
@@ -270,8 +281,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "インターネットに直接接続するネットワークインターフェースを選んでください。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "ネットデバイス"
@@ -337,7 +348,11 @@ msgstr "内部ドメイン名"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -628,13 +643,14 @@ msgstr "許可するアドレス"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "対話式ファイアウォール"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "デーモンに接続できません"
@@ -644,12 +660,12 @@ msgstr "デーモンに接続できません"
 msgid "Log"
 msgstr "ログ"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "許可"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "ブロック"
@@ -676,12 +692,12 @@ msgstr "ブロックするサービス"
 msgid "Clear logs"
 msgstr "ログを消去"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "ブラックリスト"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "ホワイトリスト"
@@ -831,7 +847,7 @@ msgstr "モード"
 msgid "Enabled"
 msgstr "有効にする"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "説明"
@@ -873,9 +889,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -2419,12 +2435,12 @@ msgstr ""
 "警告: 別のインターネット接続を検出しました。\n"
 "あなたのネットワークを使用しているようです。"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "接続完了"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "接続していません"
@@ -2489,7 +2505,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metric"
@@ -2529,19 +2545,22 @@ msgstr "ケーブルモデム"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin を使う (Telstra に必要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "認証"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "アカウントのログイン (ユーザ名)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "アカウントのパスワード"
@@ -2668,13 +2687,15 @@ msgstr ""
 "それぞれの項目にはドット区切の形式で IP アドレスを入れてください。\n"
 "(例: 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "ゲートウェイ"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS サーバを DHCP から取得"
@@ -2700,21 +2721,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "検索ドメインはデフォルトで完全修飾ホスト名から設定されます。"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP のタイムアウト (秒)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP サーバを DHCP から取得"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD サーバを DHCP から取得"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP ホスト名"
@@ -2725,11 +2750,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Zeroconf (169.254.0.0 ネットワーク) にフォールバックしない"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP アドレスは 1.2.3.4 のように入力してください"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ネットマスクは 255.255.224.0 のように入力してください"
@@ -2751,6 +2778,7 @@ msgstr ""
 "が起動時に開始しないように設定してください。"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "DHCP アドレスからホスト名を割り当てる"
@@ -2772,6 +2800,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
@@ -2842,27 +2871,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "アナログ電話モデム (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "スクリプトを使う認証"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "ターミナルからの認証"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4021,12 +4055,12 @@ msgstr "WPA/WPA2 事前共有鍵"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows ドライバ"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4035,78 +4069,81 @@ msgstr ""
 "ワイヤレスカードが無効になっています。先にワイヤレススイッチ (RF Kill スイッ"
 "チ) を有効にしてください。"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "ワイヤレスの設定"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "操作モード"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "マスター"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "リピータ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "セカンダリ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "ネットワーク名 (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "暗号化モード"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "暗号鍵"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "パスワード"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "この鍵を強制的に ASCII 文字列として使う (例えば Livebox 用)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP ログイン/ユーザ名"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4114,12 +4151,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP パスワード"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4138,12 +4175,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP クライアント証明書"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4152,32 +4189,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ネットワーク ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "動作周波数"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "感度のしきい値"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "ビットレート (b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4197,17 +4239,19 @@ msgstr ""
 "のメカニズムを無効にする最大パケットサイズと同じです。\n"
 "このパラメータを auto/fixed/off に設定することもできます。"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "フラグメンテーション"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4223,12 +4267,13 @@ msgstr ""
 "詳しくは man iwconfig(8) を参照してください。"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4247,12 +4292,13 @@ msgstr ""
 "\n"
 "詳しくは man iwspy(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv コマンドの補助引数"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4276,28 +4322,28 @@ msgstr ""
 "明されています。\n"
 "詳しくは man iwpriv(8) を参照してください。"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP プロトコル"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "自動検出"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4306,79 +4352,79 @@ msgstr ""
 "自動検出は最初に WPA のバージョン 2 を試し、使えない場合は\n"
 "バージョン 1 にフォールバックするので、これをお勧めします。"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP モード"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4386,12 +4432,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP フェーズ 2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4400,12 +4446,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 証明書"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4415,12 +4461,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4430,12 +4476,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4453,26 +4499,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "暗号鍵が必要です。"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4481,7 +4527,7 @@ msgstr ""
 "単位は k, M, G で入力してください (2.46 GHz の場合は 2.46G)。\n"
 "もしくは 0 (ゼロ) で桁を増やしてください。"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4490,17 +4536,17 @@ msgstr ""
 "単位は k, M, G で入力してください (例: 11M)。\n"
 "もしくは 0 (ゼロ) で桁を増やしてください。"
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "アクセスポイントローミングを許可"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "インターフェース %s のワイヤレスネットワーク \"%s\" に関連付けました"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "インターフェース %s のワイヤレスネットワークへの関連付けが失われました"
@@ -4647,6 +4693,287 @@ msgstr "接続"
 msgid "Hostname changed to \"%s\""
 msgstr "ホスト名が \"%s\" に変わりました"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"イーサネットアダプタを検出できませんでした。\n"
+"ハードウェア設定ツールを実行してください。"
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "リモートネットワークインターフェース"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "設定するネットワークインターフェースを選択:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"\"%s\" ネットワークインターフェースを削除中にエラー発生:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "\"%s\" ネットワークインターフェースを削除しました"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "接続を管理"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "デバイス: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP 設定"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS サーバ"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "ドメイン検索"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "なし"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "スタティック"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "起動時に開始"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "ダイアルモード"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "接続の速度"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "接続のタイムアウト (秒)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "プロバイダの電話番号"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "フロー制御"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "LT (終端装置)"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "モデムのタイムアウト"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "ロックファイルを使う"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "ダイアル前にトーンを待つ"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "ビジー待ち"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "モデムの音"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "カード IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "カード mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "カード IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "カード IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "ヨーロッパのプロトコル (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"その他のプロトコル\n"
+"No D-Channel (leased lines)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "ベンダー"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "メディアクラス"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "モジュール名"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Mac アドレス"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "バス"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "バスの位置"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "ゲートウェイのアドレスは 1.2.3.4 のように入力してください"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "ゲートウェイ:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "インターフェース:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "インターネット接続の設定"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"インターネットの接続が設定されていません。\n"
+"Mageia コントロールセンターの「%s」を実行してください。"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "ホスト名 (オプション)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "プライマリ DNS サーバ (オプション)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "セカンド DNS サーバ (オプション)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "サード DNS サーバ (オプション)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "インターネット接続の設定"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "インターネット"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "接続の種類: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "状態:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "接続をテストしています..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "パラメータ"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4853,11 +5180,6 @@ msgstr "対話式ファイアウォールを使う"
 msgid "No device found"
 msgstr "デバイスが見つかりません"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "デバイス: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5088,6 +5410,103 @@ msgstr "新しいドライバをインストール"
 msgid "Select a device:"
 msgstr "デバイスを選択:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr "攻撃を処理"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "対話型ファイアウォール: 侵入を検知しました "
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "この攻撃者をどうしますか？"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "攻撃の詳細"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "攻撃の時間: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "ネットワークインターフェース: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "攻撃のタイプ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "プロトコル: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "攻撃者の IP アドレス: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "攻撃者のホスト名: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "攻撃されたサービス: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "攻撃されたポート: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "ICMP 攻撃のタイプ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "常にブラックリストに載せる (今後は確認しない)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "無視"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "対話型ファイアウォール: 新しいサービス"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, c-format
+msgid "Process connection"
+msgstr "接続を処理"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "このサービスを開きますか？"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "この答えを記憶する"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5131,20 +5550,6 @@ msgstr "内蔵 ISDN カード"
 msgid "Protocol for the rest of the world"
 msgstr "その他のプロトコル"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "ヨーロッパのプロトコル (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"その他のプロトコル\n"
-"No D-Channel (leased lines)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5195,11 +5600,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "接続のコントロール"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "接続をテストしています..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5220,11 +5620,6 @@ msgstr "あなたの電話番号"
 msgid "Provider name (ex provider.net)"
 msgstr "プロバイダの名前 (例: provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "プロバイダの電話番号"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5235,41 +5630,6 @@ msgstr "プロバイダの DNS 1 (オプション)"
 msgid "Provider DNS 2 (optional)"
 msgstr "プロバイダの DNS 2 (オプション)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "ダイアルモード"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "接続の速度"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "接続のタイムアウト (秒)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "カード IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "カード mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "カード IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "カード IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5435,16 +5795,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "ドメイン名"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "プライマリ DNS サーバ (オプション)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "セカンド DNS サーバ (オプション)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5755,11 +6105,6 @@ msgstr "DNS サーバの IP アドレスも入力できます。"
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS サーバのアドレスは 1.2.3.4 のように入力してください"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "ゲートウェイのアドレスは 1.2.3.4 のように入力してください"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6236,16 +6581,6 @@ msgstr "特定の UDP ポートを使う"
 #~ "\n"
 #~ "このアダプタで LAN を設定します。"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "イーサネットアダプタを検出できませんでした。\n"
-#~ "ハードウェア設定ツールを実行してください。"
-
-#~ msgid "Connection type: "
-#~ msgstr "接続の種類: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s は既に使用されています\n"
 
@@ -7230,9 +7565,6 @@ msgstr "特定の UDP ポートを使う"
 #~ msgid "discard"
 #~ msgstr "破棄"
 
-#~ msgid "none"
-#~ msgstr "なし"
-
 #~ msgid "tunnel"
 #~ msgstr "トンネル"
 
@@ -7260,176 +7592,15 @@ msgstr "特定の UDP ポートを使う"
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "変更を有効にするには再ログインしてください。"
 
-#~ msgid "Process attack"
-#~ msgstr "攻撃を処理"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "対話型ファイアウォール: 侵入を検知しました "
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "この攻撃者をどうしますか？"
-
-#~ msgid "Attack details"
-#~ msgstr "攻撃の詳細"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "攻撃の時間: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "ネットワークインターフェース: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "攻撃のタイプ: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "プロトコル: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "攻撃者の IP アドレス: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "攻撃者のホスト名: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "攻撃されたサービス: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "攻撃されたポート: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "ICMP 攻撃のタイプ: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "常にブラックリストに載せる (今後は確認しない)"
-
-#~ msgid "Ignore"
-#~ msgstr "無視"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "対話型ファイアウォール: 新しいサービス"
-
-#~ msgid "Process connection"
-#~ msgstr "接続を処理"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "このサービスを開きますか？"
-
-#~ msgid "Remember this answer"
-#~ msgstr "この答えを記憶する"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Cisco-UDP カプセル化を使う"
 
-#~ msgid "Gateway:"
-#~ msgstr "ゲートウェイ:"
-
-#~ msgid "Interface:"
-#~ msgstr "インターフェース:"
-
-#~ msgid "Manage connections"
-#~ msgstr "接続を管理"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP 設定"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS サーバ"
-
-#~ msgid "Search Domain"
-#~ msgstr "ドメイン検索"
-
-#~ msgid "static"
-#~ msgstr "スタティック"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "起動時に開始"
-
-#~ msgid "Flow control"
-#~ msgstr "フロー制御"
-
-#~ msgid "Line termination"
-#~ msgstr "LT (終端装置)"
-
-#~ msgid "Modem timeout"
-#~ msgstr "モデムのタイムアウト"
-
-#~ msgid "Use lock file"
-#~ msgstr "ロックファイルを使う"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "ダイアル前にトーンを待つ"
-
-#~ msgid "Busy wait"
-#~ msgstr "ビジー待ち"
-
-#~ msgid "Modem sound"
-#~ msgstr "モデムの音"
-
-#~ msgid "Vendor"
-#~ msgstr "ベンダー"
-
-#~ msgid "Media class"
-#~ msgstr "メディアクラス"
-
-#~ msgid "Module name"
-#~ msgstr "モジュール名"
-
-#~ msgid "Mac Address"
-#~ msgstr "Mac アドレス"
-
-#~ msgid "Bus"
-#~ msgstr "バス"
-
-#~ msgid "Location on the bus"
-#~ msgstr "バスの位置"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "リモートネットワークインターフェース"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "\"%s\" ネットワークインターフェースを削除中にエラー発生:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "\"%s\" ネットワークインターフェースを削除しました"
-
 #~ msgid "Disconnect..."
 #~ msgstr "切断..."
 
 #~ msgid "Connect..."
 #~ msgstr "接続..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "インターネット接続の設定"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "ホスト名 (オプション)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "サード DNS サーバ (オプション)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "インターネット接続の設定"
-
-#~ msgid "Internet access"
-#~ msgstr "インターネット"
-
-#~ msgid "Status:"
-#~ msgstr "状態:"
-
-#~ msgid "Parameters"
-#~ msgstr "パラメータ"
-
 #~ msgid "Attacker"
 #~ msgstr "攻撃者"
 
diff --git a/po/ko.po b/po/ko.po
index 754fb11..048e3ef 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "인터페이스"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP 주소"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "프로토콜"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "지역 네트웍 설정..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "도움말"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "적용"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "취소"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "확인"
@@ -96,7 +102,8 @@ msgstr "확인"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "확인"
 msgid "Please wait"
 msgstr "기다려 주세요"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "기다려 주세요... 설정을 적용하고 있습니다."
@@ -141,6 +148,7 @@ msgstr "어댑터 %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "넷마스크"
@@ -156,6 +164,7 @@ msgid "Started on boot"
 msgstr "부팅시 시작됨"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 클라이언트"
@@ -170,17 +179,19 @@ msgstr ""
 "「설정」을 눌러 먼저 연결을 설정하세요."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "네트웍 인터페이스를 선택하세요."
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "잘못된 팩키지"
@@ -246,12 +257,12 @@ msgstr ""
 "\n"
 "무슨 작업을 하시겠습니까?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "사용불가"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "사용"
@@ -266,8 +277,8 @@ msgstr "재설정"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Xinetd 서비스"
@@ -333,7 +344,11 @@ msgstr "새 프린터 이름"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -620,13 +635,14 @@ msgstr "모든 사용자 허용"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "방화벽"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "분기할 수 없습니다: %s"
@@ -636,12 +652,12 @@ msgstr "분기할 수 없습니다: %s"
 msgid "Log"
 msgstr "기록"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "허용"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -668,12 +684,12 @@ msgstr "사용자 파일 백업"
 msgid "Clear logs"
 msgstr "모두 삭제"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -821,7 +837,7 @@ msgstr "모드"
 msgid "Enabled"
 msgstr "사용"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "설명"
@@ -863,9 +879,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "경고"
@@ -2325,12 +2341,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "연결됨"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "연결 안됨"
@@ -2395,7 +2411,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "단위"
@@ -2435,19 +2451,22 @@ msgstr "카드 모델:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "사용자 인증"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "로그인 계정(사용자명)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "계정 암호"
@@ -2570,13 +2589,15 @@ msgstr ""
 "각각의 항목은「.」으로 구분된 십진수 IP 주소로 입력해야 합니다.\n"
 "(예, 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "게이트웨이"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DHCP 서버 IP"
@@ -2602,21 +2623,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "연결 시간초과 (초)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "호스트명:"
@@ -2627,11 +2652,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 주소는 1.2.3.4과 같은 형식이어야 합니다."
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "IP 주소는 1.2.3.4과 같은 형식이어야 합니다."
@@ -2650,6 +2677,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "호스트 이름 또는 IP를 입력하세요."
@@ -2671,6 +2699,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "네트웍 환경 설정"
@@ -2739,27 +2768,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "스크립트 기반"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "터미날 기반"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3918,90 +3952,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "무선 연결"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "전문가 모드"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "언어 선택"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "마스터"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "복구"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "두번째"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "자동"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "암호화 키"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "암호"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "로그인 계정(사용자명)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4009,12 +4046,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "암호"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4033,12 +4070,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4047,32 +4084,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "네트웍"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4086,17 +4128,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "게임 스테이션"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4107,12 +4151,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4124,12 +4169,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4147,107 +4193,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "프로토콜"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "자동 검색"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "모드"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4255,12 +4301,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4269,12 +4315,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4284,12 +4330,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4299,12 +4345,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4322,50 +4368,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4507,6 +4553,289 @@ msgstr "연결"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"어떠한 네트웍 어댑터도 발견되지 않습니다. 하드웨어 설정 도구를 실행해 보세요."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "네트웍 인터페이스를 선택하세요."
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "네트웍 인터페이스를 선택하세요."
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"네트웍을 다시 시작하는 도중에 문제가 발생했습니다:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"축하합니다. 네트웍/인터넷 설정이 완료되었습니다.\n"
+"\n"
+"이제 설정이 시스템에 적용될 것입니다.\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "캐이블 연결"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "장치: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS 설정"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS 서버"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS 도메인"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "없음"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "IP 자동할당"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "부팅시 시작"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "다이얼링 모드"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "연결 속도"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "연결 시간초과 (초)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "공급자 전화번호"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "인터넷 스테이션"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "커널 부트 제한시간"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "파일을 선택하세요."
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "쿠웨이트"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "모델"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "카드 IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "카드 메모리 (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "카드 IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "카드 IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "유럽 프로토콜 (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"다른 지역을 위한 프로토콜\n"
+" D채널 (leased lines) 아님"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "상표"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "매체 범주"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "모듈 이름"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "IP 주소"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "버스"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "버스상의 위치"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "IP 주소는 1.2.3.4과 같은 형식이어야 합니다."
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "게이트웨이:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "인터페이스:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "인터넷 연결 설정"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"인터넷 연결이 없습니다.\n"
+"「설정」을 눌러 먼저 연결을 설정하세요."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "첫번째 DNS 서버 (옵션)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "첫번째 DNS 서버 (옵션)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "두번째 DNS 서버 (옵션)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "첫번째 DNS 서버 (옵션)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "인터넷 연결 설정"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "인터넷 액세스"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "연결 유형: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "상태:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "연결 테스트 중..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "인자"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4698,11 +5027,6 @@ msgstr ""
 msgid "No device found"
 msgstr "장치를 찾을 수 없습니다"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "장치: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4925,6 +5249,103 @@ msgstr "시스템 설치"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "서비스 종류(_T):"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "방화벽 설정이 감지되었습니다!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "게임을 계속할까요?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "상세설명"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "동작: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "네트웍 인터페이스"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "유형: "
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "프로토콜"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "고정 IP 주소"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr " 호스트 위치를 알 수 없음: %s "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "서비스 종류(_T):"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "포트"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "포트"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "무시"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "방화벽 설정이 감지되었습니다!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "무선 연결"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "이 설정을 테스트해 보시겠습니까?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "비밀번호 기억"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4968,20 +5389,6 @@ msgstr "내장 ISDN 카드"
 msgid "Protocol for the rest of the world"
 msgstr "다른 지역을 위한 프로토콜"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "유럽 프로토콜 (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"다른 지역을 위한 프로토콜\n"
-" D채널 (leased lines) 아님"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5030,11 +5437,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "연결 테스트 중..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5055,11 +5457,6 @@ msgstr "님의 개인 전화 번호"
 msgid "Provider name (ex provider.net)"
 msgstr "공급자 이름 (예 provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "공급자 전화번호"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5070,41 +5467,6 @@ msgstr "공급자 DNS 1 (옵션)"
 msgid "Provider DNS 2 (optional)"
 msgstr "공급자 DNS 2 (옵션)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "다이얼링 모드"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "연결 속도"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "연결 시간초과 (초)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "카드 IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "카드 메모리 (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "카드 IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "카드 IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5265,16 +5627,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "도메인 이름"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "첫번째 DNS 서버 (옵션)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "두번째 DNS 서버 (옵션)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5581,11 +5933,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "IP 주소는 1.2.3.4과 같은 형식이어야 합니다."
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "IP 주소는 1.2.3.4과 같은 형식이어야 합니다."
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6015,16 +6362,6 @@ msgstr ""
 #~ "\n"
 #~ "그 어댑터로 지역 네트웍을 설정할 것입니다."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "어떠한 네트웍 어댑터도 발견되지 않습니다. 하드웨어 설정 도구를 실행해 보세"
-#~ "요."
-
-#~ msgid "Connection type: "
-#~ msgstr "연결 유형: "
-
 #~ msgid "Edit"
 #~ msgstr "편집"
 
@@ -6048,197 +6385,15 @@ msgstr ""
 #~ msgid "Command"
 #~ msgstr "명령"
 
-#~ msgid "none"
-#~ msgstr "없음"
-
 #~ msgid "Level"
 #~ msgstr "레벨"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "서비스 종류(_T):"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "방화벽 설정이 감지되었습니다!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "게임을 계속할까요?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "상세설명"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "동작: %s"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "네트웍 인터페이스"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "유형: "
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "프로토콜"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "고정 IP 주소"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr " 호스트 위치를 알 수 없음: %s "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "서비스 종류(_T):"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "포트"
-
-#~ msgid "Ignore"
-#~ msgstr "무시"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "방화벽 설정이 감지되었습니다!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "무선 연결"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "이 설정을 테스트해 보시겠습니까?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "비밀번호 기억"
-
-#~ msgid "Gateway:"
-#~ msgstr "게이트웨이:"
-
-#~ msgid "Interface:"
-#~ msgstr "인터페이스:"
-
-#, fuzzy
-#~ msgid "Manage connections"
-#~ msgstr "캐이블 연결"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS 설정"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS 서버"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS 도메인"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "IP 자동할당"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "부팅시 시작"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>S"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "인터넷 스테이션"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "커널 부트 제한시간"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "파일을 선택하세요."
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "쿠웨이트"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "모델"
-
-#~ msgid "Vendor"
-#~ msgstr "상표"
-
-#~ msgid "Media class"
-#~ msgstr "매체 범주"
-
-#~ msgid "Module name"
-#~ msgstr "모듈 이름"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "IP 주소"
-
-#~ msgid "Bus"
-#~ msgstr "버스"
-
-#~ msgid "Location on the bus"
-#~ msgstr "버스상의 위치"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "네트웍 인터페이스를 선택하세요."
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "네트웍을 다시 시작하는 도중에 문제가 발생했습니다:\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "연결 끊기..."
 
 #~ msgid "Connect..."
 #~ msgstr "연결..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "인터넷 연결 설정"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "첫번째 DNS 서버 (옵션)"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "첫번째 DNS 서버 (옵션)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "인터넷 연결 설정"
-
-#~ msgid "Internet access"
-#~ msgstr "인터넷 액세스"
-
-#~ msgid "Status:"
-#~ msgstr "상태:"
-
-#~ msgid "Parameters"
-#~ msgstr "인자"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "상세설명"
diff --git a/po/ky.po b/po/ky.po
index d84eea9..8cae842 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2005-04-20 20:27+0500\n"
 "Last-Translator: Nurlan Borubaev <nurlan@tamga.info>\n"
 "Language-Team: Kyrgyz\n"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "Интерфейс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr ""
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr ""
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Жардам"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Колдонуу"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Айнуу"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "ОК"
@@ -96,7 +102,8 @@ msgstr "ОК"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "ОК"
 msgid "Please wait"
 msgstr "Күтө туруңуз"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Күтө туруңуз... Конфигурация колдонулууда"
@@ -139,6 +146,7 @@ msgstr ""
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr ""
@@ -154,6 +162,7 @@ msgid "Started on boot"
 msgstr ""
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr ""
@@ -166,17 +175,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Тармак интерфейстерин ырастоо (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr ""
@@ -229,12 +240,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr ""
@@ -249,8 +260,8 @@ msgstr "Кайра конфигдөө"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr ""
@@ -316,7 +327,11 @@ msgstr ""
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -598,13 +613,14 @@ msgstr "Бардык колдонуучуларга уруксат"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Интерактифдүү файервол"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "CD-ROM туташтыруу мүмкүн эмес"
@@ -614,12 +630,12 @@ msgstr "CD-ROM туташтыруу мүмкүн эмес"
 msgid "Log"
 msgstr ""
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Бардыгы"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -646,12 +662,12 @@ msgstr "Xinetd кызматы"
 msgid "Clear logs"
 msgstr "Бардыгын тазалоо"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -799,7 +815,7 @@ msgstr "Режим"
 msgid "Enabled"
 msgstr ""
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Сүрөттөмөсү"
@@ -841,9 +857,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Эскертүү"
@@ -2311,12 +2327,12 @@ msgstr ""
 "Эскертүү, дагы бир башка интернетке туташуу аныкталды, ал да сиздин "
 "желеңизди пайдаланат сыяктуу"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr ""
@@ -2381,7 +2397,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Метрика"
@@ -2421,19 +2437,22 @@ msgstr "Карта модели:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Аутентификация"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr ""
@@ -2553,13 +2572,15 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr ""
@@ -2585,21 +2606,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr ""
@@ -2610,11 +2635,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr ""
@@ -2633,6 +2660,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2654,6 +2682,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
@@ -2722,27 +2751,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Скрипт негизинде"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Терминал негизинде"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3901,90 +3935,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Зымсыз туташуу"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Башкарылуучу"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Биринчилик"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Кайталагыч"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Экинчилик"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Шифрлөө ачкычы"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Пароль"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Колдонуучу аты"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3992,12 +4029,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Пароль"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4016,12 +4053,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Сертификаттын аты"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4030,32 +4067,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4069,17 +4111,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4090,12 +4134,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4107,12 +4152,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4130,107 +4176,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Протокол"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Автоаныктоо"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Режим"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4238,12 +4284,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4252,12 +4298,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Сертификаттын тиби"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4267,12 +4313,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4282,12 +4328,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4305,50 +4351,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4490,6 +4536,280 @@ msgstr "Байланыш"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Тармак интерфейси"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Желе интерфейси: %s"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Туташууларды башкаруу"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Түзүлүш: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Конфигурациялоо"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "NFS сервери"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "жок"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Автоматтык"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Автоматтык"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Агымды башкаруу"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Модем туташуусу"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Файл тандоо"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Кувейт"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Модем"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Европалык протокол (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Өндүрүүчү"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Режим"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Бардык колдонуучуларга уруксат"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "колдонуу"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Шлюз:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Интерфейс:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Интернет туташуусу конфигурацияланган эмес"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Хост аты:"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Туташууну конфигурациялоо"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Интернетке кирүү"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr ""
+"Туташуу\n"
+"убакыты: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Абалы"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Принтерлер"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4681,11 +5001,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Эч бир түзүлүш табылган жок"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Түзүлүш: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4908,6 +5223,103 @@ msgstr "Жаңы драйвер орнотуу"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Казмат чабуулу"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Аракеттеги файервол: жырып өтүү аныкталды"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Чабуулчу кара тизмеге кошулсунбу?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Чабуул маалыматтары"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Чабуул убактысы:  %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Желе интерфейси: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Чабуулдун түрү: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Протокол: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Чабуулчунун IP-адреси: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Чабуулчунун хост аты: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Чабуулга дуушар болгон кызмат: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Чабуулга дуушар болгон порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "ICMP чабуулунун түрү: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Дайыма кара тизмеде (кайра сураба)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Аракеттеги файервол: жырып өтүү аныкталды"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Зымсыз туташуу"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Конфигурацияны текшерүүнү каалайсызбы?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4951,18 +5363,6 @@ msgstr "Ички ISDN картасы"
 msgid "Protocol for the rest of the world"
 msgstr "Калган дүйнө үчүн протокол"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Европалык протокол (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5011,11 +5411,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr ""
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5036,11 +5431,6 @@ msgstr ""
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5051,41 +5441,6 @@ msgstr ""
 msgid "Provider DNS 2 (optional)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5240,16 +5595,6 @@ msgstr ""
 msgid "Domain name"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5526,11 +5871,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6290,9 +6630,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "тазалоо"
 
-#~ msgid "none"
-#~ msgstr "жок"
-
 #~ msgid "tunnel"
 #~ msgstr "тоннель"
 
@@ -6311,96 +6648,10 @@ msgstr ""
 #~ msgid "default"
 #~ msgstr "алдынала"
 
-#~ msgid "use"
-#~ msgstr "колдонуу"
-
 #~ msgid "unique"
 #~ msgstr "уникалдык"
 
 #, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Казмат чабуулу"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Аракеттеги файервол: жырып өтүү аныкталды"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Чабуулчу кара тизмеге кошулсунбу?"
-
-#~ msgid "Attack details"
-#~ msgstr "Чабуул маалыматтары"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Чабуул убактысы:  %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Желе интерфейси: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Чабуулдун түрү: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Протокол: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Чабуулчунун IP-адреси: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Чабуулчунун хост аты: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Чабуулга дуушар болгон кызмат: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Чабуулга дуушар болгон порт: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "ICMP чабуулунун түрү: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Дайыма кара тизмеде (кайра сураба)"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Аракеттеги файервол: жырып өтүү аныкталды"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Зымсыз туташуу"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Конфигурацияны текшерүүнү каалайсызбы?"
-
-#~ msgid "Gateway:"
-#~ msgstr "Шлюз:"
-
-#~ msgid "Interface:"
-#~ msgstr "Интерфейс:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Туташууларды башкаруу"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "Конфигурациялоо"
-
-#~ msgid "Flow control"
-#~ msgstr "Агымды башкаруу"
-
-#~ msgid "Vendor"
-#~ msgstr "Өндүрүүчү"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Хост аты:"
-
-#~ msgid "Internet access"
-#~ msgstr "Интернетке кирүү"
-
-#, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Чабуул маалыматтары"
 
diff --git a/po/lt.po b/po/lt.po
index 8878523..5ff8fba 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -24,14 +24,16 @@ msgid "Interface"
 msgstr "Interfeisas"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adresas"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokolas"
@@ -67,23 +69,27 @@ msgid "Configure Local Area Network..."
 msgstr "Nustatyti Vietinį Tinklą..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Pagalba"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Pritaikyti"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Nutraukti"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Gerai"
@@ -93,7 +99,8 @@ msgstr "Gerai"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -102,7 +109,7 @@ msgstr "Gerai"
 msgid "Please wait"
 msgstr "Prašom palaukti"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, fuzzy, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Nustatymų tikrinimas"
@@ -136,6 +143,7 @@ msgstr "Adapteris %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -151,6 +159,7 @@ msgid "Started on boot"
 msgstr "Startavo įkrovos metu"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klientas"
@@ -163,17 +172,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Nustatyti naują tinklo sąsają (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Blogas paketas"
@@ -241,12 +252,12 @@ msgstr ""
 "\n"
 "Tai ką norėtum daryti?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Išjungti"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Leisti"
@@ -261,8 +272,8 @@ msgstr "Perkonfigūruoti"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Spausdinimo serveris"
@@ -329,7 +340,11 @@ msgstr "Spausdintuvo nėra"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -616,13 +631,14 @@ msgstr "Pridėti vartotoją"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Serveris, Firewall/Routeris"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Uždrausti tinklą"
@@ -632,12 +648,12 @@ msgstr "Uždrausti tinklą"
 msgid "Log"
 msgstr "Žurnalas"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Visos"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -664,12 +680,12 @@ msgstr "Bloga atsarginė byla"
 msgid "Clear logs"
 msgstr "Išvalyti viską"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -817,7 +833,7 @@ msgstr "Režimas"
 msgid "Enabled"
 msgstr "Leisti"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Aprašymas"
@@ -859,9 +875,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Dėmesio"
@@ -2319,12 +2335,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Susijungta"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nepajungtas"
@@ -2389,7 +2405,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "griežta"
@@ -2429,19 +2445,22 @@ msgstr "Plokštės mem (DMA)"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentikacija"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Pasisveikinimas (vartotojo vardas)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Slaptažodis"
@@ -2566,13 +2585,15 @@ msgstr ""
 "Kiekvienas laukas turi būti įrašytas kaip IP adresas\n"
 "dešimtainiais skaičiais su taškais (pvz. 192.168.2.36)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Šliuzas (Gateway)"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "CUPS serverio IP"
@@ -2598,21 +2619,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Jungties tipas: "
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "Hosto vardas"
@@ -2623,11 +2648,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresas turėtų būti 1.2.3.4 formato"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "IP adresas turėtų būti 1.2.3.4 formato"
@@ -2646,6 +2673,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Prašom išbandyti pelę"
@@ -2667,6 +2695,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Tinklo konfigūravimas"
@@ -2735,27 +2764,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Paremtas skriptu"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Paremtas terminalu"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP arba CHAP"
@@ -3914,90 +3948,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Bevielis ryšys"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Experto režimas"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Valdomas"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Pagrindinis"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Kartotuvas"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Antras"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Slaptažodis"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Pasisveikinimas (vartotojo vardas)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4005,12 +4042,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Slaptažodis"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4029,12 +4066,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4043,32 +4080,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Tinklo interfeisas"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4082,17 +4124,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Žaidimų stotis"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4103,12 +4147,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4120,12 +4165,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4143,107 +4189,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokolas"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Naudokite automatinį aptikimą"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Režimas"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4251,12 +4297,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4265,12 +4311,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4280,12 +4326,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4295,12 +4341,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4318,50 +4364,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4503,6 +4549,285 @@ msgstr "Prisijungti"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Tavo sistemoje nerasta jokia tinklo plokštė. prašom paleisti įrangos "
+"nustatymo įrankį."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Pasirink tinklo interfeisą"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Pasirink tinklo interfeisą"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr "Ar tu nori iš naujo paleisti tinklą"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"Sveikiname, jūsų tinklo ir Internet konfiguracija baigta.\n"
+"\n"
+"Dabar konfiguraciją pritaikysime sistemai.\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Tvarkyti ryšius"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Įrenginys: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "LAN Konfiguravimas"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS serveris"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS domenas"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "jokios"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatinis IP"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Startavo įkrovos metu"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Skambinimo režimas"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, fuzzy, c-format
+msgid "Connection speed"
+msgstr "Jungties tipas: "
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, fuzzy, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Jungties tipas: "
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Tiekėjo telefono numeris"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Srauto kontrolė"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Interneto stotis"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Nustatyti normalią jungtį per modemą"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Pasirink bylą"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuveitas"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Pelė"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Plokštės IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Plokštės mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Plokštės IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Plokštės IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, fuzzy, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europa (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, fuzzy, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Likęs pasaulis \n"
+" be D-Channel (nuomojamos linijos)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Tiekėjas"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Modulio vardas"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "IP adresas"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Darb"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "IP adresas turėtų būti 1.2.3.4 formato"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Šliuzas (Gateway):"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfeisas:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Interneto jungties konfiguravimas"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Nustatymai"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, fuzzy, c-format
+msgid "First DNS Server (optional)"
+msgstr "Pirmasis DNS serveris"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, fuzzy, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Antrasis DNS serveris"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Pirmasis DNS serveris"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Interneto Jungties Konfiguravimas"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Priėjimas prie Interneto"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Jungties tipas: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Būsena:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Išbandoma jungtis..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametrai"
+
 #: ../lib/network/drakfirewall.pm:14
 #, fuzzy, c-format
 msgid "Web Server"
@@ -4694,11 +5019,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Nerastas joks įrenginys"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Įrenginys: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4921,6 +5241,103 @@ msgstr "Įdiegti sistemą"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Tarnybos _tipas:"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Aptikta ugniasienės konfigūracija!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Ar norite aktyvuoti Lipnius Klavišus?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Detalės"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Veiksmas: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Tinklo sąsajos"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Tipas: "
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokolai"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Statinis IP adresas"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Nepavyko gauti kompiuterio vardo: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Tarnybos _tipas:"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Prievadas"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Prievadas"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignoruoti"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Aptikta ugniasienės konfigūracija!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Bevielis ryšys"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Ar tu nori išbandyti nustatymus?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Jokio slaptažodžio"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4964,20 +5381,6 @@ msgstr "Vidinė ISDN plokštė"
 msgid "Protocol for the rest of the world"
 msgstr "Likęs pasaulis"
 
-#: ../lib/network/netconnect.pm:71
-#, fuzzy, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europa (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, fuzzy, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Likęs pasaulis \n"
-" be D-Channel (nuomojamos linijos)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5026,11 +5429,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Išbandoma jungtis..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5051,11 +5449,6 @@ msgstr "Tavo asmeninis tel. numeris"
 msgid "Provider name (ex provider.net)"
 msgstr "Tiekėjo pavadinimas (pvz. tiekejas.lt)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Tiekėjo telefono numeris"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5066,41 +5459,6 @@ msgstr "Tiekėjo DNS 1 (pasirinktinai)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Tiekėjo DNS 2 (pasirinktinai)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Skambinimo režimas"
-
-#: ../lib/network/netconnect.pm:353
-#, fuzzy, c-format
-msgid "Connection speed"
-msgstr "Jungties tipas: "
-
-#: ../lib/network/netconnect.pm:354
-#, fuzzy, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Jungties tipas: "
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Plokštės IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Plokštės mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Plokštės IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Plokštės IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5263,16 +5621,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domeno vardas"
 
-#: ../lib/network/netconnect.pm:651
-#, fuzzy, c-format
-msgid "First DNS Server (optional)"
-msgstr "Pirmasis DNS serveris"
-
-#: ../lib/network/netconnect.pm:652
-#, fuzzy, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Antrasis DNS serveris"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5564,11 +5912,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "IP adresas turėtų būti 1.2.3.4 formato"
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "IP adresas turėtų būti 1.2.3.4 formato"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5993,16 +6336,6 @@ msgstr ""
 #~ "\n"
 #~ "Ar norėtum sutvarkyti savo vietinį tinklą šiai plokštei?"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Tavo sistemoje nerasta jokia tinklo plokštė. prašom paleisti įrangos "
-#~ "nustatymo įrankį."
-
-#~ msgid "Connection type: "
-#~ msgstr "Jungties tipas: "
-
 #~ msgid "Edit"
 #~ msgstr "Redaguoti"
 
@@ -6029,188 +6362,16 @@ msgstr ""
 #~ msgid "Flag"
 #~ msgstr "Vėliava"
 
-#~ msgid "none"
-#~ msgstr "jokios"
-
 #~ msgid "Level"
 #~ msgstr "Lygis"
 
 #, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Tarnybos _tipas:"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Aptikta ugniasienės konfigūracija!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Ar norite aktyvuoti Lipnius Klavišus?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Detalės"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Veiksmas: %s"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Tinklo sąsajos"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Tipas: "
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokolai"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Statinis IP adresas"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Nepavyko gauti kompiuterio vardo: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Tarnybos _tipas:"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Prievadas"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignoruoti"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Aptikta ugniasienės konfigūracija!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Bevielis ryšys"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Ar tu nori išbandyti nustatymus?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Jokio slaptažodžio"
-
-#~ msgid "Gateway:"
-#~ msgstr "Šliuzas (Gateway):"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfeisas:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Tvarkyti ryšius"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "LAN Konfiguravimas"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS serveris"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS domenas"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "Automatinis IP"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#, fuzzy
-#~ msgid "Start at boot"
-#~ msgstr "Startavo įkrovos metu"
-
-#~ msgid "Flow control"
-#~ msgstr "Srauto kontrolė"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Interneto stotis"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Nustatyti normalią jungtį per modemą"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Pasirink bylą"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Kuveitas"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Pelė"
-
-#~ msgid "Vendor"
-#~ msgstr "Tiekėjas"
-
-#~ msgid "Module name"
-#~ msgstr "Modulio vardas"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "IP adresas"
-
-#~ msgid "Bus"
-#~ msgstr "Darb"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Pasirink tinklo interfeisą"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "Ar tu nori iš naujo paleisti tinklą"
-
-#, fuzzy
 #~ msgid "Disconnect..."
 #~ msgstr "Sujungimas..."
 
 #~ msgid "Connect..."
 #~ msgstr "Sujungimas..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Interneto jungties konfiguravimas"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Nustatymai"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Pirmasis DNS serveris"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Interneto Jungties Konfiguravimas"
-
-#~ msgid "Internet access"
-#~ msgstr "Priėjimas prie Interneto"
-
-#~ msgid "Status:"
-#~ msgstr "Būsena:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametrai"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Detalės"
diff --git a/po/ltg.po b/po/ltg.po
index 817b402..326b1b5 100644
--- a/po/ltg.po
+++ b/po/ltg.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -25,14 +25,16 @@ msgid "Interface"
 msgstr "Saskarne"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adrese"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokols"
@@ -68,23 +70,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfigurēt lokalū datorteiklu..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Paleidzeiba"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Pīlītuot"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Atceļt"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Labi"
@@ -94,7 +100,8 @@ msgstr "Labi"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -103,7 +110,7 @@ msgstr "Labi"
 msgid "Please wait"
 msgstr "Lyudzu pagaidit"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Lyudzu pagaidit ... konfiguracejis pīmāruošona"
@@ -137,6 +144,7 @@ msgstr "Adapters %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Teikla maska"
@@ -152,6 +160,7 @@ msgid "Started on boot"
 msgstr "Palaists pi īluodis"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klients"
@@ -166,17 +175,19 @@ msgstr ""
 "Palaidit paleigu \"Pīvīnuot saskarni\" nu Mageia kontrolis centra."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Īstateit jaunu teikla saskarni (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Nav maskys"
@@ -246,12 +257,12 @@ msgstr ""
 "\n"
 "Kū jius gribit dareit?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, fuzzy, c-format
 msgid "Disable"
 msgstr "atslēgt"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, fuzzy, c-format
 msgid "Enable"
 msgstr "īslēgt"
@@ -266,8 +277,8 @@ msgstr "puorkonfigurēt"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Teikla īkuorta"
@@ -335,7 +346,11 @@ msgstr "Īkšejais muižys vuords"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -628,13 +643,14 @@ msgstr "Atļaut vysus lītuotuojus"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Guņsmyurs"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Nevar atdalīt: %s"
@@ -644,12 +660,12 @@ msgstr "Nevar atdalīt: %s"
 msgid "Log"
 msgstr ""
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Vyss"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -676,12 +692,12 @@ msgstr "Dubleit lītuotuoja failus"
 msgid "Clear logs"
 msgstr "Vysu dzēst"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -829,7 +845,7 @@ msgstr "Modems"
 msgid "Enabled"
 msgstr "īslēgt"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Aproksts"
@@ -871,9 +887,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Uzmaneibu"
@@ -2339,12 +2355,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Savīnuots"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nav savīnuots"
@@ -2409,7 +2425,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "īrībežuot"
@@ -2449,19 +2465,22 @@ msgstr "Kartis modeļs:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentifikaceja"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Konta nūsaukums (lītuotuoja vuords)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Konta parole"
@@ -2586,13 +2605,15 @@ msgstr ""
 "Vysi dati juoīvoda kai IP adresis ar punktim atdaleitu decimalu\n"
 "skaitļu veidā (pīmāram, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Vuorteja"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS servera IP"
@@ -2618,21 +2639,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Savīnuojuma taimauts (sek.)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP resursa vuords"
@@ -2643,11 +2668,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresis formatam juobyun 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Vuortejis adresis formatam ir juobyun 1.2.3.4"
@@ -2666,6 +2693,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Lūdzu, ievadiet osta vārdu vai IP."
@@ -2687,6 +2715,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Tīkla konfigurācija"
@@ -2755,27 +2784,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Iz skripta bāzis"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Izmontojūt terminali"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3934,90 +3968,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Bezvodu savīnuojums"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Eksperta režīms"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Valodas izvēle"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Meistars"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Atjkuortuotuojs"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundars"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatisks"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Šifreišonys atslāga"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Parole"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Konta nūsaukums (lītuotuoja vuords)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4025,12 +4062,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Parole"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4049,12 +4086,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4063,32 +4100,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Teikla ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4102,17 +4144,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentaceja"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4123,12 +4167,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4140,12 +4185,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4163,107 +4209,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokols"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Automatiska nūteikšona"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Modems"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "TLS"
 msgstr "LSB"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4271,12 +4317,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4285,12 +4331,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4300,12 +4346,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4315,12 +4361,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4338,50 +4384,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4523,6 +4569,290 @@ msgstr "Savīnoju"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Jiusu sistemā nav atrosts nivīns ethernet teikla adapters. Lyudzu izmontojit "
+"dzelžu konfigureišonas reiku."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Nūjimt teikla saskarni"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Izvēlieties tīkla interfeisu"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Dziešut \"%s\" teikla saskarni, uzaroda problema:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"Apsveicu, tīkla un Internet konfigurēšana ir pabeigta.\n"
+"Konfigurācija tagad tiks lietota uz Jūsu datora.\n"
+"\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Pīslāgumu puorvaldeišona"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Īreice: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS konfiguraceja"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS servers"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Meklēt domenu"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "nav"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statisks"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Suokt pi īluodis"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Zvaneišonys režims"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Savīnuojuma uotrums"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Savīnuojuma taimauts (sek.)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Pakolpuojumu snīdzieja telefona numers"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Interneta dators"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Čaulys īluodis taimauts"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Izavielejit failu"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuveita"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modems"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kartis IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kartis atmiņa (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kartis IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kartis IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Eiropys protokols (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokols cytur pasaulē \n"
+"Nav D-Channel (izdaleitys linejis)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Izgatavuotuojs"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Medeju klase"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Moduļa nūsaukums"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Mac adrese"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Magistrale"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Vuortejis adresis formatam ir juobyun 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Vuorteja:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Saskarne:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Interneta savīnuojuma konfiguraceja"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Itei saskarne vēl nabeja nūkonfigurāta.\n"
+"Palaidit paleigu \"%s\" nu Mageia kontrolis centra."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "trauksmes konfigurācija"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Pyrmais DNS servers (naobligāts)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Ūtrais DNS servers (naobligāts)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Pyrmais DNS servers (naobligāts)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Interneta savīnuojuma konfiguraceja"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Interneta pīeja"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Savīnuojuma tips: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Stuovūklis:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Izmieginoju savīnuojumu..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametri"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4725,11 +5055,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Īkuortys nav atrostys"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Īreice: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4952,6 +5277,103 @@ msgstr "Sistemys instaleišona"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Servisi i demoni"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Tyka atkluota gunsmyura konfiguraceja!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Vai vēlaties izmantot aboot?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Nav detaļu"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "tips: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Teikla saskarne"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "tips: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokols:"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP adrese"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Loopback faila nūsaukums: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Servisi i demoni"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Ports: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Ports: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignorēt"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Tyka atkluota gunsmyura konfiguraceja!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Bezvodu savīnuojums"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Voi gribit izmieginuot itū konfiguraceju?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Atguoduot itū paroli"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4995,20 +5417,6 @@ msgstr "Īkšejuo ISDN karte"
 msgid "Protocol for the rest of the world"
 msgstr "Protokols cytur pasaulē"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Eiropys protokols (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokols cytur pasaulē \n"
-"Nav D-Channel (izdaleitys linejis)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5057,11 +5465,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Izmieginoju savīnuojumu..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5082,11 +5485,6 @@ msgstr "Jiusu privātais telefona numers"
 msgid "Provider name (ex provider.net)"
 msgstr "Pakolpuojumu snīdzieja nūsaukums (pīm., provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Pakolpuojumu snīdzieja telefona numers"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5097,41 +5495,6 @@ msgstr "Provaidera DNS 1 (nav obligati)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provaidera DNS 2 (nav obligati)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Zvaneišonys režims"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Savīnuojuma uotrums"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Savīnuojuma taimauts (sek.)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kartis IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kartis atmiņa (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kartis IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kartis IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5292,16 +5655,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domena nūsaukums"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Pyrmais DNS servers (naobligāts)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Ūtrais DNS servers (naobligāts)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5607,11 +5960,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS servera adresis formatam ir juobyun 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Vuortejis adresis formatam ir juobyun 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6050,16 +6398,6 @@ msgstr ""
 #~ "\n"
 #~ "Voi gribit uzstuodeit jiusu lokalū datorteiklu ar itū adapteri?"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Jiusu sistemā nav atrosts nivīns ethernet teikla adapters. Lyudzu "
-#~ "izmontojit dzelžu konfigureišonas reiku."
-
-#~ msgid "Connection type: "
-#~ msgstr "Savīnuojuma tips: "
-
 #~ msgid "DrakVPN"
 #~ msgstr "DrakVPN"
 
@@ -6086,180 +6424,15 @@ msgstr ""
 #~ msgid "Command"
 #~ msgstr "Komanda"
 
-#~ msgid "none"
-#~ msgstr "nav"
-
 #~ msgid "Level"
 #~ msgstr "Leimiņs"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Servisi i demoni"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Tyka atkluota gunsmyura konfiguraceja!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Vai vēlaties izmantot aboot?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Nav detaļu"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Teikla saskarne"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "tips: %s"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokols:"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP adrese"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Loopback faila nūsaukums: %s"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Servisi i demoni"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Ports: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorēt"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Tyka atkluota gunsmyura konfiguraceja!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Bezvodu savīnuojums"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Voi gribit izmieginuot itū konfiguraceju?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Atguoduot itū paroli"
-
-#~ msgid "Gateway:"
-#~ msgstr "Vuorteja:"
-
-#~ msgid "Interface:"
-#~ msgstr "Saskarne:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Pīslāgumu puorvaldeišona"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS konfiguraceja"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS servers"
-
-#~ msgid "Search Domain"
-#~ msgstr "Meklēt domenu"
-
-#~ msgid "static"
-#~ msgstr "statisks"
-
-#~ msgid "Start at boot"
-#~ msgstr "Suokt pi īluodis"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>S"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Interneta dators"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Čaulys īluodis taimauts"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Izavielejit failu"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Kuveita"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Modems"
-
-#~ msgid "Vendor"
-#~ msgstr "Izgatavuotuojs"
-
-#~ msgid "Media class"
-#~ msgstr "Medeju klase"
-
-#~ msgid "Module name"
-#~ msgstr "Moduļa nūsaukums"
-
-#~ msgid "Mac Address"
-#~ msgstr "Mac adrese"
-
-#~ msgid "Bus"
-#~ msgstr "Magistrale"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Nūjimt teikla saskarni"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Dziešut \"%s\" teikla saskarni, uzaroda problema:\n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Atvīnoju..."
 
 #~ msgid "Connect..."
 #~ msgstr "Savīnoju..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Interneta savīnuojuma konfiguraceja"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "trauksmes konfigurācija"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Pyrmais DNS servers (naobligāts)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Interneta savīnuojuma konfiguraceja"
-
-#~ msgid "Internet access"
-#~ msgstr "Interneta pīeja"
-
-#~ msgid "Status:"
-#~ msgstr "Stuovūklis:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametri"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Nav detaļu"
diff --git a/po/lv.po b/po/lv.po
index 7fd9dd4..3e8c8a8 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -25,14 +25,16 @@ msgid "Interface"
 msgstr "Interfeiss"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adrese"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokols"
@@ -68,23 +70,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfigurēt lokālo datortīklu..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Palīdzība"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Pielietot"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Atcelt"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Labi"
@@ -94,7 +100,8 @@ msgstr "Labi"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -103,7 +110,7 @@ msgstr "Labi"
 msgid "Please wait"
 msgstr "Lūdzu uzgaidiet"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Lūdzu uzgaidiet ... konfigurācijas piemērošana"
@@ -137,6 +144,7 @@ msgstr "Adapteris %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Tīkla maska"
@@ -152,6 +160,7 @@ msgid "Started on boot"
 msgstr "Palaists pie ielādes"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klients"
@@ -166,17 +175,19 @@ msgstr ""
 "Jūs varat palaist printerdrake no Mageia kontroles centra Aparatūras sekcijā."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Izvēlieties tīkla interfeisu"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Slikta pakotne"
@@ -245,12 +256,12 @@ msgstr ""
 "\n"
 "Ko jūs vēlaties darīt?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Izslēgt"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Aktivizēt"
@@ -265,8 +276,8 @@ msgstr "Pārkonfigurēt"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Xinetd serviss"
@@ -334,7 +345,11 @@ msgstr "Ieksējais domēna vārds"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -628,13 +643,14 @@ msgstr "Atļaut visus lietotājus"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Ugunssiena"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Nevar atdalīt: %s"
@@ -644,12 +660,12 @@ msgstr "Nevar atdalīt: %s"
 msgid "Log"
 msgstr "Reģistrs"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Viss"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -676,12 +692,12 @@ msgstr "Atjaunot lietotāja failus"
 msgid "Clear logs"
 msgstr "Visu dzēst"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -829,7 +845,7 @@ msgstr "Režīms"
 msgid "Enabled"
 msgstr "Aktivizēt"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Apraksts"
@@ -871,9 +887,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Uzmanību"
@@ -2335,12 +2351,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Savienots"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nav savienots"
@@ -2405,7 +2421,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "ierobežot"
@@ -2445,19 +2461,22 @@ msgstr "Kartes modelis:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentifikācija"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Konta nosaukums (lietotāja vārds)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Konta parole"
@@ -2582,13 +2601,15 @@ msgstr ""
 "Visi dati jāievada kā IP adreses ar punktiem atdalītu decimālu\n"
 "skaitļu veidā (piemēram, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Vārteja"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS servera IP"
@@ -2614,21 +2635,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Savienojuma taimauts (sek.)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "Resursa vārds"
@@ -2639,11 +2664,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adreses formātam jābūt 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Vārtejas adreses formātam ir jābūt 1.2.3.4"
@@ -2662,6 +2689,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Lūdzu, ievadiet osta vārdu vai IP."
@@ -2683,6 +2711,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Tīkla konfigurācija"
@@ -2751,27 +2780,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Ar skriptu"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Izmantojot termināli"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, fuzzy, c-format
 msgid "PAP/CHAP"
 msgstr "CHAP"
@@ -3930,90 +3964,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Kabeļa savienojums"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Eksperta režīms"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Valodas izvēle"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Majota"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Atjaunot"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundārs"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Šifrēšanas atslēga"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Parole"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Konta nosaukums (lietotāja vārds)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4021,12 +4058,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Parole"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4045,12 +4082,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4059,32 +4096,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Tīkls"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4099,17 +4141,19 @@ msgid ""
 msgstr ""
 
 #
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Spēļu dators"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4120,12 +4164,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4137,12 +4182,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4160,107 +4206,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokols"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Automātiska noteikšana"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Režīms"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4268,12 +4314,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4282,12 +4328,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4297,12 +4343,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4312,12 +4358,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4335,50 +4381,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4520,6 +4566,291 @@ msgstr "Pievienot"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Jūsu sistēmā nav atrasts neviens ethernet tīkla adapteris. Lūdzu izmantojiet "
+"dzelžu konfigurēšanas rīku."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Izvēlieties tīkla interfeisu"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Izvēlieties tīkla interfeisu"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Pārstartējot tīklu, uzradās problēma: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"Apsveicu, tīkla un Internet konfigurēšana ir pabeigta.\n"
+"Konfigurācija tagad tiks lietota uz Jūsu datora.\n"
+"\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Kabeļa savienojums"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Ierīce: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS konfigurācija"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS serveris"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS domēns"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "neviens"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automātisks IP"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Sākt pie ielādes"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Zvanīšanas režīms"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Savienojuma ātrums"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Savienojuma taimauts (sek.)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Pakalpojumu sniedzēja telefona numurs"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Interneta dators"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Kerneļa ielādes taimauts"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Izvēlieties failu"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuveita"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modelis"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kartes IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kartes mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kartes IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kartes IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Eiropas protokols (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Citur pasaulē \n"
+" nav D-Channel (izdalītas līnijas)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Pārdevējs"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Mēdiju klase"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Moduļa nosaukums"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "IP adrese"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Kopne"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Vārtejas adreses formātam ir jābūt 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Vārteja:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfeiss:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Interneta savienojuma konfigurācija"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Šis %s skeneris jākonfigurē ar printerdrake.\n"
+"Jūs varat palaist printerdrake no Mageia kontroles centra Aparatūras sekcijā."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "trauksmes konfigurācija"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Pirmais DNS serveris (neobligāts)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Otrais DNS serveris (neobligāts)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Pirmais DNS serveris (neobligāts)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Interneta savienojuma konfigurācija"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Interneta pieeja"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Savienojuma tips: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Stāvoklis:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Izmēģinu savienojumu..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametri"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4722,11 +5053,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Printeris nav atrasts!"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Ierīce: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4949,6 +5275,103 @@ msgstr "Sistēmas instalēšana"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Servisu Pārvaldnieks"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Tika atklāta ugunsmūra konfigurācija!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Vai jūs vēlaties beigt spēli?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Detaļas"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Aktivizēt %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Tīkla interfeiss: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Piekļuves tips: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokols: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP adrese:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Neizdevās dabūt resursdatora nosaukumu: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Servisu Pārvaldnieks"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Ports"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Ports"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignorēt"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Tika atklāta ugunsmūra konfigurācija!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Kabeļa savienojums"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Vai vēlaties izmēģināt šo konfigurāciju?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Atcerieties šo paroli"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4992,20 +5415,6 @@ msgstr "Iekšēja ISDN karte"
 msgid "Protocol for the rest of the world"
 msgstr "Citur pasaulē"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Eiropas protokols (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Citur pasaulē \n"
-" nav D-Channel (izdalītas līnijas)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5054,11 +5463,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Izmēģinu savienojumu..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5079,11 +5483,6 @@ msgstr "Jūsu privātais telefona numurs"
 msgid "Provider name (ex provider.net)"
 msgstr "Pakalpojumu sniedzēja nosaukums (piem., provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Pakalpojumu sniedzēja telefona numurs"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5094,41 +5493,6 @@ msgstr "Provaidera dns 1 (nav obligāti)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provaidera dns 2 (nav obligāti)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Zvanīšanas režīms"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Savienojuma ātrums"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Savienojuma taimauts (sek.)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kartes IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kartes mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kartes IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kartes IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5289,16 +5653,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domēna nosaukums"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Pirmais DNS serveris (neobligāts)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Otrais DNS serveris (neobligāts)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5607,11 +5961,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS servera adreses formātam jābūt 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Vārtejas adreses formātam ir jābūt 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6042,16 +6391,6 @@ msgstr ""
 #~ "\n"
 #~ "Vai vēlaties uzstādīt jūsu lokālo datortīklu ar šo adapteri?"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Jūsu sistēmā nav atrasts neviens ethernet tīkla adapteris. Lūdzu "
-#~ "izmantojiet dzelžu konfigurēšanas rīku."
-
-#~ msgid "Connection type: "
-#~ msgstr "Savienojuma tips: "
-
 #~ msgid "Edit"
 #~ msgstr "Labot"
 
@@ -6078,193 +6417,15 @@ msgstr ""
 #~ msgid "Flag"
 #~ msgstr "Karogs"
 
-#~ msgid "none"
-#~ msgstr "neviens"
-
 #~ msgid "Level"
 #~ msgstr "Līmenis"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Servisu Pārvaldnieks"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Tika atklāta ugunsmūra konfigurācija!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Vai jūs vēlaties beigt spēli?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Detaļas"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Aktivizēt %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Tīkla interfeiss: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Piekļuves tips: %s\n"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokols: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP adrese:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Neizdevās dabūt resursdatora nosaukumu: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Servisu Pārvaldnieks"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Ports"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorēt"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Tika atklāta ugunsmūra konfigurācija!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Kabeļa savienojums"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Vai vēlaties izmēģināt šo konfigurāciju?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Atcerieties šo paroli"
-
-#~ msgid "Gateway:"
-#~ msgstr "Vārteja:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfeiss:"
-
-#, fuzzy
-#~ msgid "Manage connections"
-#~ msgstr "Kabeļa savienojums"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS konfigurācija"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS serveris"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS domēns"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "Automātisks IP"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Sākt pie ielādes"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>S"
-
-#
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Interneta dators"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Kerneļa ielādes taimauts"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Izvēlieties failu"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Kuveita"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Modelis"
-
-#~ msgid "Vendor"
-#~ msgstr "Pārdevējs"
-
-#~ msgid "Media class"
-#~ msgstr "Mēdiju klase"
-
-#~ msgid "Module name"
-#~ msgstr "Moduļa nosaukums"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "IP adrese"
-
-#~ msgid "Bus"
-#~ msgstr "Kopne"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Izvēlieties tīkla interfeisu"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Pārstartējot tīklu, uzradās problēma: \n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Atvienoju..."
 
 #~ msgid "Connect..."
 #~ msgstr "Savienoju..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Interneta savienojuma konfigurācija"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "trauksmes konfigurācija"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Pirmais DNS serveris (neobligāts)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Interneta savienojuma konfigurācija"
-
-#~ msgid "Internet access"
-#~ msgstr "Interneta pieeja"
-
-#~ msgid "Status:"
-#~ msgstr "Stāvoklis:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametri"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Detaļas"
diff --git a/po/mk.po b/po/mk.po
index bee1048..5900c03 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -32,14 +32,16 @@ msgid "Interface"
 msgstr "Интерфејс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP адреса"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
@@ -75,23 +77,27 @@ msgid "Configure Local Area Network..."
 msgstr "Конфигурирај Локален Мрежа."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Помош"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Примени"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Откажи"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Во ред"
@@ -101,7 +107,8 @@ msgstr "Во ред"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -110,7 +117,7 @@ msgstr "Во ред"
 msgid "Please wait"
 msgstr "Ве молиме почекајте"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Почекајте... Примена на конфигурацијата"
@@ -146,6 +153,7 @@ msgstr "Адаптер %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Мрежна маска"
@@ -161,6 +169,7 @@ msgid "Started on boot"
 msgstr "Покренато при стартување"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP клиент"
@@ -175,17 +184,19 @@ msgstr ""
 " Стартувај го волшебникот за конфгурација."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Постави нов мрежен интерфејс (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Без маска"
@@ -252,12 +263,12 @@ msgstr ""
 "\n"
 " на?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Оневозможи"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Овозможи"
@@ -272,8 +283,8 @@ msgstr "Реконфигурирај"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Мрежен уред"
@@ -341,7 +352,11 @@ msgstr "Внатрешно име на домен"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -637,13 +652,14 @@ msgstr "Дозволи на сите корисници"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Не можеше да контактира со другиот %s"
@@ -653,12 +669,12 @@ msgstr "Не можеше да контактира со другиот %s"
 msgid "Log"
 msgstr "Дневник"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Сите"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -685,12 +701,12 @@ msgstr "Сигурносна копија"
 msgid "Clear logs"
 msgstr "Исчисти се"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -838,7 +854,7 @@ msgstr "Помести"
 msgid "Enabled"
 msgstr "Овозможи"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Опис"
@@ -880,9 +896,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
@@ -2352,12 +2368,12 @@ msgstr ""
 "Предупредување, откриена е друга интернет врска, што можеби ја користи "
 "твојата мрежа"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Приклучен"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Не е поврзан"
@@ -2422,7 +2438,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Метрички"
@@ -2462,19 +2478,22 @@ msgstr "Модел на картичка:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Автентикација"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Најава на сметка (корисничко име)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Лозинка на сметката"
@@ -2599,13 +2618,15 @@ msgstr ""
 "Секој елемент треба да е внесен како IP адреса во точкасто-децимално\n"
 "означување (на пример, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS Сервер IP"
@@ -2631,21 +2652,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Пауза на врската (во секунди)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP име на компјутерот"
@@ -2656,11 +2681,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP адресата треба да биде во следната форма 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Gateway адресата треба да биде во следната форма 1.2.3.4"
@@ -2679,6 +2706,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Додели име на хостот преку DHCP адреса"
@@ -2700,6 +2728,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Мрежен Hotplugging"
@@ -2768,27 +2797,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Со скрипта"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Со терминал"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3947,90 +3981,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Безжична конекција"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Режим на работа"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Справено"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Мастер"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Рипитер"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Секундарен"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Автоматски"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Име на мрежата (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Криптирачки клуч"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Лозинка"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Најава на сметка (корисничко име)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4038,12 +4075,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Лозинка"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4062,12 +4099,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4076,32 +4113,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID на мрежата"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Работна фрекфенција"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4115,17 +4157,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Фрагментација"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4136,12 +4180,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4153,12 +4198,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4176,107 +4222,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Протокол"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Авто-детекција"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Помести"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4284,12 +4330,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4298,12 +4344,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4313,12 +4359,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4328,12 +4374,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4351,26 +4397,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, fuzzy, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4379,24 +4425,24 @@ msgstr ""
 "Фреквенцијата треба да има суфикс к, M или G(на пр. \"2.46G\" за 2.46 GHz) "
 "или додадете доволно 0(нули)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, fuzzy, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "M или или."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4542,6 +4588,289 @@ msgstr "Поврзи се"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, fuzzy, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Не Вклучено.Нема детектирано ethernet мрежен адаптер на Вашиот систем. Ве "
+"молиме стартувајте ја алатката за конфигурација на хардвер."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Изберете го мрежниот интерфејс"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Изберете мрежен интерфејс за конфигурација:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Се случи проблем при рестартирање на мрежата: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"Честитки, конфигурацијата на мрежната и интернет е завршена.\n"
+"\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Одржување на конекции"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Уред: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS конфигурација"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS сервер"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS Домен"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ниту еден"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Автоматска IP"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Стартувај при подигање"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Режим на бирање"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Брзина на поврзување"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Пауза на врската (во секунди)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Телефонски број на Провајдерот"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Контрола на протокот"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Интернет"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Пауза пред подигање на кернел"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Избор на датотека"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Кувајт"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Модем"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ картичка"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Мемориска картичка (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Велзно/Озлезна (IO) картичка"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Картичка IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Европски протокол (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Протокол за остатокот на Светот\n"
+"Без D-канал (закупени линии)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Производител"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Класа на медиумот"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Име на Модулот"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Пренеси Адреса:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Магистрала"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Локација на магистралата"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway адресата треба да биде во следната форма 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Интерфејс:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Конфигурација на Интернет конекција"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"овој интерфејс не е конфигуриран.\n"
+" Стартувај го волшебникот за конфгурација."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Име на компјутерот (опционо)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Прв DNS Сервер (опционо)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Втор DNS Сервер (опционо)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Прв DNS Сервер (ако треба)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Конфигурација на Интернет Конекција"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Интернет пристап"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Тип на Врска: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Статус:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Тестирање на вашата конеција."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Параметри"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4745,11 +5074,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Не е пронајден уред"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Уред: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4972,6 +5296,103 @@ msgstr "Рачно вчитај драјвер"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Тип на _сервис:"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Детектирана е конфигурација на огнен ѕид"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Дали сакате да ја завршите играта?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Без Детали"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Активирај %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Мрежни интерфејси"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "тип: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Протоколи"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Статична IP адреса"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Не успеав да добијам име на хост: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Тип на _сервис:"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Порта: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Порта: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Игнорирај"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Детектирана е конфигурација на огнен ѕид"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Безжична конекција"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Дали сакате да ја тестирате конфигурацијата?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Запамти ја лозинката"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5015,20 +5436,6 @@ msgstr "Интерна ISDN картичка"
 msgid "Protocol for the rest of the world"
 msgstr "Протокол за остатокот на Светот"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Европски протокол (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Протокол за остатокот на Светот\n"
-"Без D-канал (закупени линии)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5077,11 +5484,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Тестирање на вашата конеција."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5102,11 +5504,6 @@ msgstr "Вашиот телефонски број"
 msgid "Provider name (ex provider.net)"
 msgstr "Име на провајдерот (пр. provajder.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Телефонски број на Провајдерот"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5117,41 +5514,6 @@ msgstr "DNS 1 на провајдерот (опционо)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 на провајдерот (опционо)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Режим на бирање"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Брзина на поврзување"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Пауза на врската (во секунди)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ картичка"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Мемориска картичка (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Велзно/Озлезна (IO) картичка"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Картичка IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5319,16 +5681,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Име на домен"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Прв DNS Сервер (опционо)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Втор DNS Сервер (опционо)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5632,11 +5984,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Адресата на DNS серверот треба да биде во облик 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway адресата треба да биде во следната форма 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6077,17 +6424,6 @@ msgstr ""
 #~ "\n"
 #~ "Ќе ја подесам вашата Локална Мрежа со тој адаптер."
 
-#, fuzzy
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Не Вклучено.Нема детектирано ethernet мрежен адаптер на Вашиот систем. Ве "
-#~ "молиме стартувајте ја алатката за конфигурација на хардвер."
-
-#~ msgid "Connection type: "
-#~ msgstr "Тип на Врска: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s веќе се користи\n"
 
@@ -6115,196 +6451,15 @@ msgstr ""
 #~ msgid "Command"
 #~ msgstr "Команда"
 
-#~ msgid "none"
-#~ msgstr "ниту еден"
-
 #~ msgid "Level"
 #~ msgstr "Ниво"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Тип на _сервис:"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Детектирана е конфигурација на огнен ѕид"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Дали сакате да ја завршите играта?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Без Детали"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Активирај %s"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Мрежни интерфејси"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "тип: %s"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Протоколи"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Статична IP адреса"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Не успеав да добијам име на хост: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Тип на _сервис:"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Порта: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Игнорирај"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Детектирана е конфигурација на огнен ѕид"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Безжична конекција"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Дали сакате да ја тестирате конфигурацијата?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Запамти ја лозинката"
-
-#, fuzzy
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Интерфејс:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Одржување на конекции"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS конфигурација"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS сервер"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS Домен"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "Автоматска IP"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Стартувај при подигање"
-
-#~ msgid "Flow control"
-#~ msgstr "Контрола на протокот"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Интернет"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Пауза пред подигање на кернел"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Избор на датотека"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Кувајт"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Модем"
-
-#~ msgid "Vendor"
-#~ msgstr "Производител"
-
-#~ msgid "Media class"
-#~ msgstr "Класа на медиумот"
-
-#~ msgid "Module name"
-#~ msgstr "Име на Модулот"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "Пренеси Адреса:"
-
-#~ msgid "Bus"
-#~ msgstr "Магистрала"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Локација на магистралата"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Изберете го мрежниот интерфејс"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Се случи проблем при рестартирање на мрежата: \n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Откачи..."
 
 #~ msgid "Connect..."
 #~ msgstr "Поврзан..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Конфигурација на Интернет конекција"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Име на компјутерот (опционо)"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Прв DNS Сервер (ако треба)"
-
-#, fuzzy
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Конфигурација на Интернет Конекција"
-
-#~ msgid "Internet access"
-#~ msgstr "Интернет пристап"
-
-#~ msgid "Status:"
-#~ msgstr "Статус:"
-
-#~ msgid "Parameters"
-#~ msgstr "Параметри"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Без Детали"
diff --git a/po/mn.po b/po/mn.po
index 2f6b191..c794b9a 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -28,14 +28,16 @@ msgid "Interface"
 msgstr "Харагдац"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP хаяг"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr ""
@@ -71,23 +73,27 @@ msgid "Configure Local Area Network..."
 msgstr "Тохируулах Сүлжээ."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Тусламж"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Батлах"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Хүчингүй"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ок"
@@ -97,7 +103,8 @@ msgstr "Ок"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -106,7 +113,7 @@ msgstr "Ок"
 msgid "Please wait"
 msgstr "Ачаалж байна... Түр хүлээнэ үү"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, fuzzy, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Хүлээх"
@@ -140,6 +147,7 @@ msgstr "Хэрэглэгч нэмэх"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr ""
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "Ачаалахад эхэлсэн"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr ""
@@ -167,17 +176,19 @@ msgid ""
 msgstr "ямх"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Сонгох"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr ""
@@ -238,12 +249,12 @@ msgstr ""
 "\n"
 "Та тэгээд юу хиймээр байна?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Хаах"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Нээх"
@@ -258,8 +269,8 @@ msgstr "Тохируулах"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr ""
@@ -325,7 +336,11 @@ msgstr ""
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -607,13 +622,14 @@ msgstr "Бүх хэрэглэгчдийг зөвшөөрөх"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr ""
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Кабель холболт"
@@ -623,12 +639,12 @@ msgstr "Кабель холболт"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Бүгд"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -655,12 +671,12 @@ msgstr "Нөөцлөлт"
 msgid "Clear logs"
 msgstr "Устгах"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -808,7 +824,7 @@ msgstr "Горим"
 msgid "Enabled"
 msgstr "Нээх"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Тодорхойлолт"
@@ -850,9 +866,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Анхааруулга"
@@ -2312,12 +2328,12 @@ msgstr ""
 "Анхааруулга, ондоо интернэт холболт мэдэгдлээ, магадгүй таны сүлжээг ашиглаж "
 "байх шиг байна"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Холбогдсон"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr ""
@@ -2382,7 +2398,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "Мексик"
@@ -2422,19 +2438,22 @@ msgstr "Системийн горим"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Баталгаажуулалт"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Дансны нууц үг"
@@ -2559,13 +2578,15 @@ msgstr ""
 "Бүх хэсгүүд цэгээр тусгаарлагдсан аравтын тоон буюу\n"
 "IP хэлбэртэй байх ёстой (жишээ нь: 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr ""
@@ -2591,21 +2612,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Холболт ямх"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr ""
@@ -2616,11 +2641,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, fuzzy, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "ямх"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ямх"
@@ -2639,6 +2666,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "нэр"
@@ -2660,6 +2688,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Сүлжээ"
@@ -2728,27 +2757,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Терминал суурьт"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr ""
@@ -3907,90 +3941,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Кабель холболт"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Мэргэжлийн"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Хэл"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Хэрэглэгч"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "Сэргээх"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Хоёрдогч "
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Автомат"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Нууц үг"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Хэрэглэгчийн нэр"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3998,12 +4035,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Нууц үг"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4022,12 +4059,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4036,32 +4073,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Сүлжээ"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4075,17 +4117,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Тоглоом"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4096,12 +4140,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4113,12 +4158,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4136,107 +4182,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Оролт/Гаралт-модул"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Автомат танилт"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Горим"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4244,12 +4290,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4258,12 +4304,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4273,12 +4319,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4288,12 +4334,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4311,50 +4357,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, fuzzy, 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 "M."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, fuzzy, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "M."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4496,6 +4542,281 @@ msgstr ""
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, fuzzy, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr "Үгүй."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Сонгох"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Сонгох"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Сүлжээг дахин эхлүүлж байхад алдаа тохиолдлоо\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Интернэт бол Дууслаа г"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Кабель холболт"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Төхөөрөмж: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS тохиргоо"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "FTP Сервер"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Домэйн"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "аль нь ч үгүй (none)"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Автоматаар"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Ачаалахад эхлүүл"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Холболтын хурд"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, fuzzy, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Холболт ямх"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Интернэт"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Энгийн Модем холболт"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Файл сонгох"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Кувейт"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Модем"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Европын протокол (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Борлуулагч"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Модулын нэр"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Хаяг:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Бус"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, fuzzy, c-format
+msgid "Location on the bus"
+msgstr "Байршил"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "ямх"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Гарц:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Харагдалт:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Интернэт"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr "ямх"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Эхний Сервер"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, fuzzy, c-format
+msgid "First DNS Server (optional)"
+msgstr "Эхний Сервер"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, fuzzy, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Хоёрдох Сервер"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Эхний Сервер"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Интернэт холболтын тохируулга"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Интернэт хандалт"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Холболт төрөл "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Төлөв:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Таны холболтыг шалгаж байна..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Параметрүүд"
+
 #: ../lib/network/drakfirewall.pm:14
 #, fuzzy, c-format
 msgid "Web Server"
@@ -4687,11 +5008,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Төхөөрөмж олдсонгүй"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Төхөөрөмж: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4914,6 +5230,103 @@ msgstr "Суулгах жагсаалт"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Үйлчилгээ удирдагч"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Чимээгүйг танигчийг ажиллуулж эхлэх"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Та наалт товчилуур идэвхжүүлэхийг хүсэж байна уу?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Үгүй"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "%s идэвхижүүлэх"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Сүлжээний интерфэйс"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "төрөл"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Оролт/Гаралт-модул"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Алсын IP хаяг:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Хостын нэрийг олж чадсангүй: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Үйлчилгээ удирдагч"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Үл хэрэгсэх"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Чимээгүйг танигчийг ажиллуулж эхлэх"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Кабель холболт"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "вы?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Энэ нууц үгийг санах"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4957,18 +5370,6 @@ msgstr "ИСДН(ISDN)"
 msgid "Protocol for the rest of the world"
 msgstr "аас"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Европын протокол (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5017,11 +5418,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Таны холболтыг шалгаж байна..."
-
 #: ../lib/network/netconnect.pm:344
 #, fuzzy, c-format
 msgid "Connection Configuration"
@@ -5042,11 +5438,6 @@ msgstr ""
 msgid "Provider name (ex provider.net)"
 msgstr "нэр"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5057,41 +5448,6 @@ msgstr "Эхний Сервер"
 msgid "Provider DNS 2 (optional)"
 msgstr "Эхний Сервер"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Холболтын хурд"
-
-#: ../lib/network/netconnect.pm:354
-#, fuzzy, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Холболт ямх"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5253,16 +5609,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Домэйн"
 
-#: ../lib/network/netconnect.pm:651
-#, fuzzy, c-format
-msgid "First DNS Server (optional)"
-msgstr "Эхний Сервер"
-
-#: ../lib/network/netconnect.pm:652
-#, fuzzy, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Хоёрдох Сервер"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5548,11 +5894,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "ямх"
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "ямх"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5970,16 +6311,6 @@ msgstr ""
 #~ msgstr "Хийгдсэн"
 
 #, fuzzy
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr "Үгүй."
-
-#, fuzzy
-#~ msgid "Connection type: "
-#~ msgstr "Холболт төрөл "
-
-#, fuzzy
 #~ msgid "%s already in use\n"
 #~ msgstr "Хэрэглэгчийн ТТ хэдийн хэрэглэгдэж байна"
 
@@ -6006,183 +6337,10 @@ msgstr ""
 #~ msgid "Command"
 #~ msgstr "Тушаал"
 
-#~ msgid "none"
-#~ msgstr "аль нь ч үгүй (none)"
-
 #~ msgid "Level"
 #~ msgstr "Түвшин"
 
 #, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Үйлчилгээ удирдагч"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Чимээгүйг танигчийг ажиллуулж эхлэх"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Та наалт товчилуур идэвхжүүлэхийг хүсэж байна уу?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Үгүй"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "%s идэвхижүүлэх"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Сүлжээний интерфэйс"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "төрөл"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Оролт/Гаралт-модул"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Алсын IP хаяг:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Хостын нэрийг олж чадсангүй: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Үйлчилгээ удирдагч"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Порт: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Үл хэрэгсэх"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Чимээгүйг танигчийг ажиллуулж эхлэх"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Кабель холболт"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "вы?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Энэ нууц үгийг санах"
-
-#~ msgid "Gateway:"
-#~ msgstr "Гарц:"
-
-#~ msgid "Interface:"
-#~ msgstr "Харагдалт:"
-
-#, fuzzy
-#~ msgid "Manage connections"
-#~ msgstr "Кабель холболт"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS тохиргоо"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "Домэйн"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "Автоматаар"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Ачаалахад эхлүүл"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>S"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Интернэт"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Энгийн Модем холболт"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Файл сонгох"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Модем"
-
-#~ msgid "Vendor"
-#~ msgstr "Борлуулагч"
-
-#~ msgid "Module name"
-#~ msgstr "Модулын нэр"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "Хаяг:"
-
-#~ msgid "Bus"
-#~ msgstr "Бус"
-
-#, fuzzy
-#~ msgid "Location on the bus"
-#~ msgstr "Байршил"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Сонгох"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Сүлжээг дахин эхлүүлж байхад алдаа тохиолдлоо\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Internet connection configuration"
-#~ msgstr "Интернэт"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Эхний Сервер"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Эхний Сервер"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Интернэт холболтын тохируулга"
-
-#~ msgid "Internet access"
-#~ msgstr "Интернэт хандалт"
-
-#~ msgid "Status:"
-#~ msgstr "Төлөв:"
-
-#~ msgid "Parameters"
-#~ msgstr "Параметрүүд"
-
-#, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Үгүй"
 
diff --git a/po/ms.po b/po/ms.po
index d950855..04cf9bb 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2008-09-08 22:07+0800\n"
 "Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
 "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -25,14 +25,16 @@ msgid "Interface"
 msgstr "Antaramuka"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Alamat IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -68,23 +70,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfigurasikan peranti dan sambungan rangkaian"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Bantuan"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Terap"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Batal"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -94,7 +100,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -103,7 +110,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Sila tunggu"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, fuzzy, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Sila tunggu, menambah media..."
@@ -137,6 +144,7 @@ msgstr "_Adapter:"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -152,6 +160,7 @@ msgid "Started on boot"
 msgstr "Aktifkan semasa But"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, fuzzy, c-format
 msgid "DHCP client"
 msgstr "Klien MSN"
@@ -164,17 +173,19 @@ msgid ""
 msgstr "dalam utama"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Name=Network Interface"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, fuzzy, c-format
 msgid "No IP"
 msgstr "IP Dinamik"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Topengan Subnet:"
@@ -227,12 +238,12 @@ msgid ""
 "What would you like to do?"
 msgstr "Internet siap dimatikan?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Lumpuh"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Hidupkan"
@@ -247,8 +258,8 @@ msgstr "Ulangtetap"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Peranti Blok"
@@ -314,7 +325,11 @@ msgstr "Nama domain tetamu"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -597,13 +612,14 @@ msgstr "Pengguna dibenarkan"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Menerapkan aturan firewall ip6tables: \n"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Tidak boleh menghubungi mirror %s"
@@ -613,12 +629,12 @@ msgstr "Tidak boleh menghubungi mirror %s"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Benarkan FXP:"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, fuzzy, c-format
 msgid "Block"
 msgstr "Teks Blok"
@@ -645,12 +661,12 @@ msgstr "Servis Rangkaian"
 msgid "Clear logs"
 msgstr "/Paparan _Log"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, fuzzy, c-format
 msgid "Blacklist"
 msgstr "Buang dari senarai hitam"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, fuzzy, c-format
 msgid "Whitelist"
 msgstr "Buang dari senarai putih"
@@ -798,7 +814,7 @@ msgstr "Mod"
 msgid "Enabled"
 msgstr "Hidupkan"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, fuzzy, c-format
 msgid "Description"
 msgstr "Penan&da Arah"
@@ -840,9 +856,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Amaran"
@@ -2304,12 +2320,12 @@ msgid ""
 "network"
 msgstr "Amaran"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Tersambung"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Tidak disambung"
@@ -2374,7 +2390,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrik"
@@ -2414,19 +2430,22 @@ msgstr "Model Keselamatan:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Pengesahan"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, fuzzy, c-format
 msgid "Account Login (user name)"
 msgstr "Sila berikan nama pengguna"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, fuzzy, c-format
 msgid "Account Password"
 msgstr "Kata Laluan & Akaun Pengguna"
@@ -2548,13 +2567,15 @@ 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:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Alamat IP DCC:"
@@ -2580,21 +2601,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "tetap masatamat dalam saat"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "Menentukan nama hos dan domain..."
@@ -2605,11 +2630,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, fuzzy, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP dalam"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Gateway dalam"
@@ -2628,6 +2655,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "DHCP"
@@ -2649,6 +2677,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "Pelayan Rangkaian"
@@ -2717,27 +2746,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, fuzzy, c-format
 msgid "Script-based"
 msgstr "Berasaskan:"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, fuzzy, c-format
 msgid "Terminal-based"
 msgstr "Berasaskan:"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3896,90 +3930,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr "Red Hat Enterprise Linux"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, fuzzy, c-format
 msgid "Windows driver"
 msgstr "Pemacu Pencetak"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Tetapan Wireless"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "M-x nxml-mode"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Ad-hoc"
 msgstr "Betulkan Tarikh & Masa..."
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Diuruskan oleh:"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Induk"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Pengulang"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekunder"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, fuzzy, c-format
 msgid "Network name (ESSID)"
 msgstr "Tetap Nama Imej"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, fuzzy, c-format
 msgid "Encryption mode"
 msgstr "M-x nxml-mode"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Kekunci enkripsi"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Katalaluan"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Ben_arkan logmasuk luartalian"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3987,12 +4024,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Katalaluan Tidak Betul"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4011,12 +4048,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Muatturun Sijil CA"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4025,32 +4062,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Id Bina."
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, fuzzy, c-format
 msgid "Operating frequency"
 msgstr "Sistem Pengoperasian"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, fuzzy, c-format
 msgid "Sensitivity threshold"
 msgstr "Kesensitifan (10-32767):"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, fuzzy, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Sedang Diguna"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4064,17 +4106,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Dokumentasi"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, fuzzy, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Ralat menghurai hujah senarai arahan: %s"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4085,12 +4129,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, fuzzy, c-format
 msgid "iwspy command extra arguments"
 msgstr "Ralat menghurai hujah senarai arahan: %s"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4102,12 +4147,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, fuzzy, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Ralat menghurai hujah senarai arahan: %s"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4125,107 +4171,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokol Skype"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Auto-kesan kemera"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "M-x nxml-mode"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MD5"
 msgstr "Guna Katalaluan MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "TTLS TLS"
 msgstr "Guna TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, fuzzy, c-format
 msgid "EAP key_mgmt"
 msgstr "Gugusan Kunci OpenPGP"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, fuzzy, c-format
 msgid "EAP outer identity"
 msgstr "Gaya petikan (dua) luaran"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4233,12 +4279,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4247,12 +4293,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Muatturun Sijil CA"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4262,12 +4308,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4277,12 +4323,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, fuzzy, c-format
 msgid "Extra directives"
 msgstr "'(' tambahan dalam label pakej: %s\n"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4300,50 +4346,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, fuzzy, c-format
 msgid "An encryption key is required."
 msgstr "Katalaluan diperlukan, ini adalah dokumen yang dienkrip"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, fuzzy, c-format
 msgid "Allow access point roaming"
 msgstr "Benarkan capaian dari semua hos"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4485,6 +4531,278 @@ msgstr "Sambung"
 msgid "Hostname changed to \"%s\""
 msgstr "&Lompat ke hiperlink"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, fuzzy, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr "Tidak on."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Antaramuka rangkaian"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Pilih kad yang anda ingin konfigurasikan:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr "A"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Tahniah dan Internet"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Perhati sambungan rangkaian"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Peranti "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Tetapan KFish"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Pelayan DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Tambah domain carian"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "tiada"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatik"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Aktifkan semasa But"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, fuzzy, c-format
+msgid "Dialing mode"
+msgstr "M-x nxml-mode"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, fuzzy, c-format
+msgid "Connection speed"
+msgstr "Muatturun `%s', kelajuan:%s"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, fuzzy, c-format
+msgid "Connection timeout (in sec)"
+msgstr "tetap masatamat dalam saat"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, fuzzy, c-format
+msgid "Provider phone number"
+msgstr "Ubah jumlah lajur"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Sambungan Gagal"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Pilih fail"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, fuzzy, c-format
+msgid "Card IRQ"
+msgstr "Permainan Kad"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, fuzzy, c-format
+msgid "Card mem (DMA)"
+msgstr "Kad Elektronik Perniagaan"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, fuzzy, c-format
+msgid "Card IO"
+msgstr "Port IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, fuzzy, c-format
+msgid "Card IO_0"
+msgstr "Port IO"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, fuzzy, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Eropah Tengah, Macintosh"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, fuzzy, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr "Protokol Saluran"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Mod"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Buku Alamat"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Sedang Diguna"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway dalam"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Antaramuka"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "(tiada tetikus dikonfigurasikan)"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr "dalam utama"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Alamat IP pelayan DNS induk:"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, fuzzy, c-format
+msgid "First DNS Server (optional)"
+msgstr "Alamat IP pelayan DNS induk:"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, fuzzy, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Alamat IP pelayan DNS induk:"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Alamat IP pelayan DNS induk:"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Tetapan KFish"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Kawalan Jauh"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Jenis Sambungan"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Status"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, fuzzy, c-format
+msgid "Testing your connection..."
+msgstr "Perkongsian sambungan Internet"
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Parameter Tambahan"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4676,11 +4994,6 @@ msgstr "Guna Susunan RTL"
 msgid "No device found"
 msgstr "Tiada peranti dijumpai"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Peranti "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4903,6 +5216,103 @@ msgstr "Pasang plugin baru"
 msgid "Select a device:"
 msgstr "Peranti Blok"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Penemuan Servis"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Laksana pemasangan dalam mod interaktif"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "mula?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Antaramuka rangkaian"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokol"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Alamat IP"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Penemuan Servis"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Menerapkan aturan firewall ip6tables: \n"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Sambungan Gagal"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "mula?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, fuzzy, c-format
 msgid "Please select your network:"
@@ -4946,18 +5356,6 @@ msgstr "Kad Elektronik Perniagaan"
 msgid "Protocol for the rest of the world"
 msgstr "tiada protokol ditakrif untuk `%s'"
 
-#: ../lib/network/netconnect.pm:71
-#, fuzzy, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Eropah Tengah, Macintosh"
-
-#: ../lib/network/netconnect.pm:72
-#, fuzzy, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr "Protokol Saluran"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5006,11 +5404,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Pusat Kawalan"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, fuzzy, c-format
-msgid "Testing your connection..."
-msgstr "Perkongsian sambungan Internet"
-
 #: ../lib/network/netconnect.pm:344
 #, fuzzy, c-format
 msgid "Connection Configuration"
@@ -5031,11 +5424,6 @@ msgstr "Nombor panggilan untuk difakskan"
 msgid "Provider name (ex provider.net)"
 msgstr "Masukkan nama penyedia untuk akaun ini."
 
-#: ../lib/network/netconnect.pm:349
-#, fuzzy, c-format
-msgid "Provider phone number"
-msgstr "Ubah jumlah lajur"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5046,41 +5434,6 @@ msgstr "Pelayan Nama DNS"
 msgid "Provider DNS 2 (optional)"
 msgstr "Pelayan Nama DNS"
 
-#: ../lib/network/netconnect.pm:352
-#, fuzzy, c-format
-msgid "Dialing mode"
-msgstr "M-x nxml-mode"
-
-#: ../lib/network/netconnect.pm:353
-#, fuzzy, c-format
-msgid "Connection speed"
-msgstr "Muatturun `%s', kelajuan:%s"
-
-#: ../lib/network/netconnect.pm:354
-#, fuzzy, c-format
-msgid "Connection timeout (in sec)"
-msgstr "tetap masatamat dalam saat"
-
-#: ../lib/network/netconnect.pm:357
-#, fuzzy, c-format
-msgid "Card IRQ"
-msgstr "Permainan Kad"
-
-#: ../lib/network/netconnect.pm:358
-#, fuzzy, c-format
-msgid "Card mem (DMA)"
-msgstr "Kad Elektronik Perniagaan"
-
-#: ../lib/network/netconnect.pm:359
-#, fuzzy, c-format
-msgid "Card IO"
-msgstr "Port IO"
-
-#: ../lib/network/netconnect.pm:360
-#, fuzzy, c-format
-msgid "Card IO_0"
-msgstr "Port IO"
-
 #: ../lib/network/netconnect.pm:361
 #, fuzzy, c-format
 msgid "Card IO_1"
@@ -5235,16 +5588,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nama Domain:"
 
-#: ../lib/network/netconnect.pm:651
-#, fuzzy, c-format
-msgid "First DNS Server (optional)"
-msgstr "Alamat IP pelayan DNS induk:"
-
-#: ../lib/network/netconnect.pm:652
-#, fuzzy, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Alamat IP pelayan DNS induk:"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5517,11 +5860,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "dalam"
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway dalam"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5941,16 +6279,6 @@ msgstr ""
 #~ msgstr "on am Rangkaian."
 
 #, fuzzy
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr "Tidak on."
-
-#, fuzzy
-#~ msgid "Connection type: "
-#~ msgstr "Jenis Sambungan"
-
-#, fuzzy
 #~ msgid "%s already in use\n"
 #~ msgstr "%s telah digunakan\n"
 
@@ -6165,9 +6493,6 @@ msgstr ""
 #~ msgid "ipsec"
 #~ msgstr "Pelaksanaan IPSEC Openswan"
 
-#~ msgid "none"
-#~ msgstr "tiada"
-
 #, fuzzy
 #~ msgid "Source/destination"
 #~ msgstr "Fail Sumber C++"
@@ -6178,7 +6503,3 @@ msgstr ""
 #, fuzzy
 #~ msgid "default"
 #~ msgstr "Default"
-
-#, fuzzy
-#~ msgid "use"
-#~ msgstr "Sedang Diguna"
diff --git a/po/mt.po b/po/mt.po
index 566f563..30aa042 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mt\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -28,14 +28,16 @@ msgid "Interface"
 msgstr "Interfaċċja"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Indirizz IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
@@ -71,23 +73,27 @@ msgid "Configure Local Area Network..."
 msgstr "Ikkonfigura network lokali (LAN)..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Għajnuna"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Applika"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Ikkanċella"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -97,7 +103,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -106,7 +113,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Stenna ftit"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Stenna ftit... qed napplika l-konfigurazzjoni"
@@ -142,6 +149,7 @@ msgstr "Adattur %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -157,6 +165,7 @@ msgid "Started on boot"
 msgstr "Tella' fil-bidu"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Klijent DHCP"
@@ -171,17 +180,19 @@ msgstr ""
 "Ħaddem is-saħħar \"Żid interfaċċja\" miċ-Ċentru tal-Kontroll Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Neħħi interfaċċja tan-network"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Ebda IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Ebda maskra"
@@ -251,12 +262,12 @@ msgstr ""
 "\n"
 "X'tixtieq tagħmel?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Itfi"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Ixgħel"
@@ -271,8 +282,8 @@ msgstr "Erġa' kkonfigura"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Tagħmir tan-network"
@@ -340,7 +351,11 @@ msgstr "Isem intern tad-dominju"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -633,13 +648,14 @@ msgstr "Ippermetti l-users kollha"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Firewallr"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Ma stajtx nikkuntattja l-mera %s"
@@ -649,12 +665,12 @@ msgstr "Ma stajtx nikkuntattja l-mera %s"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Kollha"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -681,12 +697,12 @@ msgstr "Ħu kopja tas-sigurtà tal-fajls tal-users"
 msgid "Clear logs"
 msgstr "Neħħi kollox"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -834,7 +850,7 @@ msgstr "Modalità"
 msgid "Enabled"
 msgstr "Ixgħel"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Deskrizzjoni"
@@ -876,9 +892,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Twissija"
@@ -2348,12 +2364,12 @@ msgstr ""
 "Twissija: instabet konnessjoni oħra tal-Internet, forsi qed tuża n-network "
 "tiegħek"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Imqabbad"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Mhux imqabbad"
@@ -2418,7 +2434,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metriku"
@@ -2458,19 +2474,22 @@ msgstr "Mudell tal-kard :"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Awtentikazzjoni"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Login tal-kont (user name)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Password tal-kont"
@@ -2594,13 +2613,15 @@ msgstr ""
 "Jekk jogħġbok daħħal il-konfigurazzjoni IP għal dan il-kompjuter.\n"
 "Kull element huwa indirizz IP fil-format deċimali bit-tikek (eż, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "IP tas-server DHCP"
@@ -2628,21 +2649,25 @@ msgstr ""
 "sħiħ."
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Ħin biex tiskadi l-konnessjoni (sek)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Isem il-kompjuter DHCP"
@@ -2653,11 +2678,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "L-indirizz IP irid ikun fil-format \"1.2.3.4\""
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "L-indirizz tal-gateway irid ikun fil-format 1.2.3.4"
@@ -2676,6 +2703,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Assenja isem il-kompjuter mill-indirizz DHCP"
@@ -2697,6 +2725,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Konfigurazzjoni \"hotplug\" tan-network"
@@ -2765,27 +2794,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Ibbażat fuq skritti"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Ibbażat fuq terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3944,90 +3978,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Konnessjoni Wireless"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Modalità tal-operazzjoni"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Immaniġġjat"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Ewlieni"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Ripetitur"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekondarju"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Awto:"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Isem tan-network (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Ċavetta taċ-ċifrazzjoni"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Login tal-kont (user name)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4035,12 +4072,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4059,12 +4096,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Isem iċ-ċertifikat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4073,32 +4110,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID tan-network"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frekwenza ta' l-operazzjoni"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Livell ta' sensitività"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Rata ta' bits (b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4120,17 +4162,19 @@ msgstr ""
 "daqs il-valur massimu jitfi din l-iskema. Tista' wkoll tissettja dan il-\n"
 "parametru għal auto, fixed, on jew off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Frammentazzjoni"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "parametri oħra għall-kmand iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4146,12 +4190,13 @@ msgstr ""
 "Ara l-paġna ta' man għal iwconfig(8) għal iżjed tagħrif."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "parametri oħra għall-kmand iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4171,12 +4216,13 @@ msgstr ""
 "\n"
 "Ara l-paġna ta' man għal iwspy(8) għal iżjed tagħrif."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "parametri oħra għall-kmand iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4204,107 +4250,107 @@ msgstr ""
 "\n"
 "Ara l-paġna ta' man għal iwpriv(8) għal iżjed tagħrif."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokoll"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Għarfien awtomatiku"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Modalità"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4312,12 +4358,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4326,12 +4372,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Tip ta' ċertifikat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4341,12 +4387,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4356,12 +4402,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4379,26 +4425,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4407,7 +4453,7 @@ msgstr ""
 "Il-frekwenza għandha jkollha suffiss ta' k, M jew G (eż: \"2.46G\" għal 2.46 "
 "GHz), jew inkella żid biżżejjed żeros."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4416,17 +4462,17 @@ msgstr ""
 "Il-frekwenza għandha jkollha suffiss ta' k, M jew G (eż: \"11M\" għal 11M), "
 "jew inkella żid biżżejjed żeros."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4572,6 +4618,287 @@ msgstr "Aqbad"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Ebda adattur tan-network ethernet ma nstab fuq is-sistema tiegħek. Jekk "
+"jogħġbok ħaddem l-għodda tal-konfigurazzjoni tal-ħardwer."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Neħħi interfaċċja tan-network"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Agħżel l-interfaċċja tan-network biex tikkonfigura:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Kien hemm problema waqt it-tneħħija tal-interfaċċja tan-network \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Prosit, l-interfaċċja tan-network \"%s\" tneħħiet"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Immaniġġja konnessjonijiet"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Apparat: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Konfigurazzjoni IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Servers DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Fittex dominju"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ebda"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statiku"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Tella' fil-bidu"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Tip ta' daljar"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Veloċità tal-konnessjoni"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Ħin biex tiskadi l-konnessjoni (sek)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telefon tal-ISP"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Terminazzjoni tal-linja"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Skadenza tal-ħin tal-modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Uża fajl biex issakkar"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Stenna ton ta' daljar qabel tiddalja"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Busy wait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Ħoss tal-modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ tal-kard"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Mem. tal-kard (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO tal-kard"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 tal-kard"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protokoll Ewropew (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokoll għall-kumplament tad-dinja\n"
+" ebda kanal D (leased line)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Manifattur"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Klassi ta' medja"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Isem tal-modulu"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Indirizz Mac"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Post fuq il-bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "L-indirizz tal-gateway irid ikun fil-format 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfaċċja:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Konfigurazzjoni tal-konnessjoni internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"M'għandek ebda konnessjoni mal-internet ikkonfigurata.\n"
+"Ħaddem is-saħħar \"%s\" miċ-Ċentru tal-Kontroll Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Isem il-kompjuter (opzjonali)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "L-ewwel server DNS (opzjonali)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "It-tieni server DNS (opzjonali)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "It-tielet server DNS (opzjonali)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Konfigurazzjoni tal-konnessjoni internet"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Aċċess għall-internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tip ta' konnessjoni: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Stat:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Qed nittestja l-kollegament..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametri"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4775,11 +5102,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Ebda tagħmir ma nstab!"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Apparat: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5002,6 +5324,103 @@ msgstr "Tella' drajver manwalment"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Manager tas-servizzi"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Instabet konfigurazzjoni ta' firewall!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Trid tuża din il-faċilità?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Ebda dettalji"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "tip: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interfaċċja tan-network"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "tip: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokolli"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Indirizz IP tal-kompjuter:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Qed jiġi ssettjat l-isem tal-kompjuter %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Manager tas-servizzi"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Injora"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Instabet konfigurazzjoni ta' firewall!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Konnessjoni Wireless"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Trid tikkonfigura issa?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Ftakar dan il-password"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5045,20 +5464,6 @@ msgstr "Kard ISDN interna"
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll għall-kumplament tad-dinja"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protokoll Ewropew (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokoll għall-kumplament tad-dinja\n"
-" ebda kanal D (leased line)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5107,11 +5512,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Qed nittestja l-kollegament..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5132,11 +5532,6 @@ msgstr "Numru tat-telefon tiegħek"
 msgid "Provider name (ex provider.net)"
 msgstr "Isem tal-ISP (eż. provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telefon tal-ISP"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5147,41 +5542,6 @@ msgstr "DNS 1 tal-ISP (opzjonali)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 tal-ISP (opzjonali)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Tip ta' daljar"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Veloċità tal-konnessjoni"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Ħin biex tiskadi l-konnessjoni (sek)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ tal-kard"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Mem. tal-kard (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO tal-kard"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 tal-kard"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5348,16 +5708,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Isem tad-dominju"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "L-ewwel server DNS (opzjonali)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "It-tieni server DNS (opzjonali)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5669,11 +6019,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "L-indirizz tas-server DNS irid ikun fil-format 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "L-indirizz tal-gateway irid ikun fil-format 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6118,16 +6463,6 @@ msgstr ""
 #~ "\n"
 #~ "Se nissettja n-network lokali fuq dak l-adattur."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Ebda adattur tan-network ethernet ma nstab fuq is-sistema tiegħek. Jekk "
-#~ "jogħġbok ħaddem l-għodda tal-konfigurazzjoni tal-ħardwer."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tip ta' konnessjoni: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s diġà qed jintuża\n"
 
@@ -6672,9 +7007,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "armi"
 
-#~ msgid "none"
-#~ msgstr "ebda"
-
 #~ msgid "transport"
 #~ msgstr "trasport"
 
@@ -6700,176 +7032,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Trid tilloggja 'l barra u terġa' tidħol biex ikollhom effett il-bidliet."
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Manager tas-servizzi"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Instabet konfigurazzjoni ta' firewall!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Trid tuża din il-faċilità?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Ebda dettalji"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Interfaċċja tan-network"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "tip: %s"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokolli"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Indirizz IP tal-kompjuter:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Qed jiġi ssettjat l-isem tal-kompjuter %s: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Manager tas-servizzi"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Port: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Injora"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Instabet konfigurazzjoni ta' firewall!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Konnessjoni Wireless"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Trid tikkonfigura issa?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Ftakar dan il-password"
-
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfaċċja:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Immaniġġja konnessjonijiet"
-
-#~ msgid "IP configuration"
-#~ msgstr "Konfigurazzjoni IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Servers DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "Fittex dominju"
-
-#~ msgid "static"
-#~ msgstr "statiku"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Tella' fil-bidu"
-
-#~ msgid "Line termination"
-#~ msgstr "Terminazzjoni tal-linja"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Skadenza tal-ħin tal-modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Uża fajl biex issakkar"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Stenna ton ta' daljar qabel tiddalja"
-
-#~ msgid "Busy wait"
-#~ msgstr "Busy wait"
-
-#~ msgid "Modem sound"
-#~ msgstr "Ħoss tal-modem"
-
-#~ msgid "Vendor"
-#~ msgstr "Manifattur"
-
-#~ msgid "Media class"
-#~ msgstr "Klassi ta' medja"
-
-#~ msgid "Module name"
-#~ msgstr "Isem tal-modulu"
-
-#~ msgid "Mac Address"
-#~ msgstr "Indirizz Mac"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Post fuq il-bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Neħħi interfaċċja tan-network"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kien hemm problema waqt it-tneħħija tal-interfaċċja tan-network \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Prosit, l-interfaċċja tan-network \"%s\" tneħħiet"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Aqta'..."
 
 #~ msgid "Connect..."
 #~ msgstr "Aqbad..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Konfigurazzjoni tal-konnessjoni internet"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Isem il-kompjuter (opzjonali)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "It-tielet server DNS (opzjonali)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Konfigurazzjoni tal-konnessjoni internet"
-
-#~ msgid "Internet access"
-#~ msgstr "Aċċess għall-internet"
-
-#~ msgid "Status:"
-#~ msgstr "Stat:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametri"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Ebda dettalji"
diff --git a/po/nb.po b/po/nb.po
index 73e21df..8859ccc 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -19,7 +19,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nb\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-22 00:11+0200\n"
 "Last-Translator: Olav Dahlum <odahlum@gmail.com>\n"
 "Language-Team: Norwegian Bokmål <mageia-i18n@mandrivalinux.org>\n"
@@ -42,14 +42,16 @@ msgid "Interface"
 msgstr "Grensesnitt"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-adresse"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
@@ -85,23 +87,27 @@ msgid "Configure Local Area Network..."
 msgstr "Sett opp lokalt nettverk …"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Bruk"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -111,7 +117,8 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -120,7 +127,7 @@ msgstr "OK"
 msgid "Please wait"
 msgstr "Vent litt"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Vent litt … slår på oppsettet"
@@ -156,6 +163,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Nettmaske"
@@ -171,6 +179,7 @@ msgid "Started on boot"
 msgstr "På oppstart"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-klient"
@@ -185,17 +194,19 @@ msgstr ""
 "Kjør «%s» fra Mageia Kontrollsenter"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Sett opp et nytt nettverksgrensesnitt (LAN, ISDN, ADSL, …)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Ingen IP-adresse"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Ingen nettmaske"
@@ -266,12 +277,12 @@ msgstr ""
 "\n"
 "Hva vil du gjøre?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Slå av"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Slå på"
@@ -286,8 +297,8 @@ msgstr "Sett opp på nytt"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Vennligst velg nettverkskortet som er direkte tilkoblet Internett."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Nettenhet"
@@ -363,7 +374,11 @@ msgstr "Det interne domenenavnet"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -661,13 +676,14 @@ msgstr "Tillatte adresser"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiv brannmur"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Klarte ikke å kontakte tjeneste"
@@ -677,12 +693,12 @@ msgstr "Klarte ikke å kontakte tjeneste"
 msgid "Log"
 msgstr "Logg"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Tillat"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokkér"
@@ -709,12 +725,12 @@ msgstr "Blokkerte tjenester"
 msgid "Clear logs"
 msgstr "Tøm logger"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Svarteliste"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Hvitliste"
@@ -864,7 +880,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Slått på"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Beskrivelse"
@@ -912,9 +928,9 @@ msgstr ""
 "Du bruker nå nettverksprofil %s. Du kan sette opp systemet ditt som vanlig "
 "og alle nettverksinnstillinger vil fra nå av bli lagret i denne profilen."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Advarsel"
@@ -2476,12 +2492,12 @@ msgstr ""
 "Advarsel, en annen Internettoppkobling som kanskje bruker nettverket ditt "
 "har blitt oppdaget"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Ikke tilkoblet"
@@ -2546,7 +2562,7 @@ msgstr "Slå på trafikkutregning"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrisk"
@@ -2588,19 +2604,22 @@ msgstr "Kabelmodem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "bruk BPALogin (nødvendig for Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentisering"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Innloggingskonto (brukernavn)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Kontopassord"
@@ -2727,13 +2746,15 @@ msgstr ""
 "Hvert element bør skrives som en IP-adresse i\n"
 "punkt-/desimalnotasjon (f.eks. 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Hent DNS-tjenere fra DHCP"
@@ -2761,21 +2782,25 @@ msgstr ""
 "vertsnavnet"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP-tidsavbrudd (i sekunder)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Hent YP-tjenere fra DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Hent NTPD-tjenere fra DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-vertsnavn"
@@ -2786,11 +2811,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Ikke fall tilbake til Zeroconf (169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresse bør være i formatet 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Nettmaske bør være i formatet 255.255.224.0"
@@ -2813,6 +2840,7 @@ msgstr ""
 "slås på ved oppstart."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Tilegn vertsnavn fra DHCP-tjener (eller opprett et unikt)"
@@ -2839,6 +2867,7 @@ msgstr ""
 "«localhost.localdomain» bli brukt."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hurtigkobling for nettverk"
@@ -2908,27 +2937,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analogt telefonmodem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skriptbasert"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4087,90 +4121,93 @@ msgstr "WPA/WPA2 forhåndsdelt nøkkel"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Bedrift"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Driver for Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "Ditt trådløse nettverkskort er slått av, vennligst slå det på først."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Trådløst oppsett"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Operasjonsmodus"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Håndtert"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Hoved"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeterer"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nettverksnavn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Krypteringsmodus"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnøkkel"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Gjem passord"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Tving bruken av denne nøkkelen som ASCII-streng (f.eks for LiveBox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP innlogging/brukernavn"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4181,12 +4218,12 @@ msgstr ""
 "den utestede syntaksen DOMAIN\\username hvis du\n"
 "må å angi domenet."
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP passord"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4219,12 +4256,12 @@ msgstr ""
 "  Moduset TLS er fullstending sertifikatbasert og kan overse\n"
 "verdiene for brukernavn og passord angitt her."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP klientsertifikat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4237,32 +4274,37 @@ msgstr ""
 "bli sett på som alternativet til brukernavn og passord.\n"
 " Merknad: andre relaterte instillinger er vist på siden Avansert."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "NettverksID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Operasjonsfrekvens"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Følsomhetsgrense"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (i b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4287,17 +4329,19 @@ msgstr ""
 "parameteren til auto, fixed\n"
 "eller off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentering"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4313,12 +4357,13 @@ msgstr ""
 "Se manualsida iwconfig(8) for mer informasjon."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4339,12 +4384,13 @@ msgstr ""
 "\n"
 "Se manualsida iwpspy(8) for mer informasjon."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "ekstra argumenter for kommandoen iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4373,28 +4419,28 @@ msgstr ""
 "\n"
 "Se manualsida iwpriv(8) for mer informasjon."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protokoll for EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Automatisk oppdagelse"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4403,67 +4449,67 @@ msgstr ""
 "Automatisk oppdagelse anbefales da den først prøver WPA\n"
 "versjon 2 med tilbakefall på WPA versjon 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Modus for EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4472,12 +4518,12 @@ msgstr ""
 "En liste over aksepterte protokoller for håndtering av\n"
 "autentisering. Mulige valg er: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Ytre identitet for EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4488,12 +4534,12 @@ msgstr ""
 "ukrypterte identiteten med EAP-typer som støtter\n"
 "forskjellige identiteter gjennom tunnell, f.eks, TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4506,12 +4552,12 @@ msgstr ""
 "auth=MSCHAPV2 for PEAP eller\n"
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "CA-sertifikat for EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4526,12 +4572,12 @@ msgstr ""
 "Hvis mulig, bør et pålitelig sertifikat alltid settes opp\n"
 "når man benytter TLS, TTLS eller PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Emnetreff for EAP-sertifikat"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4545,12 +4591,12 @@ msgstr ""
 "finnes i emnet  Emnestrengen er ifølgende format:\n"
 "/C=US/ST=CA/L=Oslo/CN=Test AS/e-postadresse=test@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Ekstra direktiver"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4579,12 +4625,12 @@ msgstr ""
 "brukes for å tvinge<br> \tspesialinnstillinger forskjellige fra "
 "instillingene i brukergrensesnitet."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Krever en krypteringsnøkkel."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4593,7 +4639,7 @@ msgstr ""
 "Den forhåndsdelte nøkkelen bør ha mellom 8 og 63 ASCII-tegn eller 64 "
 "heksadesimaler."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4601,7 +4647,7 @@ msgid ""
 msgstr ""
 "WEP-nøkkelen bør på det meste ha %d ASCII-tegn eller %d heksadesimaler."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4610,7 +4656,7 @@ msgstr ""
 "Frekvens skal ha fortegnet k, M eller G (For eksempel «2.46 G» for 2.46 "
 "GHz ) eller tilstrekkelig antall nuller."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4619,17 +4665,17 @@ msgstr ""
 "Hastighet skal ha fortegnet k, M eller G (for eksempel «11 M» for 11 M), "
 "eller tilstrekkelig antall nuller."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Tillat aksesspunktvandring"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Tilegna til trådløst nettverk «%s» på grensesnitt %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Mistet det tilegnede trådløse nettverket på grensesnitt %s"
@@ -4777,6 +4823,285 @@ msgstr "Koble til"
 msgid "Hostname changed to \"%s\""
 msgstr "Vertsnavn endret til «%s»"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Nettverksgrensesnitt"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Velg nettverksgrensesnittet som skal settes opp:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Et problem oppsto ved omstart av nettverket: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Nettverksoppsettet er fullført."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Håndter VPN-tilkoblinger"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Enhet: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN-oppsett"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS-tjener 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Søk gjennom domene"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatisk"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "På oppstart"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Oppringningsmodus"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Oppkoblingshastighet"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Oppkoblingens tidsavbrudd (i sekunder)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Tilbyders telefonnummer"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>A"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modemtilkobling"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Velg fila"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kort IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kort mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kort IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kort IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europaprotokollen (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Resten av verden\n"
+"Ingen D-kanal (leid linje)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Virkelig adresse"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Hviterussland"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gatewayadresse bør være i formatet 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Grensesnitt"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Ingen Internetttilkobling er satt opp"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Du har ennå ikke satt opp en internettilkobling.\n"
+"Kjør «%s» fra Mageia Kontrollsenter."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Første DNS-tjener (valgfri)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Første DNS-tjener (valgfri)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Andre DNS-tjener (valgfri)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Første DNS-tjener (valgfri)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Oppsett av tilkobling"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Skrivertilgang"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Oppkoblingstid: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Status"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Tester tilkoblingen din …"
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP-parametre"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4983,11 +5308,6 @@ msgstr "Bruk interaktiv brannmur"
 msgid "No device found"
 msgstr "Fant ingen enhet"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Enhet: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5222,6 +5542,103 @@ msgstr "Installer en ny driver"
 msgid "Select a device:"
 msgstr "Velg en enhet:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Tjenesteangrep"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Automatisk interaktiv brannmursmodus"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Hvordan vil du ringe opp denne tilkoblingen?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Nettverksgrensesnitt"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP-adresse: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Tjenesteangrep"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktiv brannmur"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Trådløs tilkobling"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Hvordan vil du ringe opp denne tilkoblingen?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5265,20 +5682,6 @@ msgstr "Internt ISDN-kort"
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll for resten av verden"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europaprotokollen (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Resten av verden\n"
-"Ingen D-kanal (leid linje)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5329,11 +5732,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Tilkoblingskontroll"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Tester tilkoblingen din …"
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5354,11 +5752,6 @@ msgstr "Telefonnummer"
 msgid "Provider name (ex provider.net)"
 msgstr "Navn på tilbyder (f.eks., tilbyder.no)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Tilbyders telefonnummer"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5369,41 +5762,6 @@ msgstr "Tilbyders DNS 1 (valgfri)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Tilbyders DNS 2 (valgfri)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Oppringningsmodus"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Oppkoblingshastighet"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Oppkoblingens tidsavbrudd (i sekunder)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kort IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kort mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kort IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kort IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5569,16 +5927,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domenenavn"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Første DNS-tjener (valgfri)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Andre DNS-tjener (valgfri)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5886,11 +6234,6 @@ msgstr "Skriv inn DNS-tjeners IP-adresser."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS-tjeneradresse bør være i formatet 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gatewayadresse bør være i formatet 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/nl.po b/po/nl.po
index cf1af42..b1ae6c2 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-04-30 13:01+0000\n"
 "Last-Translator: Remco Rijnders <remco@webconquest.com>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -36,14 +36,16 @@ msgid "Interface"
 msgstr "Interface"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-adres"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
@@ -79,23 +81,27 @@ msgid "Configure Local Area Network..."
 msgstr "Local Area Network configureren…"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Hulp"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Toepassen"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Annuleren"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -105,7 +111,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -114,7 +121,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Even geduld"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Even geduld… bezig met toepassen van de configuratie"
@@ -150,6 +157,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmasker"
@@ -165,6 +173,7 @@ msgid "Started on boot"
 msgstr "Aangezet bij het opstarten"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP client"
@@ -179,17 +188,19 @@ msgstr ""
 "Start de assistent ‘%s’ vanuit het Mageia configuratiecentrum."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Nieuwe netwerkinterface instellen (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Geen IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Geen masker"
@@ -260,12 +271,12 @@ msgstr ""
 "\n"
 "Wat wenst u te doen?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Inschakelen"
@@ -282,8 +293,8 @@ msgstr ""
 "Kies alstublieft de netwerkinterface die rechtstreeks is verbonden met het "
 "internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Netwerkapparaat"
@@ -362,7 +373,11 @@ msgstr "De interne domeinnaam"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -662,13 +677,14 @@ msgstr "Toegestane adressen"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interactieve firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Niet in staat met deamon te verbinden"
@@ -678,12 +694,12 @@ msgstr "Niet in staat met deamon te verbinden"
 msgid "Log"
 msgstr "Logboek"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Toestaan"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokkeren"
@@ -710,12 +726,12 @@ msgstr "Geblokkeerde diensten"
 msgid "Clear logs"
 msgstr "Logboeken wissen"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Zwarte lijst"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Witte lijst"
@@ -865,7 +881,7 @@ msgstr "Module"
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Beschrijving"
@@ -914,9 +930,9 @@ msgstr ""
 "manier instellen; Alle netwerkinstellingen worden vanaf dit moment in dit "
 "profiel opgeslagen."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Waarschuwing"
@@ -2496,12 +2512,12 @@ msgstr ""
 "Waarschuwing: een andere internetverbinding is bespeurd, misschien gebruikt "
 "deze uw netwerk."
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Verbonden"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Niet verbonden"
@@ -2566,7 +2582,7 @@ msgstr "Schakel 'traffic accounting' in"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrisch"
@@ -2608,19 +2624,22 @@ msgstr "Kabelmodem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin gebruiken (nodig voor Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Aanmeldingscontrole"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Account-aanmelding (gebruikersnaam)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Account-wachtwoord"
@@ -2747,13 +2766,15 @@ msgstr ""
 "Elke ingang moet ingegeven worden als een IP adres in `dotted-decimal'-\n"
 "vorm (bijvoorbeeld 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS-servers van DHCP ophalen"
@@ -2781,21 +2802,25 @@ msgstr ""
 "hostnaam"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP-wachttijd (in seconden)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP-server van DHCP ophalen"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD-servers van DHCP ophalen"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-hostnaam"
@@ -2806,11 +2831,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Niet terugvallen naar Zeroconf (169.254.0.0 netwerk)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Het IP-adres behoort het formaat 1.2.3.4 te hebben"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Netmasker behoort het formaat 255.255.224.0 te hebben"
@@ -2833,6 +2860,7 @@ msgstr ""
 "verbinding te kunnen gebruiken"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2862,6 +2890,7 @@ msgstr ""
 "'localhost.localdomain' gebruikt worden."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "\"Hot\"-aansluiten van netwerk"
@@ -2930,27 +2959,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analoge telefoonmodem"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Script-gebaseerd"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Gebaseerd op een terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4109,12 +4143,12 @@ msgstr "WPA/WPA2 vooraf gedeelde sleutel"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows stuurprogramma"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4123,79 +4157,82 @@ msgstr ""
 "Uw draadloze netwerkkaart is uitgeschakeld, schakel eerst de draadloze "
 "netwerk schakelaar (RF kill switch) in."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Draadloze instellingen"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Operatiemodus"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Beheerd"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secundaire"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatisch"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Netwerknaam (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Versleutelingsmodus"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Vercijferingssleutel"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Verberg paswoord"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Deze sleutel altijd als ASCII-tekenreeks gebruiken (bijv. voor Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP Account-aanmelding/gebruikersnaam"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4206,12 +4243,12 @@ msgstr ""
 "een domein op moet geven, probeer dan de volgende syntax\n"
 "  DOMEIN\\gebruikersnaam"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP Wachtwoord"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4245,12 +4282,12 @@ msgstr ""
 "  TLS modus is volledig certificaatgebaseerd en kan de gebruikersnaam\n"
 " en wachtwoordwaarden volledig negeren."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP clientcertificaat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4265,32 +4302,37 @@ msgstr ""
 "Noot: andere gerelateerd instellingen vindt u op het blad voor geavanceerde "
 "instellingen."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Netwerk-ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Operatiefrequentie"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Drempelwaarde gevoeligheid"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitsnelheid (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4311,17 +4353,19 @@ msgstr ""
 "aan de maximum-packetgrootte maakt dit ontwerp ongedaan. U kunt deze \n"
 "parameter ook instellen op auto, fixed (vast) of off (uit). "
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentatie"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Extra argumenten voor iwconfig-opdracht"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4337,12 +4381,13 @@ msgstr ""
 "Zie de iwconfig(8) manpagina voor meer informatie."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Extra argumenten voor iwspy-opdracht"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4363,12 +4408,13 @@ msgstr ""
 "\n"
 "Zie iwpspy(8) man pagina voor meer informatie."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Extra argumenten voor iwpriv-opdracht"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4399,28 +4445,28 @@ msgstr ""
 "\n"
 "Zie de iwpriv(8) man-pagina voor meer informatie."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP-protocol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Automatisch bespeuren"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4430,67 +4476,67 @@ msgstr ""
 "probeert\n"
 "en eventueel terugvalt op WPA versie 1."
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP-modus"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP sleutel_beheer"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4499,12 +4545,12 @@ msgstr ""
 "lijst van toegestane sleutelbeheer protocollen voor aanmelding\n"
 "mogelijke waarden zijn WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP externe identiteit"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4515,12 +4561,12 @@ msgstr ""
 "niet versleutelde identiteit van EAP types die verschillende getunnelde "
 "identiteiten ondersteunen, bijv. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4533,12 +4579,12 @@ msgstr ""
 "auth=MSCHAPV2 voor PEAP of\n"
 "autheap=MSCHAPV2 autheap=MD5 voor TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA certificaat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4554,12 +4600,12 @@ msgstr ""
 "moet altijd een vertrouwd CA certificaat geconfigureerd worden\n"
 "als TLS, TTLS of PEAP gebruikt wordt."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP certificaat onderwerp komt overeen"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4575,12 +4621,12 @@ msgstr ""
 "volgende format:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Extra aanwijzingen"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4614,12 +4660,12 @@ msgstr ""
 "instellingen te forceren\n"
 "\tdie afwijken van de instellingen in de gebruikersinterface."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Een encryptie-sleutel is verplicht."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4628,7 +4674,7 @@ msgstr ""
 "De vooraf gedeelde sleutel dient tussen de 8 en 63 ASCII-tekens, of 64 "
 "hexadecimale tekens, lang te zijn."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4637,7 +4683,7 @@ msgstr ""
 "De WEP-sleutel dient uit maximaal %d ASCII-tekens of %d hexadecimale tekens "
 "te bestaan."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4647,7 +4693,7 @@ msgstr ""
 "\"voor een frequentie van 2.46 GHz, of genoeg '0' (nullen) aan het eind "
 "toegevoegd."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4656,17 +4702,17 @@ msgstr ""
 "'Rate' dient het achtervoegsel k, M of G te hebben (bijvoorbeeld \"11M\"voor "
 "11M), of genoeg '0' (nullen) aan het eind toegevoegd."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Sta access point roaming toe"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Toegewezen aan draadloos netwerk \"%s\" op interface %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Verbinding met met het draadloos netwerk is verbroken met interface %s"
@@ -4814,6 +4860,285 @@ msgstr "Verbinden"
 msgid "Hostname changed to \"%s\""
 msgstr "Hostnaam is gewijzigd in ‘%s’"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Netwerk Interface"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Selecteer de in te stellen netwerkinterface:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Een probleem deed zich voor bij het herstarten van het netwerk:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Gefeliciteerd, de netwerkconfiguratie is voltooid."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "VPN-verbindingen beheren"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Apparaat: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN-configuratie"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS server 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Zoekdomein"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatisch"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Aangezet bij het opstarten"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Inbelmodus"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Verbindingssnelheid"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Maximale wachttijd voor verbinding (in seconden)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telefoonnummer van uw provider"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modemverbinding"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Selecteer bestand"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Koeweit"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ van de kaart"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Mem (DMA) van de kaart"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO van de kaart"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 van de kaart"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europees protocol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocol voor de rest van de wereld \n"
+" geen D-Channel (geleasde lijnen)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Module"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Echt adres"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Wit-Rusland"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Het gateway-adres moet in het formaat 1.2.3.4 staan"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interface"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Geen internetverbinding geconfigureerd"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"U heeft nog geen geconfigureerde internetverbinding.\n"
+"Start de \"%s\"-assistent vanuit het Mageia configuratiecentrum."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Eerste DNS-server (optioneel)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Eerste DNS-server (optioneel)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Tweede DNS-server (optioneel)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Eerste DNS-server (optioneel)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configuratie van verbinding"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Printertoegang"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Verbindingstijd: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Status"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Bezig met testen van uw verbinding…"
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP-parameters"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -5020,11 +5345,6 @@ msgstr "Interactieve firewall gebruiken"
 msgid "No device found"
 msgstr "Geen apparaten gevonden"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Apparaat: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5260,6 +5580,103 @@ msgstr "Nieuw stuurprogramma installeren"
 msgid "Select a device:"
 msgstr "Selecteer een apparaat:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Dienst-aanval"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interactieve firewall automatische modus"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Op welke manier wilt u contact maken met deze verbinding?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Netwerk Interface"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocol"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP-adres: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Dienst-aanval"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interactieve firewall"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Draadloze verbinding"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Op welke manier wilt u contact maken met deze verbinding?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5303,20 +5720,6 @@ msgstr "Interne ISDN kaart"
 msgid "Protocol for the rest of the world"
 msgstr "Protocol voor de rest van de wereld"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europees protocol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocol voor de rest van de wereld \n"
-" geen D-Channel (geleasde lijnen)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5367,11 +5770,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Verbindingsbeheer"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Bezig met testen van uw verbinding…"
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5392,11 +5790,6 @@ msgstr "Uw persoonlijke telefoonnummer"
 msgid "Provider name (ex provider.net)"
 msgstr "Naam van uw provider (bijv. provider.nl)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telefoonnummer van uw provider"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5407,41 +5800,6 @@ msgstr "DNS 1 van uw provider (optioneel)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 van uw provider (optioneel)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Inbelmodus"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Verbindingssnelheid"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Maximale wachttijd voor verbinding (in seconden)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ van de kaart"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Mem (DMA) van de kaart"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO van de kaart"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 van de kaart"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5608,16 +5966,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domeinnaam"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Eerste DNS-server (optioneel)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Tweede DNS-server (optioneel)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5926,11 +6274,6 @@ msgstr "Tenslotte kunt u ook de IP-adressen van uw DNS-server intypen."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Het DNS-serveradres moet in het formaat 1.2.3.4 staan"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Het gateway-adres moet in het formaat 1.2.3.4 staan"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/nn.po b/po/nn.po
index f63f830..d021d39 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2010-02-07 16:52+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Grensesnitt"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-adresse"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "Set opp lokalnett …"
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Hjelp"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Bruk"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -95,7 +101,8 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "OK"
 msgid "Please wait"
 msgstr "Vent litt "
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Vent litt … Gjer klar oppsett"
@@ -140,6 +147,7 @@ msgstr "Kort %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Nettmaske"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "Starta ved oppstart"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-klient"
@@ -169,17 +178,19 @@ msgstr ""
 "Køyr «%s»-vegvisaren i kontrollsenteret."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Set opp nytt nettverksgrensesnitt (LAN, ISDN, ADSL)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Ingen IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Inga maske"
@@ -248,12 +259,12 @@ msgstr ""
 "\n"
 "Kva vil du gjera?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Ikkje bruk"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Bruk"
@@ -268,8 +279,8 @@ msgstr "Set opp på nytt"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Vel nettverksgrensesnittet som er kopla direkte til Internett."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Netteining"
@@ -345,7 +356,11 @@ msgstr "Internt domenenamn"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -642,13 +657,14 @@ msgstr "Tillatne adresser"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiv brannmur"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Klarte ikkje kontakta tenesta."
@@ -658,12 +674,12 @@ msgstr "Klarte ikkje kontakta tenesta."
 msgid "Log"
 msgstr "Logg"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Tillat"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokker"
@@ -690,12 +706,12 @@ msgstr "Blokkerte tenester"
 msgid "Clear logs"
 msgstr "Tøm loggar"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Svarteliste"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Kviteliste"
@@ -845,7 +861,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "I bruk"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Beskriving"
@@ -892,9 +908,9 @@ msgstr ""
 "Du brukar no nettverksprofilen «%s». Du kan setja opp systemet som vanleg, "
 "og alle nettverksinnstillingane vert frå no av lagra til denne profilen."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Åtvaring"
@@ -2452,12 +2468,12 @@ msgstr ""
 "Åtvaring: Det finst allereie eit Internett-samband som kanskje brukar "
 "nettverket."
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Kopla til"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Ikkje kopla til"
@@ -2522,7 +2538,7 @@ msgstr "Loggfør trafikk"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrikk"
@@ -2563,19 +2579,22 @@ msgstr "Kabelmodem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Bruk BPALogin (nødvendig for Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentisering"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Brukarnamn til konto"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Passord til konto"
@@ -2700,13 +2719,15 @@ msgstr ""
 "Skriv inn IP-oppsettet for maskina.\n"
 "Kvar adresse skal skrivast på formatet «1.2.3.4»."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Portnar"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Hent DNS-tenarar frå DHCP"
@@ -2734,21 +2755,25 @@ msgstr ""
 "vertsnamnet."
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP-avbrotstid (i sekund)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Hent YP-tenarar frå DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Hent NTPD-tenarar frå DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-vertsnamn"
@@ -2759,11 +2784,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Ikkje fell tilbake på Zeroconf (169.254.0.0-nettverk)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adresser må vera på formatet «1.2.3.4»."
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Nettmasker må vera på formatet «255.255.224.0»."
@@ -2785,6 +2812,7 @@ msgstr ""
 "einingar som brukar det, eller setja dei opp til å ikkje starta ved oppstart."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Tildel vertsnamn frå DHCP-tenar (eller generer eit unikt eitt)"
@@ -2812,6 +2840,7 @@ msgstr ""
 "brukt."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Bruk direktekopling"
@@ -2880,27 +2909,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analogt telefonmodem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skriptbasert"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalbasert"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4059,12 +4093,12 @@ msgstr "WPA/WPA2 Førehandsdelt nøkkel"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows-drivar"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4072,79 +4106,82 @@ msgid ""
 msgstr ""
 "Trådlauskortet er sett ut av bruk. Slå på trådlausbrytaren (RF kill switch)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Trådlaust-oppsett"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Operasjonsmodus"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Handtert"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Hovud"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Gjentakar"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundær"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatisk"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nettverksnamn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Krypteringsmodus"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnøkkel"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Gøym passordet"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Tving bruk av denne nøkkelen som ASCII-streng (for eksempel for Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP-brukarnamn"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4155,12 +4192,12 @@ msgstr ""
 "spesifisera domenet, så prøv den utesta syntaksen\n"
 "  DOMENE\\brukarnamn"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP-passord"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4193,12 +4230,12 @@ msgstr ""
 "  TLS-modus er fullstendig sertifikatbasert, og kan ignorera\n"
 "brukarnamnet og passordet skrivne inn her."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP-klientsertifikat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4211,32 +4248,37 @@ msgstr ""
 "alternativ til bruk av brukarnamn og passord.\n"
 "Merk: Andre relevante innstillingar vert vist på «Avansert»-sida."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Nettverks-ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Operasjonsfrekvens"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Følsemdsgrense"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (i b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4259,17 +4301,19 @@ msgstr ""
 "«fixed»\n"
 "eller «off»."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentering"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Ekstraargument for lwconfig-kommandoen"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4285,12 +4329,13 @@ msgstr ""
 "Sjå man-sida iwconfig(8) for meir informasjon."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Ekstraargument for lwspy-kommandoen"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4310,12 +4355,13 @@ msgstr ""
 "\n"
 "Sjå man-sida iwpspy(8) for meir informasjon."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Ekstraargument for lwpriv-kommandoen"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4345,28 +4391,28 @@ msgstr ""
 "\n"
 "Sjå manualsida iwpriv(8) for meir informasjon."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP-protokoll"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Finn automatisk"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4375,67 +4421,67 @@ msgstr ""
 "Det er anbefalt å bruka «Finn automatisk», då denne først prøver WPA\n"
 "versjon 2, med WPA versjon 1 som reserve."
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP-modus"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4444,12 +4490,12 @@ msgstr ""
 "Liste over moglege autentiseringsnøkkelprotokollar.\n"
 "Moglege verdiar: WPA-EAP, IEEE8021X og NONE."
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "ytre EAP-identitet"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4460,12 +4506,12 @@ msgstr ""
 "ukryptert identitet med EAP-typar som støttar\n"
 "forskjellige tunellerte identitetar, som TTLS."
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4478,12 +4524,12 @@ msgstr ""
 "auth=MSCHAPV2 for PEAP, eller\n"
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA-sertifikat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4498,12 +4544,12 @@ msgstr ""
 "mogleg bør eit tiltrudd CA-sertifikat alltid setjast opp ved\n"
 "bruk av TLS, TTLS eller PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "«Subject»-samsvar for EAP-sertifikat"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4518,12 +4564,12 @@ msgstr ""
 "«Subject»-teksten har følgjande format:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Ekstradirektiv"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4555,12 +4601,12 @@ msgstr ""
 "\tAndre, slike som key_mgmt, eap kan brukast til å tvinga\n"
 "\tspesielle innstillingar som er forskjellige frå UI-innstillingane."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Det trengst ein krypteringsnøkkel."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4569,14 +4615,14 @@ msgstr ""
 "Den førehandsdelte nøkkelen skal ha mellom 8 og 63 ASCII-teikn, eller 64 "
 "heksadesimalteikn."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr "WEP-nøkkelen skal ha maks %d ASCII-teikn eller %d heksadesimalteikn."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4585,24 +4631,24 @@ msgstr ""
 "Frekvensen må ha eitt av suffiksa k, M eller G (eksempel: «2.46G» for 2,46 "
 "GHz), eller nok nullar."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "Raten må ha eitt av suffiksa k, M eller G (eks.: 11M), eller nok 0-ar."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Godta nettveksling"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Knytt til trådlausnettverket «%s» på grensesnittet «%s»."
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Mista tilknyting til trådlausnettverk på grensesnittet «%s»."
@@ -4750,6 +4796,286 @@ msgstr "Kopla til"
 msgid "Hostname changed to \"%s\""
 msgstr "Vertsnamnet endra til «%s»"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+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."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Fjern nettverksgrensesnitt"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Vel nettverksgrensesnittet du vil setja opp:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Det oppstod ein feil ved fjerning nettverksgrensesnittet «%s»:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Nettverksgrensesnittet «%s» er no fjerna."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Sambandshandtering"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Eining: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP-oppsett"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DND-tenarar"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Søk i domene"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ingen"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatisk"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Start ved oppstart"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Ringjemodus"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Sambandsfart"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Avbrotstid (i sekund)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telefonnummer til leverandør"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Flytkontroll"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Linjeavbrot"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "4"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Bruk låsfil"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Vent på summetone før oppringing"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Modemlyd"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kort-IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kortminne (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kort-IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kort-IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Europeisk protokoll (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokoll for resten av verda.\n"
+"Ingen D-kanal (leigd linje)."
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Merke"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Medieklasse"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Modulnamn"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Mac-adresse"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "bruk"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Plassering på bussen"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Portnaradressa skal vera på formatet «1.2.3.4»."
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Portnar:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Grensesnitt:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Internett-oppsett"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Du har ikkje sett opp noko Internett-samband.\n"
+"Køyr «%s»-vegvisaren i Mageia-kontrollsenteret."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Vertsnamn (valfri)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Første DNS-tenar (valfri)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Andre DNS-tenar (valfri)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Tredje DNS-tenar (valfri)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Internett-oppsett"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internett-tilgang"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Sambandstype: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Status:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testar sambandet …"
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametrar"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4955,11 +5281,6 @@ msgstr "Bruk interaktiv brannmur"
 msgid "No device found"
 msgstr "Fann ingen einingar"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Eining: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5192,6 +5513,103 @@ msgstr "Installer ein ny drivar"
 msgid "Select a device:"
 msgstr "Vel eining:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr "Handsam angrep"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interaktiv brannmur: Oppdaga angrep"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Kva vil du gjera med denne angriparen?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Angrepsdetaljar"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Angrepstid: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Nettverksgrensesnitt: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Angrepstype: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP-adresse til angripar: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Vertsnamn til angripar: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Teneste-angrep: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Port-angrep: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Type ICMP-angrep: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Svartelist alltid (ikkje spør på nytt)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignorer"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktiv brannmur: Ny teneste"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, c-format
+msgid "Process connection"
+msgstr "Handsam samband"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Vil du opna denne tenesta?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Hugs dette svaret"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5235,20 +5653,6 @@ msgstr "Internet ISDN-kort"
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll for resten av verda"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Europeisk protokoll (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokoll for resten av verda.\n"
-"Ingen D-kanal (leigd linje)."
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5299,11 +5703,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Sambandskontroll"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testar sambandet …"
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5324,11 +5723,6 @@ msgstr "Privat telefonnummer"
 msgid "Provider name (ex provider.net)"
 msgstr "Leverandørnamn (eks.: «leverandør.no»)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telefonnummer til leverandør"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5339,41 +5733,6 @@ msgstr "DNS 1 til leverandør (valfri)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 til leverandør (valfri)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Ringjemodus"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Sambandsfart"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Avbrotstid (i sekund)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kort-IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kortminne (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kort-IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kort-IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5540,16 +5899,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domenenamn"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Første DNS-tenar (valfri)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Andre DNS-tenar (valfri)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5857,11 +6206,6 @@ msgstr "Du kan òg skriva inn IP-adressene til DNS-tenaren."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS-adressa skal vera på formatet «1.2.3.4»."
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Portnaradressa skal vera på formatet «1.2.3.4»."
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6333,15 +6677,6 @@ msgstr "Bruk vald UDP-port"
 #~ "\n"
 #~ "Lokalnettverk vert no sett opp med dette kortet."
 
-#~ 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."
-
-#~ msgid "Connection type: "
-#~ msgstr "Sambandstype: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s er allereie i bruk\n"
 
@@ -7314,9 +7649,6 @@ msgstr "Bruk vald UDP-port"
 #~ msgid "discard"
 #~ msgstr "forkast"
 
-#~ msgid "none"
-#~ msgstr "ingen"
-
 #~ msgid "tunnel"
 #~ msgstr "tunell"
 
@@ -7335,176 +7667,21 @@ msgstr "Bruk vald UDP-port"
 #~ msgid "default"
 #~ msgstr "standard"
 
-#~ msgid "use"
-#~ msgstr "bruk"
-
 #~ msgid "unique"
 #~ msgstr "unik"
 
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "Du må logga ut for at endringane skal trå i kraft."
 
-#~ msgid "Process attack"
-#~ msgstr "Handsam angrep"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Interaktiv brannmur: Oppdaga angrep"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Kva vil du gjera med denne angriparen?"
-
-#~ msgid "Attack details"
-#~ msgstr "Angrepsdetaljar"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Angrepstid: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Nettverksgrensesnitt: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Angrepstype: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokoll: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP-adresse til angripar: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Vertsnamn til angripar: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Teneste-angrep: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Port-angrep: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Type ICMP-angrep: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Svartelist alltid (ikkje spør på nytt)"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorer"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Interaktiv brannmur: Ny teneste"
-
-#~ msgid "Process connection"
-#~ msgstr "Handsam samband"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Vil du opna denne tenesta?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Hugs dette svaret"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Bruk Cisco-UDP-innkapsling"
 
-#~ msgid "Gateway:"
-#~ msgstr "Portnar:"
-
-#~ msgid "Interface:"
-#~ msgstr "Grensesnitt:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Sambandshandtering"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP-oppsett"
-
-#~ msgid "DNS servers"
-#~ msgstr "DND-tenarar"
-
-#~ msgid "Search Domain"
-#~ msgstr "Søk i domene"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Start ved oppstart"
-
-#~ msgid "Flow control"
-#~ msgstr "Flytkontroll"
-
-#~ msgid "Line termination"
-#~ msgstr "Linjeavbrot"
-
-#~ msgid "Modem timeout"
-#~ msgstr "4"
-
-#~ msgid "Use lock file"
-#~ msgstr "Bruk låsfil"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Vent på summetone før oppringing"
-
-#~ msgid "Modem sound"
-#~ msgstr "Modemlyd"
-
-#~ msgid "Vendor"
-#~ msgstr "Merke"
-
-#~ msgid "Media class"
-#~ msgstr "Medieklasse"
-
-#~ msgid "Module name"
-#~ msgstr "Modulnamn"
-
-#~ msgid "Mac Address"
-#~ msgstr "Mac-adresse"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Plassering på bussen"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Fjern nettverksgrensesnitt"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Det oppstod ein feil ved fjerning nettverksgrensesnittet «%s»:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Nettverksgrensesnittet «%s» er no fjerna."
-
 #~ msgid "Disconnect..."
 #~ msgstr "Koplar frå …"
 
 #~ msgid "Connect..."
 #~ msgstr "Koplar til …"
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Internett-oppsett"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Vertsnamn (valfri)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Tredje DNS-tenar (valfri)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Internett-oppsett"
-
-#~ msgid "Internet access"
-#~ msgstr "Internett-tilgang"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametrar"
-
 #~ msgid "Attacker"
 #~ msgstr "Åtakar"
 
diff --git a/po/pa_IN.po b/po/pa_IN.po
index 0d98a79..5820420 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -28,14 +28,16 @@ msgid "Interface"
 msgstr "ਇੰਟਰਫੇਸ"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP ਸਿਰਨਾਵਾਂ"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ"
@@ -71,23 +73,27 @@ msgid "Configure Local Area Network..."
 msgstr "ਲੋਕਲ ਖੇਤਰ ਨੈੱਟਵਰਕ ਸੰਰਚਨਾ..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "ਸਹਾਇਤਾ"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "ਲਾਗੂ ਕਰੋ"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "ਰੱਦ ਕਰੋ"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "ਠੀਕ ਹੈ"
@@ -97,7 +103,8 @@ msgstr "ਠੀਕ ਹੈ"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -106,7 +113,7 @@ msgstr "ਠੀਕ ਹੈ"
 msgid "Please wait"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "ਕਿਰਪਾ ਕਰਕੇ ਉਡੀਕੋ... ਸੰਰਚਨਾ ਲਾਗੂ ਹੋ ਰਹੀ ਹੈ"
@@ -142,6 +149,7 @@ msgstr "ਅਡਾਪਟਰ %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "ਨੈੱਟਮਖੌਟਾ"
@@ -157,6 +165,7 @@ msgid "Started on boot"
 msgstr "ਬੂਟ ਦੌਰਾਨ ਚਲਾਓ"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP ਕਲਾਂਈਟ"
@@ -171,17 +180,19 @@ msgstr ""
 "ਮੈਂਡਰਿਵਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਇੰਟਰਫੇਸ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "ਨਵਾਂ ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ (LAN, ISDN, ADSL, ...) ਨਿਰਧਾਰਿਤ ਕਰੋ"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "ਕੋਈ IP ਨਹੀਂ"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "ਕੋਈ ਮਖੌਟਾ ਨਹੀਂ"
@@ -242,12 +253,12 @@ msgstr ""
 "\n"
 "ਤੁਸੀਂ ਕੀ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "ਅਯੋਗ"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "ਯੋਗ"
@@ -262,8 +273,8 @@ msgstr "ਮੁੜ-ਸੰਰਚਨਾ"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "ਨੈੱਟ ਜੰਤਰ"
@@ -330,7 +341,11 @@ msgstr "ਅੰਦਰੂਨੀ ਡੋਮੇਨ ਨਾਂ"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -622,13 +637,14 @@ msgstr "ਸਭ ਉਪਭੋਗੀਆਂ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "ਫਾਇਰਵਾਲ"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "ਪ੍ਰਤੀਬਿੰਬ %s ਨਾਲ ਸੰਪਰਕ ਲਈ ਅਸਮਰਥ"
@@ -638,12 +654,12 @@ msgstr "ਪ੍ਰਤੀਬਿੰਬ %s ਨਾਲ ਸੰਪਰਕ ਲਈ ਅਸ�
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "ਸਭ"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -670,12 +686,12 @@ msgstr "ਉਪਭੋਗੀ ਫਾਇਲਾਂ ਬੈਕਅੱਪ"
 msgid "Clear logs"
 msgstr "ਸਭ ਸਾਫ"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -823,7 +839,7 @@ msgstr "ਵਿਧੀ"
 msgid "Enabled"
 msgstr "ਯੋਗ"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "ਵਰਣਨ"
@@ -865,9 +881,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "ਚੇਤਾਵਨੀ"
@@ -2335,12 +2351,12 @@ msgid ""
 "network"
 msgstr "ਚੇਤਾਵਨੀ, ਹੋਰ ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਖੋਜਿਆ ਗਿਆ ਹੈ, ਤੁਹਾਡਾ ਨੈੱਟਵਰਕ ਵਰਤਦਾ ਹੋ ਸਕਦਾ ਹੈ।"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "ਜੁੜਿਆ"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "ਜੁੜਿਆ ਨਹੀਂ"
@@ -2405,7 +2421,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "ਮੈਟ੍ਰਿਕ"
@@ -2445,19 +2461,22 @@ msgstr "ਕਾਰਡ ਮਾਡਲ:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPAਲਾਗਇਨ ਵਰਤੋ (Telstra ਲਈ ਲੋੜੀਂਦਾ)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "ਪ੍ਰਮਾਣਿਕਤਾ"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "ਖਾਤਾ ਲਾਗਇਨ (ਉਪਭੋਗੀ ਨਾਂ)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "ਖਾਤਾ ਗੁਪਤ-ਕੋਡ"
@@ -2582,13 +2601,15 @@ msgstr ""
 "ਹਰੇਕ ਇੰਦਰਾਜ ਡੌਟਡ-ਦਸ਼ਮਲਵ ਵਾਂਗ (ਜਿਵੇਂ,  1.2.3.4) ਵਿੱਚ IP \n"
 "ਸਿਰਨਾਵਾਂ ਤੌਰ ਤੇ ਦਿੱਤੀ ਹੋਵੇ।"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "ਗੇਟਵੇ"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS ਸਰਵਰ IP"
@@ -2614,21 +2635,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "ਮੂਲ ਰੂਪ ਵਿੱਚ ਖੋਜ ਡੋਮੇਨ ਪੂਰੇ-ਸਿੱਖਿਅਤ ਮੇਜ਼ਬਾਨ ਨਾਂ ਤੋਂ ਨਿਰਧਾਰਿਤ ਹੋਵੇਗਾ"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਮਿਆਦ (ਸਕਿੰਟਾਂ ਵਿੱਚ)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP ਮੇਜ਼ਬਾਨ ਨਾਂ"
@@ -2639,11 +2664,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP ਸਿਰਨਾਵਾਂ 1.2.3.4 ਦੇ ਰੂਪ ਵਿੱਚ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "IP ਸਿਰਨਾਵਾਂ 1.2.3.4 ਦੇ ਰੂਪ ਵਿੱਚ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
@@ -2662,6 +2689,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "DHCP ਸਿਰਨਾਵੇਂ ਤੋਂ ਮੇਜ਼ਬਾਨ ਨਾਂ ਨਿਰਧਾਰਿਤ ਕਰੋ"
@@ -2683,6 +2711,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "ਨੈੱਟਵਰਕ ਹਾਟਪਲੱਗਿੰਗ"
@@ -2751,27 +2780,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "ਸਕ੍ਰਿਪਟ-ਅਧਾਰਿਤ"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "ਟਰਮੀਨਲ-ਅਧਾਰਿਤ"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3930,90 +3964,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "ਵਾਇਰਲੈੱਸ ਕੁਨੈਕਸ਼ਨ"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "ਆਪਰੇਟਿੰਗ ਵਿਧੀ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "ਪ੍ਰਬੰਧਨ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "ਮਾਸਟਰ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "ਰੀਪੀਟਰ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "ਸੈਕੰਡਰੀ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "ਸਵੈ"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "ਨੈੱਟਵਰਕ ਨਾਂ (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "ਇਨਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀ "
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "ਗੁਪਤ-ਕੋਡ"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "ਖਾਤਾ ਲਾਗਇਨ (ਉਪਭੋਗੀ ਨਾਂ)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4021,12 +4058,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "ਗੁਪਤ-ਕੋਡ"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4045,12 +4082,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "ਸਾਰਟੀਫਿਕੇਟ ਦਾ ਨਾਂ"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4059,32 +4096,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ਨੈੱਟਵਰਕ ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "ਆਪਰੇਟਿੰਗ ਵਾਰਵਾਰਤਾ"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "ਸੂਖਮਤਾ ਥਰਿੱਸ਼ਹੋਲਡ"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "ਬਿੱਟਰੇਟ (b/s ਵਿੱਚ)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4098,17 +4140,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "ਵਿਭਾਗੀਕਰਨ"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig ਕਮਾਂਡ ਵਾਧੂ ਆਰਗੂਮੈਂਟ"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4124,12 +4168,13 @@ msgstr ""
 "ਅੱਗੇ ਜਾਣਕਾਰੀ ਲਈ iwconfig(8) man ਸਫਾ ਵੇਖੋ।"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy ਕਮਾਂਡ ਵਾਧੂ ਆਰਗੂਮੈਂਟ"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4148,12 +4193,13 @@ msgstr ""
 "\n"
 "ਅੱਗੇ ਜਾਣਕਾਰੀ ਲਈ iwpspy(8) man ਸਫਾ ਵੇਖੋ।"
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv ਕਮਾਂਡ ਵਾਧੂ ਆਰਗੂਮੈਂਟ"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4171,107 +4217,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "ਪ੍ਰੋਟੋਕਾਲ"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "ਸਵੈ-ਖੋਜ"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "ਵਿਧੀ"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4279,12 +4325,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4293,12 +4339,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "ਸਾਰਟੀਫਿਕੇਟ ਕਿਸਮ"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4308,12 +4354,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4323,12 +4369,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4346,26 +4392,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4374,7 +4420,7 @@ msgstr ""
 "ਵਾਰਵਾਰਤਾ ਦਾ ਪਿਛੇਤਰ k, M ਜਾਂ G ਹੋਵੇ (ਉਦਾਹਰਨ ਵਜੋਂ, 2.46 GHz ਵਾਰਵਾਰਤਾ ਲਈ \"2.46G\"), "
 "ਜਾਂ '0' (ਸਿਫਰਾਂ) ਸ਼ਾਮਿਲ ਕਰੋ।"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4383,17 +4429,17 @@ msgstr ""
 "ਦਰ ਦਾ ਪਿਛੇਤਰ k, M ਜਾਂ G ਹੋਵੇ (ਉਦਾਹਰਨ ਲਈ, 11M ਲਈ \"11M\"), ਜਾਂ '0' (ਸਿਫਰਾਂ) ਸ਼ਾਮਿਲ "
 "ਕਰੋ।"
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4538,6 +4584,287 @@ msgstr "ਜੋਡ਼ੋ"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਕੋਈ ਈਥਰਨੈਟ ਨੈਟਵਰਕ ਐਡਪਟਰ ਖੋਜਿਆ ਨਹੀਂ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਜੰਤਰ ਸੰਰਚਨਾ ਸੰਦ ਮੁੜ "
+"ਚਲਾਓ।"
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਹਟਾਓ"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "ਸੰਰਚਿਤ ਕਰਨ ਲਈ ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਚੁਣੋ:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"\"%s\" ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੋਈ ਹੈ:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "ਮੁਬਾਰਕਾਂ, \"%s\" ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਸਫਲਤਾ ਨਾਲ ਹਟਾਇਆ ਗਿਆ"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਪ੍ਰਬੰਧਨ ਕਰੋ"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "ਜੰਤਰ:"
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP ਸੰਰਚਨਾ"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS ਸਰਵਰ"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "ਡੋਮੇਨ ਖੋਜ"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ਕੋਈ ਨਹੀਂ"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "ਸਥਿਰ"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "ਬੂਟ ਦੌਰਾਨ ਚਲਾਓ"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "ਡਾਇਲਿੰਗ ਵਿਧੀ"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਗਤੀ"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਮਿਆਦ (ਸਕਿੰਟਾਂ ਵਿੱਚ)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "ਮਾਲਕ ਫੋਨ ਨੰਬਰ"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "ਵਹਾਓ ਕੰਟਰੋਲ"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "ਲਾਈਨ ਅੰਤ"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "ਮਾਡਮ ਸਮਾਂ ਖਤਮ"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "ਲਾਕ ਫਾਇਲ ਵਰਤੋ"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "ਡਾਇਲ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡਾਇਟਅੱਪ ਟੋਨ ਲਈ ਉਡੀਕੋ"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "ਰੁੱਝਿਆ ਹੈ ਉਡੀਕੋ"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "ਮਾਡਮ ਅਵਾਜ਼"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "ਕਾਰਡ IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "ਕਾਰਡ ਮੈਮੋਰੀ (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "ਕਾਰਡ IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "ਕਾਰਡ IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "ਯੂਰਪੀਅਨ ਪਰੋਟੋਕਾਲ (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"ਬਾਕੀ ਸੰਸਾਰ ਲਈ ਪਰੋਟੋਕਾਲ\n"
+"ਕੋਈ D-ਚੈਨਲ ਨਹੀਂ (ਲੀਜ਼ਡ ਲਾਈਨਾਂ)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "ਵਿਕ੍ਰੇਤਾ"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "ਮਾਧਿਅਮ ਸ਼੍ਰੇਣੀ"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "ਮੈਡਿਊਲ ਨਾਂ"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "ਮੈਕ ਸਿਰਨਾਵਾਂ"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "ਬਸ"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "ਬਸ ਤੇ ਸਥਿਤੀ"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "ਗੇਟਵੇ ਸਿਰਨਾਵਾਂ 1.2.3.4 ਰੂਪ ਵਿੱਚ ਹੋਵੇ"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "ਗੇਟਵੇ:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "ਇੰਟਰਫੇਸ:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਨਾ"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"ਤੁਹਾਡੇ ਕੋਲ ਹਾਲੇ ਕੋਈ ਵੀ ਇੰਟਰਨੈਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।\n"
+"ਮੈਂਡਰਿਵਲੀਨਕਸ ਕੰਟਰੋਲ ਕੇਂਦਰ ਵਿੱਚ \"ਕੁਨੈਕਸ਼ਨ ਸ਼ਾਮਲ\" ਚਲਾਓ।"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "ਮੇਜ਼ਬਾਨ ਨਾਂ (ਚੋਣਵਾਂ)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "ਪਹਿਲਾ DNS ਸਰਵਰ (ਚੋਣਵਾਂ)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "ਦੂਜਾ DNS ਸਰਵਰ (ਚੋਣਵਾਂ)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "ਤੀਜਾ DNS ਸਰਵਰ (ਚੋਣਵਾਂ)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਨਾ"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ:"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "ਸਥਿਤੀ:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "ਤੁਹਾਡੀ ਸੰਰਚਨਾ ਜਾਂਚ ਜਾਰੀ ਹੈ..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "ਪੈਰਾਮੀਟਰ"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4741,11 +5068,6 @@ msgstr ""
 msgid "No device found"
 msgstr "ਕੋਈ ਜੰਤਰ ਨਹੀਂ ਲੱਭਿਆ"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "ਜੰਤਰ:"
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4968,6 +5290,103 @@ msgstr "ਨਵਾਂ ਡਰਾਈਵਰ ਇੰਸਟਾਲ ਕਰੋ"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "ਸੇਵਾਵਾਂ ਅਤੇ ਡੈਮਨ"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "ਫਾਇਰਵਾਲ ਸੰਰਚਨਾ ਲੱਭੀ ਹੈ!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਵਰਤਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀਂ"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "ਕਿਸਮ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "ਕਿਸਮ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "ਪ੍ਰੋਟੋਕਾਲ"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "ਗੇਟਵੇ IP ਸਿਰਨਾਵਾਂ"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "ਲੂਪਬੈਕ ਫਾਇਲ ਨਾਂ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "ਸੇਵਾਵਾਂ ਅਤੇ ਡੈਮਨ"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "ਪੋਰਟ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "ਪੋਰਟ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "ਅਣਡਿੱਠਾ"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "ਫਾਇਰਵਾਲ ਸੰਰਚਨਾ ਲੱਭੀ ਹੈ!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "ਵਾਇਰਲੈੱਸ ਕੁਨੈਕਸ਼ਨ"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸੰਰਚਿਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "ਇਹ ਗੁਪਤ-ਕੋਡ ਯਾਦ ਰੱਖੋ"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5011,20 +5430,6 @@ msgstr "ਅੰਦਰੂਨੀ ISDN ਕਾਰਡ"
 msgid "Protocol for the rest of the world"
 msgstr "ਬਾਕੀ ਸੰਸਾਰ ਲਈ ਪਰੋਟੋਕਾਲ"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "ਯੂਰਪੀਅਨ ਪਰੋਟੋਕਾਲ (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"ਬਾਕੀ ਸੰਸਾਰ ਲਈ ਪਰੋਟੋਕਾਲ\n"
-"ਕੋਈ D-ਚੈਨਲ ਨਹੀਂ (ਲੀਜ਼ਡ ਲਾਈਨਾਂ)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5073,11 +5478,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "ਤੁਹਾਡੀ ਸੰਰਚਨਾ ਜਾਂਚ ਜਾਰੀ ਹੈ..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5098,11 +5498,6 @@ msgstr "ਤੁਹਾਡਾ ਨਿੱਜੀ ਫੋਨ ਨੰਬਰ"
 msgid "Provider name (ex provider.net)"
 msgstr "ਮਾਲਕ ਨਾਂ (ਜਿਵੇਂ provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "ਮਾਲਕ ਫੋਨ ਨੰਬਰ"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5113,41 +5508,6 @@ msgstr "ਮਾਲਕ DNS 1 (ਚੋਣਵਾਂ)"
 msgid "Provider DNS 2 (optional)"
 msgstr "ਮਾਲਕ DNS 2 (ਚੋਣਵਾਂ)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "ਡਾਇਲਿੰਗ ਵਿਧੀ"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਗਤੀ"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਮਿਆਦ (ਸਕਿੰਟਾਂ ਵਿੱਚ)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "ਕਾਰਡ IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "ਕਾਰਡ ਮੈਮੋਰੀ (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "ਕਾਰਡ IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "ਕਾਰਡ IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5312,16 +5672,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "ਡੋਮੇਨ ਨਾਂ"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "ਪਹਿਲਾ DNS ਸਰਵਰ (ਚੋਣਵਾਂ)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "ਦੂਜਾ DNS ਸਰਵਰ (ਚੋਣਵਾਂ)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5628,11 +5978,6 @@ msgstr "ਆਖਰੀ ਪਰ ਘੱਟ ਨਹੀਂ ਤੁਸੀਂ ਆਪਣੇ
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS ਸਰਵਰ ਸਿਰਨਾਵਾਂ 1.2.3.4 ਰੂਪ ਵਿੱਚ ਹੋਵੇ"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "ਗੇਟਵੇ ਸਿਰਨਾਵਾਂ 1.2.3.4 ਰੂਪ ਵਿੱਚ ਹੋਵੇ"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6074,16 +6419,6 @@ msgstr ""
 #~ "\n"
 #~ "ਮੈ ਤੁਹਾਡੇ ਅਡਾਪਟਰ ਨਾਲ ਲੋਕਲ ਖੇਤਰ ਨੈੱਟਵਰਕ (LAN) ਨਿਰਧਾਰਿਤ ਕਰ ਰਿਹਾ ਹੈ।"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "ਤੁਹਾਡੇ ਸਿਸਟਮ ਤੇ ਕੋਈ ਈਥਰਨੈਟ ਨੈਟਵਰਕ ਐਡਪਟਰ ਖੋਜਿਆ ਨਹੀਂ ਗਿਆ ਹੈ। ਕਿਰਪਾ ਕਰਕੇ ਜੰਤਰ ਸੰਰਚਨਾ ਸੰਦ "
-#~ "ਮੁੜ ਚਲਾਓ।"
-
-#~ msgid "Connection type: "
-#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਕਿਸਮ:"
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s ਪਹਿਲਾਂ ਵਰਤਿਆ ਹੈ\n"
 
@@ -6706,9 +7041,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "ਰੱਦ"
 
-#~ msgid "none"
-#~ msgstr "ਕੋਈ ਨਹੀਂ"
-
 #~ msgid "tunnel"
 #~ msgstr "ਟਨਲ"
 
@@ -6736,179 +7068,12 @@ msgstr ""
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "ਤੁਹਾਨੂੰ ਤਬਦੀਲੀਆਂ ਲਾਗੂ ਹੋਣ ਲਈ ਫਿਰ ਬਾਹਰ (ਲਾਗ-ਆਊਟ) ਜਾਣ ਦੀ ਲੋੜ ਹੈ"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "ਸੇਵਾਵਾਂ ਅਤੇ ਡੈਮਨ"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "ਫਾਇਰਵਾਲ ਸੰਰਚਨਾ ਲੱਭੀ ਹੈ!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਵਿਸ਼ੇਸ਼ਤਾ ਵਰਤਣੀ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀਂ"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "ਕਿਸਮ: %s"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "ਪ੍ਰੋਟੋਕਾਲ"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "ਗੇਟਵੇ IP ਸਿਰਨਾਵਾਂ"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "ਲੂਪਬੈਕ ਫਾਇਲ ਨਾਂ: %s"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "ਸੇਵਾਵਾਂ ਅਤੇ ਡੈਮਨ"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "ਪੋਰਟ: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "ਅਣਡਿੱਠਾ"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "ਫਾਇਰਵਾਲ ਸੰਰਚਨਾ ਲੱਭੀ ਹੈ!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "ਵਾਇਰਲੈੱਸ ਕੁਨੈਕਸ਼ਨ"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਸੰਰਚਿਤ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "ਇਹ ਗੁਪਤ-ਕੋਡ ਯਾਦ ਰੱਖੋ"
-
-#~ msgid "Gateway:"
-#~ msgstr "ਗੇਟਵੇ:"
-
-#~ msgid "Interface:"
-#~ msgstr "ਇੰਟਰਫੇਸ:"
-
-#~ msgid "Manage connections"
-#~ msgstr "ਕੁਨੈਕਸ਼ਨ ਪ੍ਰਬੰਧਨ ਕਰੋ"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP ਸੰਰਚਨਾ"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS ਸਰਵਰ"
-
-#~ msgid "Search Domain"
-#~ msgstr "ਡੋਮੇਨ ਖੋਜ"
-
-#~ msgid "static"
-#~ msgstr "ਸਥਿਰ"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "ਬੂਟ ਦੌਰਾਨ ਚਲਾਓ"
-
-#~ msgid "Flow control"
-#~ msgstr "ਵਹਾਓ ਕੰਟਰੋਲ"
-
-#~ msgid "Line termination"
-#~ msgstr "ਲਾਈਨ ਅੰਤ"
-
-#~ msgid "Modem timeout"
-#~ msgstr "ਮਾਡਮ ਸਮਾਂ ਖਤਮ"
-
-#~ msgid "Use lock file"
-#~ msgstr "ਲਾਕ ਫਾਇਲ ਵਰਤੋ"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "ਡਾਇਲ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਡਾਇਟਅੱਪ ਟੋਨ ਲਈ ਉਡੀਕੋ"
-
-#~ msgid "Busy wait"
-#~ msgstr "ਰੁੱਝਿਆ ਹੈ ਉਡੀਕੋ"
-
-#~ msgid "Modem sound"
-#~ msgstr "ਮਾਡਮ ਅਵਾਜ਼"
-
-#~ msgid "Vendor"
-#~ msgstr "ਵਿਕ੍ਰੇਤਾ"
-
-#~ msgid "Media class"
-#~ msgstr "ਮਾਧਿਅਮ ਸ਼੍ਰੇਣੀ"
-
-#~ msgid "Module name"
-#~ msgstr "ਮੈਡਿਊਲ ਨਾਂ"
-
-#~ msgid "Mac Address"
-#~ msgstr "ਮੈਕ ਸਿਰਨਾਵਾਂ"
-
-#~ msgid "Bus"
-#~ msgstr "ਬਸ"
-
-#~ msgid "Location on the bus"
-#~ msgstr "ਬਸ ਤੇ ਸਥਿਤੀ"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਹਟਾਓ"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "\"%s\" ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਹਟਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੋਈ ਹੈ:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "ਮੁਬਾਰਕਾਂ, \"%s\" ਨੈੱਟਵਰਕ ਇੰਟਰਫੇਸ ਸਫਲਤਾ ਨਾਲ ਹਟਾਇਆ ਗਿਆ"
-
 #~ msgid "Disconnect..."
 #~ msgstr "ਤੋੜੋ..."
 
 #~ msgid "Connect..."
 #~ msgstr "ਜੋੜੋ..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਨਾ"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "ਮੇਜ਼ਬਾਨ ਨਾਂ (ਚੋਣਵਾਂ)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "ਤੀਜਾ DNS ਸਰਵਰ (ਚੋਣਵਾਂ)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਸੰਰਚਨਾ"
-
-#~ msgid "Internet access"
-#~ msgstr "ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ"
-
-#~ msgid "Status:"
-#~ msgstr "ਸਥਿਤੀ:"
-
-#~ msgid "Parameters"
-#~ msgstr "ਪੈਰਾਮੀਟਰ"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "ਕੋਈ ਵੇਰਵਾ ਨਹੀਂ"
diff --git a/po/pl.po b/po/pl.po
index 47866ac..cfd3458 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -17,7 +17,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2010-01-10 11:51+0100\n"
 "Last-Translator: Marek Walczak <kubdat@poczta.fm>\n"
 "Language-Team:  <pl@li.org>\n"
@@ -38,14 +38,16 @@ msgid "Interface"
 msgstr "Interfejs"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Adres IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokół"
@@ -81,23 +83,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfiguracja sieci lokalnej..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Pomoc"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Zastosuj"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Anuluj"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -107,7 +113,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -116,7 +123,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Proszę czekać"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Proszę czekać... Stosowanie konfiguracji"
@@ -152,6 +159,7 @@ msgstr "Karta %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Maska"
@@ -167,6 +175,7 @@ msgid "Started on boot"
 msgstr "Uruchamiany przy starcie"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Klient DHCP"
@@ -181,17 +190,19 @@ msgstr ""
 "Uruchom druida \"%s\" z Centrum Sterowania Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Konfiguracja nowego interfejsu sieciowego (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Brak IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Brak maski"
@@ -262,12 +273,12 @@ msgstr ""
 "\n"
 "Co chcesz zrobić?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Włącz"
@@ -282,8 +293,8 @@ msgstr "Rekonfigurować"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Wybierz interfejs sieciowy podłączony do Internetu."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Urządzenie sieciowe"
@@ -360,7 +371,11 @@ msgstr "Wewnętrzna nazwa domeny"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -658,13 +673,14 @@ msgstr "Akceptowane adresy"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktywna zapora sieciowa"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Nie można skontaktować się z demonem"
@@ -674,12 +690,12 @@ msgstr "Nie można skontaktować się z demonem"
 msgid "Log"
 msgstr "Logi"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Pozwalaj"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokuj"
@@ -706,12 +722,12 @@ msgstr "Blokowane usługi"
 msgid "Clear logs"
 msgstr "Wyczyść logi"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Czarna lista"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Lista zaufanych"
@@ -863,7 +879,7 @@ msgstr "Moduł"
 msgid "Enabled"
 msgstr "Włącz"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Opis"
@@ -910,9 +926,9 @@ msgstr ""
 "Aktualnie używany profil sieciowy %s. Możesz skonfigurować swój system, a "
 "wszystkie sieciowe ustawienia będą zapisane w tym profilu sieciowym."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Ostrzeżenie"
@@ -2480,12 +2496,12 @@ msgstr ""
 "Ostrzeżenie, wykryto inne połączenie Internetowe, być może używające twojej "
 "sieci"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nie połączony"
@@ -2550,7 +2566,7 @@ msgstr "Włącz koszty ruchu sieciowego"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Miernik"
@@ -2592,19 +2608,22 @@ msgstr "Modem kablowy"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Użycie BPALogin (niezbędne w Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Uwierzytelnianie"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Konto (nazwa użytkownika)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Hasło do konta"
@@ -2731,13 +2750,15 @@ msgstr ""
 "Każda pozycja powinna być wpisana w formacie dziesiętnym\n"
 "oddzielonym kropkami (np. 192.168.1.1)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Router"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Pobierz z serwera DHCP numer IP serwera DNS"
@@ -2765,21 +2786,25 @@ msgstr ""
 "komputera"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Limit czasu bezczynności DHCP (w sek.)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Pobierz z serwera DHCP adres IP serwera YP "
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Pobierz z serwera DHCP adres IP serwera NTPD"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nazwa DHCP komputera"
@@ -2790,11 +2815,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Nie powracaj do konfiguracji Zerocont (sieć 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Adres IP powinien być w formacie typu 192.168.1.1"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Maska sieci powinna mieć następujący format 255.255.224.0"
@@ -2817,6 +2844,7 @@ msgstr ""
 "uruchamiały się podczas startu systemu."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2845,6 +2873,7 @@ msgstr ""
 "komputera będzie następująca 'localhost.localdomain'."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hotplugging sieci"
@@ -2914,27 +2943,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analogowy modem telefoniczny (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Oparta o skrypt"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Poprzez terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4093,12 +4127,12 @@ msgstr "Klucz WPA/WPA2 Pre-Shared Key"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Sterownik Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4107,79 +4141,82 @@ msgstr ""
 "Bezprzewodowa karta sieciowa została wyłączona. Musisz uruchomić "
 "bezprzewodowy switch."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Ustawienia połączenia bezprzewodowego"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Tryb operacyjny"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Zarządzany"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Główny"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Powielający"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Zapasowy"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatyczny"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nazwa sieci (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Tryb szyfrowania"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Klucz szyfrujący"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Ukryj hasło"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Wymuś zastosowanie tego klucza jako ciągu znaków ASCII (np. dla Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Nazwa użytkownika/login (EAP)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4191,12 +4228,12 @@ msgstr ""
 "DOMENA\n"
 "azwa_uzytkownika"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Hasło (EAP)"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4229,12 +4266,12 @@ msgstr ""
 " Tryb TLS wykorzystuje certyfikat i może zignorować\n"
 "podaną nazwę użytkownika i hasło."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Certyfikat klienta (EAP)"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4249,32 +4286,37 @@ msgstr ""
 "Informacja: pozostałe powiązane ustawienia są przedstawione na stronie "
 "Zaawansowane."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID Sieci"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Częstotliwość operacyjna"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Próg czułości"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Stopa bitowa (w b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4295,17 +4337,19 @@ msgstr ""
 "pakietu wyłączającego schemat. Można ustawić ten parametr na wartość\n"
 "automatyczną, ustaloną lub wyłączyć go."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentacja"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Dodatkowe argumenty dla polecenia iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4322,12 +4366,13 @@ msgstr ""
 "Zobacz stronę podręcznikową man iwconfig(8) aby uzyskać więcej informacji."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Dodatkowe argumenty polecenia iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4347,12 +4392,13 @@ msgstr ""
 "\n"
 "Zajrzyj na stronę manuala iwpspy(8) aby uzyskać więcej informacji."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Dodatkowe argumenty polecenia iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4381,28 +4427,28 @@ msgstr ""
 "\n"
 "Zajrzyj na stronę manuala iwpriv(8) aby uzyskać więcej informacji."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protokół EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Wykryj automatycznie"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4411,67 +4457,67 @@ msgstr ""
 "Wykrywanie automatyczne jest zalecane ponieważ w pierwszej kolejności\n"
 "sprawdza WPA w wersji 2, a następnie WPA w wersji 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Tryb EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4480,12 +4526,12 @@ msgstr ""
 "lista zaakceptowanych uwierzytelnionych kluczy zarządzania protokołami.\n"
 "Możliwe wartości to WPA-EAP, IEEE8021X, BRAK"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Zewnętrzna tożsamość EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4496,12 +4542,12 @@ msgstr ""
 "jako niezabezpieczony identyfikator w połączeniu z trybami EAP, które\n"
 "obsługują tunelowanie, np. TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4514,12 +4560,12 @@ msgstr ""
 "auth=MSCHAPV2 dla PEAP lub\n"
 "autheap=MSCHAPV2 autheap=MD5 dla TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Certyfikat EAP CA"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4535,12 +4581,12 @@ msgstr ""
 "zaufanego CA powinien być zawsze skonfigurowany\n"
 "jeżeli wykorzystywany jest TLS, TTLS lub PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Oznaczenie tematu certyfikatu EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4556,12 +4602,12 @@ msgstr ""
 "format:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@przyklad.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Dodatkowe dyrektywy"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4594,12 +4640,12 @@ msgstr ""
 "\tdo wymuszenia specjalnych ustawień, odmiennych od \n"
 "ustawień U.I."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Wymagany jest klucz szyfrujący."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4608,7 +4654,7 @@ msgstr ""
 "Wspólny klucz powinien mieć długość od 8 do 63 znaków ASCII lub 64 znaki "
 "szesnastkowe"
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4617,7 +4663,7 @@ msgstr ""
 "Klucz WEP powinien mieć maksymalnie %d znaków ASCII lub %d znaków "
 "szesnastkowych."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4626,7 +4672,7 @@ msgstr ""
 "Częstotliwość powinna posiadać przyrostek k, M lub G (na przykład \"2.46G\" "
 "dla częstotliwości 2.46GHz, lub też dodaj wystarczającą ilość zer."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4635,17 +4681,17 @@ msgstr ""
 "Współczynnik powinien posiadać przyrostek k, M lub G (na przykład, \"11M\" "
 "oznaczający 11M), lub też wystarczy podać wystarczającą liczbę zer."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Zezwalaj na roaming między punktami dostępowymi"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Przypisany do sieci bezprzewodowej \"%s\" na interfejsie %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Utracono przypisanie do sieci bezprzewodowej na interfejsie %s"
@@ -4793,6 +4839,285 @@ msgstr "Połącz"
 msgid "Hostname changed to \"%s\""
 msgstr "Nazwa komputera została zmieniona na \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Interfejs sieciowy"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Wybierz interfejs sieciowy do skonfigurowania:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Wystąpił problem podczas uruchamiania sieci: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Gratulacje, konfiguracja sieci została zakończona."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Zarządzanie połączeniami VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Urządzenie: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Konfiguracja VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Serwer DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Domena wyszukiwania"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automatycznie"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Uruchamiany przy starcie"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Sposób wybierania"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Szybkość połączenia"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Limit czasu bezczynności (w sek.)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Numer telefonu dostawcy usług"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Połączenie modemowe"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Wybierz plik"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwejt"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ karty"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "DMA karty"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO karty"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 karty"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protokół europejski (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokół reszty świata\n"
+"Bez kanału D (linie dzierżawione)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Moduł"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Prawdziwy adres"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Białoruś"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Adres IP bramy powinien być w formacie typu 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Router"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interfejs"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Nie skonfigurowano połączenia z Internetem"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Nie posiadasz żadnego skonfigurowanego połączenia internetowego. Uruchom "
+"asystenta \"%s\" z Centrum Sterowania Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Pierwszy serwer DNS (opcjonalnie)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Pierwszy serwer DNS (opcjonalnie)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Drugi serwer DNS (opcjonalnie)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Pierwszy serwer DNS (opcjonalnie)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Konfiguracja połączenia"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Dostęp do drukarki"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Czas połączenia: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Stan"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testowanie połączenia..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Parametry IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4999,11 +5324,6 @@ msgstr "Użyj interaktywnej zapory sieciowej"
 msgid "No device found"
 msgstr "Nie znaleziono urządzeń"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Urządzenie: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5237,6 +5557,103 @@ msgstr "Instalacja nowego sterownika"
 msgid "Select a device:"
 msgstr "Wybierz urządzenie:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Zaatakowana usługa"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Tryb automatyczny interaktywnej zapory sieciowej"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "W jaki sposób chcesz nawiązywać to połączenie?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interfejs sieciowy"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokół"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Adres IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Zaatakowana usługa"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktywna zapora sieciowa"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Połączenie bezprzewodowe"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "W jaki sposób chcesz nawiązywać to połączenie?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5280,20 +5697,6 @@ msgstr "Wewnętrzna karta ISDN"
 msgid "Protocol for the rest of the world"
 msgstr "Reszta świata"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protokół europejski (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokół reszty świata\n"
-"Bez kanału D (linie dzierżawione)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5344,11 +5747,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Kontrola połączenia"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testowanie połączenia..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5369,11 +5767,6 @@ msgstr "Numer Twojego telefonu"
 msgid "Provider name (ex provider.net)"
 msgstr "Nazwa dostawcy usług (np. Dialog, Netia, TPSA)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Numer telefonu dostawcy usług"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5384,41 +5777,6 @@ msgstr "1 DNS dostawcy (opcjonalnie)"
 msgid "Provider DNS 2 (optional)"
 msgstr "2 DNS dostawcy (opcjonalnie)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Sposób wybierania"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Szybkość połączenia"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Limit czasu bezczynności (w sek.)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ karty"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "DMA karty"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO karty"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 karty"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5584,16 +5942,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domena"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Pierwszy serwer DNS (opcjonalnie)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Drugi serwer DNS (opcjonalnie)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5903,11 +6251,6 @@ msgstr "Na końcu, lecz nie mniej ważne jest wpisanie adresów IP serwera DNS."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Adres serwera DNS powinien być w formacie typu 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Adres IP bramy powinien być w formacie typu 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/pt.po b/po/pt.po
index 229e276..c5c398f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-08 03:50+0100\n"
 "Last-Translator: Zé <ze@mandriva.org>\n"
 "Language-Team: Portuguese <>\n"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "Interface"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Endereço IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocolo"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "Configurar Rede de Área Local (LAN)..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Aplicar"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -96,7 +102,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Por favor aguarde"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Por favor aguarde... A aplicar a configuração"
@@ -141,6 +148,7 @@ msgstr "Adaptador %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Máscara de rede"
@@ -156,6 +164,7 @@ msgid "Started on boot"
 msgstr "Iniciado no arranque"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Cliente DHCP"
@@ -170,17 +179,19 @@ msgstr ""
 "Execute o assistente \"%s\" do Centro de Controlo Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configurar novo interface de rede (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Nenhum IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Nenhuma Máscara"
@@ -252,12 +263,12 @@ msgstr ""
 "\n"
 "O que deseja fazer?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Desactivar"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Activar"
@@ -273,8 +284,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "Por favor seleccione um interface de rede conectado directamente à internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Dispositivo de Rede"
@@ -352,7 +363,11 @@ msgstr "O nome do domínio interno"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -653,13 +668,14 @@ msgstr "Endereços permitidos"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "'Firewall' Interactiva"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Não é possível contactar o serviço"
@@ -669,12 +685,12 @@ msgstr "Não é possível contactar o serviço"
 msgid "Log"
 msgstr "Registo"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Bloquear"
@@ -701,12 +717,12 @@ msgstr "Serviços bloqueados"
 msgid "Clear logs"
 msgstr "Limpar registos"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Lista branca"
@@ -856,7 +872,7 @@ msgstr "Módulo"
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descrição"
@@ -905,9 +921,9 @@ msgstr ""
 "normalmente faz, e a partir de agora todas as definições de rede serão "
 "gravadas neste perfil."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
@@ -2478,12 +2494,12 @@ msgstr ""
 "Atenção, foi detectada outra conexão Internet, que talvez esteja a usar a "
 "sua rede"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Desconectado"
@@ -2548,7 +2564,7 @@ msgstr "Activar contabilização do tráfego"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Permite ao interface ser controlado pelo 'Network Manager'"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Métrico"
@@ -2588,19 +2604,22 @@ msgstr "Modem cabo"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Usar BPALogin (necessário para o Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autenticação"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Nome de utilizador (da conta)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Senha da conta"
@@ -2728,13 +2747,15 @@ msgstr ""
 "Cada item deve ser indicado como um endereço IP em notação\n"
 "decimal com ponto (por exemplo, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Obter servidores DNS por DHCP"
@@ -2762,21 +2783,25 @@ msgstr ""
 "máquina plenamente qualificado"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Limite de tempo DHCP (em segundos)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Obter servidores YP por DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Obter servidores NTPD por DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nome da máquina DHCP"
@@ -2787,11 +2812,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Não retornar para Zeroconf (rede 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "O endereço IP deve estar no formato 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "A máscara da rede (netmask) deve estar no formato 255.255.224.0"
@@ -2814,6 +2841,7 @@ msgstr ""
 "arranque."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2841,6 +2869,7 @@ msgstr ""
 "da rede. Se deixar em branco, será usado 'localhost.localdomain'."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Detecção Automática da Rede"
@@ -2910,27 +2939,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem de telefone analógico (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Baseado no script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Baseado no terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4089,12 +4123,12 @@ msgstr "Chave Pré-Partilhada WPA/WPA2"
 msgid "WPA/WPA2 Enterprise"
 msgstr "Enterprise WPA/WPA2"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Controlador Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4103,78 +4137,81 @@ msgstr ""
 "A sua placa de rede sem-fio está desactivada, por favor active primeiro o "
 "comutador sem-fio (RF kill switch)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Definições de rede sem-fio"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Modo de operação"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Controlado"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Principal"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repetidor"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secundário"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nome da rede (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Modo de encriptação"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Chave de encriptação"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Esconder senha"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Forçar o uso desta chave como texto ASCII (p.ex. para o Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Nome de utilizador/Autenticação EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4185,12 +4222,12 @@ msgstr ""
 "Se precisar de indicar o domínio então tente a sintaxe experimental\n"
 "  DOMÍNIO\\nome_de_utilizador"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Senha EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4223,12 +4260,12 @@ msgstr ""
 "  O modo TLS é completamente baseado no certificado e pode ignorar\n"
 "os valores do nome de utilizador e senha indicados aqui."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Certificado do cliente EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4241,32 +4278,37 @@ msgstr ""
 "Deve-se considerar como alternativa à combinação utilziador/senha.\n"
 " Nota: as outras definições relacionadas aparecem na página Avançada."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID da Rede"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frequência da operação"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Ponto inicial de sensibilidade"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Taxa de bits (bitrate) (em b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4290,17 +4332,19 @@ msgstr ""
 "igual ao tamanho máximo do pacote desactiva o esquema. Pode também definir\n"
 "este parâmetro para auto, fixo ou desligado."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentação"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Argumentos extra do comando iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4316,12 +4360,13 @@ msgstr ""
 "Veja a página do manual iwconfig(8) para mais informações."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Argumentos extra do comando lwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4340,12 +4385,13 @@ msgstr ""
 "\n"
 "Consulte a página do manual iwpspy(8) para mais informações."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Argumentos extra do comando lwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4373,28 +4419,28 @@ msgstr ""
 "\n"
 "Veja a página do manual iwpriv(8) para mais informações."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protocolo EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Auto detectar"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4403,67 +4449,67 @@ msgstr ""
 "A Auto Detecção é recomendada porque primeiro tenta o WPA versão 2\n"
 "como uma segurança para o WPA versão 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Modo EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "chave_mgmt EAP"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4472,12 +4518,12 @@ msgstr ""
 "lista dos protocolos de gestão de chaves autenticados aceitados.\n"
 "os valores possíveis são WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Identidade EAP de fora"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4488,12 +4534,12 @@ msgstr ""
 "a identidade não encriptada com tipos EAP que suportam\n"
 "diferentes identidades tuneladas, e.g., TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP fase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4506,12 +4552,12 @@ msgstr ""
 "auth=MSCHAPV2 para PEAP ou\n"
 "autheap=MSCHAPV2 autheap=MD5 para TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Certificado CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4526,12 +4572,12 @@ msgstr ""
 "será verificado. Se possível, um certificado CA confiável deve\n"
 "sempre ser configurado ao usar TLS ou TTLS ou PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Correspondência de assunto do certificado EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4546,12 +4592,12 @@ msgstr ""
 "assunto.  O texto assunto está no o seguinte formato:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=como@exemplo.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Directivas extra"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4582,12 +4628,12 @@ msgstr ""
 "\tOutras directivas como key_mgmt, eap, podem ser usadas para\n"
 "\tforçar definições especiais diferentes das definições U.I."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Requer uma chave de encriptação."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4596,7 +4642,7 @@ msgstr ""
 "A chave pré-partilhada deve ter entre 8 e 63 caracteres ASCII, ou 64 "
 "caracteres hexadecimais."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4605,7 +4651,7 @@ msgstr ""
 "A chave WEP deve ter no máximo %d caracteres ASCII ou %d caracteres "
 "hexadecimais."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4614,7 +4660,7 @@ msgstr ""
 "Freq deve ter o sufixo k, M ou G (por exemplo, \"2.46G\" para uma frequência "
 "de 2.46 GHz), ou então insira suficientes '0' (zeros)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4623,17 +4669,17 @@ msgstr ""
 "A taxa de transferência deve ter o sufixo k, M ou G (por exemplo, \"11M\" "
 "para 11M), ou insira suficientes '0' (zeros)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Permitir ponto de acesso roaming"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Associada à rede sem-fio \"%s\" no interface %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Associação perdida para a rede sem fions no interface %s"
@@ -4781,6 +4827,287 @@ msgstr "Conectar"
 msgid "Hostname changed to \"%s\""
 msgstr "Nome da máquina modificado para \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nenhum adaptador de rede ethernet detectado no seu sistema. Por favor "
+"execute a ferramenta de configuração de material."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Interface de rede"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Seleccione o interface de rede a configurar:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Ocorreu um problema ao reiniciar a rede: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Parabéns, a configuração da rede terminou."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Gerir conexões VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Dispositivo: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Configuração VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Servidor DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Domínio de pesquisa"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automático"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Iniciado no arranque"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Modo de marcação"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Velocidade da conexão"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Tempo de espera da conexão (em segundos)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Número de telefone do provedor"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Conexão modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Seleccionar ficheiro"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ da Placa"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memória da placa (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "ES da Placa"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "ES_0 da Placa"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocolo Europeu (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocolo para o resto do mundo\n"
+"Nenhum Canal-D (linhas alugadas)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Módulo"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Endereço real"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Bielorrússia"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "O endereço Gateway deve ser no formato 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interface"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Nenhuma conexão internet configurada"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Não tem qualquer conexão Internet configurada.\n"
+"Execute o assistente \"%s\" do Centro de Controlo Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Primeiro servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primeiro servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Segundo servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Primeiro servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configuração da Conexão"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Acesso da impressora"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tipo de conexão: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Estado"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "A testar a sua conexão..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Parâmetros IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4990,11 +5317,6 @@ msgstr "Usar 'Firewall' Interactiva"
 msgid "No device found"
 msgstr "Nenhum dispositivo encontrado"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Dispositivo: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5230,6 +5552,103 @@ msgstr "Instalar novo controlador"
 msgid "Select a device:"
 msgstr "Seleccione um dispositivo:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Serviço atacado"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Modo automático da 'Firewall' interactiva"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Como deseja ligar esta conexão ?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interface de rede"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocolo"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Endereço IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Serviço atacado"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "'Firewall' Interactiva"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Conexão sem-fio"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Como deseja ligar esta conexão ?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5273,20 +5692,6 @@ msgstr "Placa ISDN interna"
 msgid "Protocol for the rest of the world"
 msgstr "Protocolo para o resto do mundo"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocolo Europeu (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocolo para o resto do mundo\n"
-"Nenhum Canal-D (linhas alugadas)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5337,11 +5742,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Controlo de conexão"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "A testar a sua conexão..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5362,11 +5762,6 @@ msgstr "O seu número de telefone pessoal"
 msgid "Provider name (ex provider.net)"
 msgstr "Nome do provedor (ex: provedor.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Número de telefone do provedor"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5377,41 +5772,6 @@ msgstr "Provedor DNS 1 (opcional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provedor DNS 2 (opcional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Modo de marcação"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Velocidade da conexão"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Tempo de espera da conexão (em segundos)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ da Placa"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memória da placa (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "ES da Placa"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "ES_0 da Placa"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5577,16 +5937,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primeiro servidor DNS (opcional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Segundo servidor DNS (opcional)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5894,11 +6244,6 @@ msgstr "Por último pode também escrever nos seus endereços IP do servidor DNS
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "O endereço do servidor DNS deve ser no formato 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "O endereço Gateway deve ser no formato 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6380,16 +6725,6 @@ msgstr "Usar porto UDP específico"
 #~ "\n"
 #~ "Está prestes a configurar a sua Rede de Área Local com este adaptador."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Nenhum adaptador de rede ethernet detectado no seu sistema. Por favor "
-#~ "execute a ferramenta de configuração de material."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tipo de conexão: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s já está em uso\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index db4b9e6..bc27850 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2010-04-05 18:28-0300\n"
 "Last-Translator: Sergio Rafael Lemke <sergio@mandriva.com.br>\n"
 "Language-Team: Brazilian Portuguese <mageia-i18n@mandrivalinux.org>\n"
@@ -40,14 +40,16 @@ msgid "Interface"
 msgstr "Interface"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Endereço IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocolo"
@@ -83,23 +85,27 @@ msgid "Configure Local Area Network..."
 msgstr "Configurar Rede Local (LAN)..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ajuda"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Aplicar"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -109,7 +115,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -118,7 +125,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Aguarde"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Aguarde, aplicando a configuração"
@@ -154,6 +161,7 @@ msgstr "Adaptador %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Máscara de Rede"
@@ -169,6 +177,7 @@ msgid "Started on boot"
 msgstr "Ativado na Inicialização"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Cliente DHCP"
@@ -183,17 +192,19 @@ msgstr ""
 "Execute o assistente \"%s\" no Centro de Controle Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configurar uma nova Interface de Rede (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Sem IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Sem Máscara"
@@ -264,12 +275,12 @@ msgstr ""
 "\n"
 "O que você gostaria de fazer?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Habilitar"
@@ -284,8 +295,8 @@ msgstr "Reconfigurar"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Selecione a Interface de Rede Conectada Diretamente com a Internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Dispositivo de Rede"
@@ -360,7 +371,11 @@ msgstr "O nome do domínio interno"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -660,13 +675,14 @@ msgstr "Endereços permitidos"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Firewall Interativo"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Impossível contactar daemon"
@@ -676,12 +692,12 @@ msgstr "Impossível contactar daemon"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Bloquear"
@@ -708,12 +724,12 @@ msgstr "Serviços bloqueados"
 msgid "Clear logs"
 msgstr "Limpar logs"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Lista negra"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Lista Branca"
@@ -863,7 +879,7 @@ msgstr "Modulo"
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descrição"
@@ -912,9 +928,9 @@ msgstr ""
 "como usualmente e todas as suas configurações de rede, a partir de agora, "
 "serão salvas neste perfil."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Aviso"
@@ -2484,12 +2500,12 @@ msgid ""
 msgstr ""
 "Atenção, outra conexão de internet foi detectada, talvez utilizando sua rede"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "conectado"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "desconectado"
@@ -2554,7 +2570,7 @@ msgstr "Habilitar contagem de tráfego"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Métrica"
@@ -2594,19 +2610,22 @@ msgstr "Cable Modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Usar BPALogin (Necessário para Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autenticação"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Nome da Conta (Nome do Usuário)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Senha da Conta"
@@ -2733,13 +2752,15 @@ msgstr ""
 "Cada endereço deve ser colocado como um endereço decimal,\n"
 " separado por pontos (por exemplo, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Obter servidores DNS do DHCP"
@@ -2767,21 +2788,25 @@ msgstr ""
 "qualificado"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Tempo limite do DHCP (em segundos)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Obter servidores YP do DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Obter servidores NTPD do DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nome da máquina DHCP"
@@ -2792,11 +2817,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Não retornar para Zeroconf (rede 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "O endereço IP deve estar no formato 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "A máscara de rede deve estar no formato 255.255.224.0"
@@ -2818,6 +2845,7 @@ msgstr ""
 "dispositivos que usam ele, ou configure-os para não caregar na inicialização."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Obter nome da máquina a partir do servidor DHCP (ou gerar nome único)"
@@ -2844,6 +2872,7 @@ msgstr ""
 "deixar em branco 'localhost.localdomain' será usado."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hotplugging de Rede"
@@ -2913,27 +2942,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem para telefone analógico (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Baseado em script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Baseado em terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4092,12 +4126,12 @@ msgstr "Chave WPA/WPA2 pré-compartilhada"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Driver do windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4106,78 +4140,81 @@ msgstr ""
 "Sua placa wireless está desabilitada, habilite o seu wireless pelo switch do "
 "computador."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Configurações Wireless"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Modo de operação"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Gerenciado"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Mestre"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repetidor"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secundário"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automático"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nome da Rede (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Modo de criptografia"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Chave criptográfica"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Esconder Senha"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Forçar o uso desta chave como string ASCII (ex. para Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Login/Nome do usuário EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4188,12 +4225,12 @@ msgstr ""
 "você precisa especificar um domínio, então tente a sintaxe\n"
 "não testada DOMAIN\\nome_do_usuário"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Senha EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4227,12 +4264,12 @@ msgstr ""
 "  Modo TLS é baseado completamente em certificados e pode ignorar\n"
 "o nome de usuário e senha especificados aqui."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Certificado de cliente EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4245,32 +4282,37 @@ msgstr ""
 "considerada como uma alternativa para o combo usuário/senha.\n"
 " Note: outras configurações relacionadas são mostradas na página Avançada."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID da Rede"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frequência de operação"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Limite de sensibilidade"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Taxa de Bits (em b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4293,17 +4335,19 @@ msgstr ""
 " máximo do pacote desabilita o esquema. Você pode também ajustar este\n"
 "parâmetro para automático, fixo ou desligado."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentação"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "argumentos extras para o comando iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4319,12 +4363,13 @@ msgstr ""
 "Veja a página de manual do iwconfig(8) para informações adicionais."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "argumentos extras para o comando iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4343,12 +4388,13 @@ msgstr ""
 "\n"
 "Veja a página do manual iwpspy(8) para mais informações."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "argumentos extras para o comando iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4378,28 +4424,28 @@ msgstr ""
 "\n"
 "Veja a página do manual iwpriv(8) para mais informações."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protocolo EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Detecção Automática"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4408,67 +4454,67 @@ msgstr ""
 "A detecção automática é recomendada pois primeiro é tentado o WPA versão 2\n"
 "e depois WPA versão 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Modo EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4477,12 +4523,12 @@ msgstr ""
 "lista de protocolos de gerenciamento de chaves de autenticação.\n"
 "possíveis valores são WPA-EAP, IEEE8021X, NENHUM"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Identidade EAP externa"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4493,12 +4539,12 @@ msgstr ""
 "identidade não criptografada com os tipos EAP que suportam diferentes\n"
 "identidades tuneladas, por exemplo, TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4511,12 +4557,12 @@ msgstr ""
 "auth=MSCHAPV2 para PEAP ou\n"
 "autheap=MSCHAPV2 autheap=MD5 para TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Certificado CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4531,12 +4577,12 @@ msgstr ""
 "um certificado CA confiável deve sempre ser configurado\n"
 "quando usar TLS, TTLS ou PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Substring no campo subject do certificado EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4551,12 +4597,12 @@ msgstr ""
 "subject.  A string subject tem o seguinte formato:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Diretivas extras"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4587,12 +4633,12 @@ msgstr ""
 "\tOutras diretivas como key_mgmt, eap podem ser usadas para forçar\n"
 "\tdiferentes opções das usadas por padrão nesta interface."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Uma chave de cifragem é necessária."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4601,7 +4647,7 @@ msgstr ""
 "A chave pré-compartilhada deve ter entre 8 e 63 caracteres ASCII, ou 64 "
 "caracteres hexadecimais."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4610,7 +4656,7 @@ msgstr ""
 "A chave WEP deve ter pelo menos %d caracteres ASCII ou %d caracteres "
 "hexadecimais."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4619,7 +4665,7 @@ msgstr ""
 "Freq deve ter o sufixo k, M ou G (por exemplo, \"2.46G\" para a frequência "
 "2.46GHz), ou deve adicionar '0' (zeros) suficientes."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4628,17 +4674,17 @@ msgstr ""
 "Taxa deve ter o sufixo k, M ou G (por exemplo, \"11M\" para 11M), ou deve "
 "adicionar '0' (zeros) suficientes."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Permitir ponto de acesso remoto"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Associada para rede wireless \"%s\"  a interface %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Perdida a associação com a rede wireless na interface %s"
@@ -4786,6 +4832,287 @@ msgstr "Conectar"
 msgid "Hostname changed to \"%s\""
 msgstr "Nome da máquina alterado para \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nenhum adaptador de rede Ethernet foi detectado em seu sistema. Execute a "
+"ferramenta de configuração de hardware."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Interface de rede"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Escolha a interface de rede para configurar:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Um problema ocorreu ao reiniciar a rede: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Parabéns, a configuração da rede está finalizada."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Gerenciar conexões VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Dispositivo: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Configuração de VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Servidor DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Pesquisar domínio"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automático"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Ativado na Inicialização"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Modo de discagem"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Velocidade da conexão"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Tempo limite da conexão (em segundos)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Número do telefone do provedor"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Conexão via Modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Selecione o arquivo"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ da Placa"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Memória da Placa (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "ES da Placa"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "ES_0 da Placa"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocolo Europeu (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocolo para o resto do mundo\n"
+"Sem Canal-D (linhas arrendadas)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modulo"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Endereço real"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Belarus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "O endereço do gateway deve estar no formato 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Gateway"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interface"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Nenhuma conexão à Internet configurada"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Você não possui nenhuma conexão de Internet configurada.\n"
+"Execute o assistente \"%s\" no Centro de Controle Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Primeiro servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primeiro servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Segundo servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Primeiro servidor DNS (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configuração da Conexão"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Acesso a impressora"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tipo de conexão: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Estado"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testando sua conexão..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Parâmetros de IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4992,11 +5319,6 @@ msgstr "Usar o Firewall Interativo"
 msgid "No device found"
 msgstr "Nenhum dispositivo encontrado"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Dispositivo: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5231,6 +5553,103 @@ msgstr "Instalar um novo driver"
 msgid "Select a device:"
 msgstr "Selecione um dispositivo:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Serviço atacado"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Modo automático do Firewall Interativo"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Como você quer Discar esta Conexão?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interface de rede"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocolo"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Endereço IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Serviço atacado"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Firewall Interativo"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Conexão Wireless"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Como você quer Discar esta Conexão?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5274,20 +5693,6 @@ msgstr "Placa ISDN interna"
 msgid "Protocol for the rest of the world"
 msgstr "Protocolo para o resto do mundo"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocolo Europeu (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocolo para o resto do mundo\n"
-"Sem Canal-D (linhas arrendadas)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5338,11 +5743,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Controle de conexão"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testando sua conexão..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5363,11 +5763,6 @@ msgstr "O número do seu telefone"
 msgid "Provider name (ex provider.net)"
 msgstr "Nome do provedor (ex: provedor.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Número do telefone do provedor"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5378,41 +5773,6 @@ msgstr "DNS 1 do provedor (opcional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 do provedor (opcional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Modo de discagem"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Velocidade da conexão"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Tempo limite da conexão (em segundos)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ da Placa"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Memória da Placa (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "ES da Placa"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "ES_0 da Placa"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5579,16 +5939,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nome do domínio"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primeiro servidor DNS (opcional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Segundo servidor DNS (opcional)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5898,11 +6248,6 @@ msgstr "Você pode também digitar os endereços IP do servidor DNS."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "O endereço DNS deve ser no formato 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "O endereço do gateway deve estar no formato 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6387,15 +6732,5 @@ msgstr "Utilizar porta UDP específica"
 #~ "\n"
 #~ "Sua Rede Local (LAN) será configurada com esse adaptador."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Nenhum adaptador de rede Ethernet foi detectado em seu sistema. Execute a "
-#~ "ferramenta de configuração de hardware."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tipo de conexão: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s já está em uso\n"
diff --git a/po/ro.po b/po/ro.po
index 841d46b..30ee41b 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,19 +1,20 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-19 13:12+0000\n"
 "Last-Translator: Florin Catalin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2)\n"
 
 #: ../bin/drakconnect-old:45
 #, c-format
@@ -26,14 +27,16 @@ msgid "Interface"
 msgstr "Interfață"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Adresă IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
@@ -69,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "Configurare rețea locală (LAN)..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ajutor"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Aplică"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Anulează"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -95,16 +102,17 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
-#: ../lib/network/netcenter.pm:150 ../lib/network/netcenter.pm:150
-#: ../lib/network/netconnect.pm:186 ../lib/network/netconnect.pm:208
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#: ../lib/network/thirdparty.pm:352 ../lib/network/thirdparty.pm:367
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
+#: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
+#: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
+#: ../lib/network/thirdparty.pm:367
 #, c-format
 msgid "Please wait"
 msgstr "Așteptați vă rog"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Așteptați... Se activează configurația"
@@ -140,6 +148,7 @@ msgstr "Adaptor %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Mască de rețea"
@@ -155,6 +164,7 @@ msgid "Started on boot"
 msgstr "Inițiată la pornire"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Client DHCP"
@@ -169,17 +179,19 @@ msgstr ""
 "Rulați asistentul „%s” din centrul de control Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Configurează o nouă interfață de rețea (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Fără IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Fără mască"
@@ -203,17 +215,26 @@ msgstr "Partajare de conexiune la Internet"
 #, 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). Please disable Mageia Firewall for the network adapter connected to your LAN connection before proceeding."
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN). Please disable Mageia Firewall for the network adapter connected to "
+"your LAN connection before proceeding."
 msgstr ""
-"Sînteți pe cale să vă configurați calculatorul pentru a partaja conexiunea la Internet.\n"
-"Astfel, alte calculatoare din rețeaua locală vor fi capabile să utilizeze conexiunea la Internet a acestui calculator.\n"
-"Asigurați-vă că ați configurat accesul la Internet/rețea utilizînd drakconnect înainte de a merge mai departe.\n"
+"Sînteți pe cale să vă configurați calculatorul pentru a partaja conexiunea "
+"la Internet.\n"
+"Astfel, alte calculatoare din rețeaua locală vor fi capabile să utilizeze "
+"conexiunea la Internet a acestui calculator.\n"
+"Asigurați-vă că ați configurat accesul la Internet/rețea utilizînd "
+"drakconnect înainte de a merge mai departe.\n"
 "\n"
-"Notă: aveți nevoie de o placă de rețea dedicată pentru a configura o rețea locală (LAN). Vă rugăm să dezactivați Mageia Firewall pentru placa de rețea conectată la rețeaua locală înainte de a continua."
+"Notă: aveți nevoie de o placă de rețea dedicată pentru a configura o rețea "
+"locală (LAN). Vă rugăm să dezactivați Mageia Firewall pentru placa de rețea "
+"conectată la rețeaua locală înainte de a continua."
 
 #: ../bin/drakgw:91
 #, c-format
@@ -241,12 +262,12 @@ msgstr ""
 "\n"
 "Ce doriți să faceți?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Dezactivează"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Activează"
@@ -261,8 +282,8 @@ msgstr "Reconfigurează"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Selectați interfața de rețea conectată direct la Internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Dispozitiv de rețea"
@@ -270,7 +291,8 @@ msgstr "Dispozitiv de rețea"
 #: ../bin/drakgw:141
 #, c-format
 msgid ""
-"There is only one network adapter on your system configured for LAN connections:\n"
+"There is only one network adapter on your system configured for LAN "
+"connections:\n"
 "\n"
 "%s\n"
 "\n"
@@ -280,7 +302,8 @@ msgid ""
 "disable the firewall protection on it using drakfirewall before\n"
 "configuring Internet Connection sharing."
 msgstr ""
-"Aveți configurat în sistem numai un singur adaptor de rețea pentru conexiunile LAN:\n"
+"Aveți configurat în sistem numai un singur adaptor de rețea pentru "
+"conexiunile LAN:\n"
 "\n"
 "%s\n"
 "\n"
@@ -292,7 +315,9 @@ msgstr ""
 
 #: ../bin/drakgw:156
 #, 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 "Alegeți care placă de rețea va fi conectată la rețeaua voastră locală."
 
 #: ../bin/drakgw:177
@@ -334,7 +359,11 @@ msgstr "Numele de domeniu intern"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -349,10 +378,10 @@ msgstr "Eroare"
 
 #: ../bin/drakgw:188
 #, c-format
-msgid ""
-"Potential LAN address conflict found in current config of %s!\n"
-""
-msgstr "S-a găsit un posibil conflict de adrese LAN în configurația curentă a lui %s!\n"
+msgid "Potential LAN address conflict found in current config of %s!\n"
+msgstr ""
+"S-a găsit un posibil conflict de adrese LAN în configurația curentă a lui "
+"%s!\n"
 
 #: ../bin/drakgw:204
 #, c-format
@@ -445,13 +474,19 @@ msgstr "Difuzează informațiile imprimantei"
 #: ../bin/drakgw:308
 #, c-format
 msgid ""
-"No ethernet network adapter configured for LAN has been detected on your system.\n"
+"No ethernet network adapter configured for LAN has been detected on your "
+"system.\n"
 "\n"
-"Please run the hardware configuration tool to configure it, and ensure that the Mageia firewall is not enabled for network adapter connected to your LAN network."
+"Please run the hardware configuration tool to configure it, and ensure that "
+"the Mageia firewall is not enabled for network adapter connected to your LAN "
+"network."
 msgstr ""
-"Nu s-a detectat în sistem nici o placă de rețea Ethernet configurată pentru rețeaua locală.\n"
+"Nu s-a detectat în sistem nici o placă de rețea Ethernet configurată pentru "
+"rețeaua locală.\n"
 "\n"
-"Lansați unealta de configurare a componentelor materiale pentru a o configura și asigurați-vă că Mageia Firewall nu este activat pentru placa de rețea conectată la rețeaua locală."
+"Lansați unealta de configurare a componentelor materiale pentru a o "
+"configura și asigurați-vă că Mageia Firewall nu este activat pentru placa de "
+"rețea conectată la rețeaua locală."
 
 #: ../bin/drakgw:316
 #, c-format
@@ -467,11 +502,13 @@ msgstr "Partajarea conexiunii la Internet este acum dezactivată."
 #, 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 ""
 "Totul a fost configurat.\n"
-"Acum vă puteți partaja conexiunea la Internet cu celelalte calculatoare din rețeaua locală, utilizînd configurarea automată a rețelei (DHCP) și\n"
+"Acum vă puteți partaja conexiunea la Internet cu celelalte calculatoare din "
+"rețeaua locală, utilizînd configurarea automată a rețelei (DHCP) și\n"
 " un server proxy de pre-tampon transparent (SQUID)."
 
 #: ../bin/drakgw:351
@@ -486,8 +523,12 @@ msgstr "S-a detectat o configurație de parafoc!"
 
 #: ../bin/drakgw:366
 #, c-format
-msgid "Warning! An existing firewalling configuration has been detected. You may need some manual fixes after installation."
-msgstr "Avertisment! S-a detectat o configurație existentă de parafoc. Ar putea fi nevoie de unele ajustări manuale după instalare."
+msgid ""
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
+msgstr ""
+"Avertisment! S-a detectat o configurație existentă de parafoc. Ar putea fi "
+"nevoie de unele ajustări manuale după instalare."
 
 #: ../bin/drakgw:371
 #, c-format
@@ -622,13 +663,14 @@ msgstr "Adrese permise"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Parafoc interactiv"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Nu se poate contacta demonul"
@@ -638,12 +680,12 @@ msgstr "Nu se poate contacta demonul"
 msgid "Log"
 msgstr "Jurnal"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Permite"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blochează"
@@ -670,12 +712,12 @@ msgstr "Servicii blocate"
 msgid "Clear logs"
 msgstr "Curăță jurnalele"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Lista neagră"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Lista albă"
@@ -757,8 +799,12 @@ msgstr "Este nevoie de o parolă."
 
 #: ../bin/drakinvictus:100
 #, c-format
-msgid "This tool allows to set up network interfaces failover and firewall replication."
-msgstr "Această unealtă permite configurarea interfețelor de rețea în mod redundant și replicarea parafocului."
+msgid ""
+"This tool allows to set up network interfaces failover and firewall "
+"replication."
+msgstr ""
+"Această unealtă permite configurarea interfețelor de rețea în mod redundant "
+"și replicarea parafocului."
 
 #: ../bin/drakinvictus:102
 #, c-format
@@ -821,7 +867,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Activat"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descriere"
@@ -838,8 +884,15 @@ msgstr "Profil nou..."
 
 #: ../bin/draknetprofile:155
 #, c-format
-msgid "Please specify the name of the new network profile to be created (e.g., work, home, roaming, ..). This new profile will be created based on current settings, and you'll be able to configure your system configuration as usual afterwards."
-msgstr "Specificați numele profilului de rețea ce va fi creat (ex: lucru, acasă, itinerant...). Acest nou profil va fi creat pe baza configurărilor curente și vă veți putea configura parametrii sistemului ca de obicei, ulterior."
+msgid ""
+"Please specify the name of the new network profile to be created (e.g., "
+"work, home, roaming, ..). This new profile will be created based on current "
+"settings, and you'll be able to configure your system configuration as usual "
+"afterwards."
+msgstr ""
+"Specificați numele profilului de rețea ce va fi creat (ex: lucru, acasă, "
+"itinerant...). Acest nou profil va fi creat pe baza configurărilor curente "
+"și vă veți putea configura parametrii sistemului ca de obicei, ulterior."
 
 #: ../bin/draknetprofile:166
 #, c-format
@@ -853,12 +906,18 @@ msgstr "Profil nou creat"
 
 #: ../bin/draknetprofile:172
 #, c-format
-msgid "You are now using network profile %s. You can configure your system as usual, and all your network settings from now on will be saved into this profile."
-msgstr "Acum utilizați profilul de rețea %s. Vă puteți configura sistemul ca de obicei și toate configurările de rețea vor fi salvate  în acest profil de acum înainte."
+msgid ""
+"You are now using network profile %s. You can configure your system as "
+"usual, and all your network settings from now on will be saved into this "
+"profile."
+msgstr ""
+"Acum utilizați profilul de rețea %s. Vă puteți configura sistemul ca de "
+"obicei și toate configurările de rețea vor fi salvate  în acest profil de "
+"acum înainte."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Avertisment"
@@ -870,8 +929,12 @@ msgstr "Sînteți sigur că doriți să ștergeți profilul implicit?"
 
 #: ../bin/draknetprofile:186
 #, c-format
-msgid "You can not delete the current profile. Please switch to a different profile first."
-msgstr "Nu puteți șterge profilul curent. Pentru aceasta treceți mai întîi pe lat profil."
+msgid ""
+"You can not delete the current profile. Please switch to a different profile "
+"first."
+msgstr ""
+"Nu puteți șterge profilul curent. Pentru aceasta treceți mai întîi pe lat "
+"profil."
 
 #: ../bin/draknetprofile:194 ../bin/draknfs:356
 #, c-format
@@ -993,34 +1056,51 @@ msgstr "Ar trebui să fie un director."
 #: ../bin/draknfs:146
 #, 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\">Clienți NFS</span> pot fi specificați în mai multe feluri:\n"
+"<span weight=\"bold\">Clienți NFS</span> pot fi specificați în mai multe "
+"feluri:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">gazdă simplă:</span> o gazdă identificată fie după numele abreviat recunoscut de serverul de nume, un nume de domeniu complet calificat (FQDN) sau o adresă IP\n"
+"<span foreground=\"royalblue3\">gazdă simplă:</span> o gazdă identificată "
+"fie după numele abreviat recunoscut de serverul de nume, un nume de domeniu "
+"complet calificat (FQDN) sau o adresă IP\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">grupuri de rețea:</span> grupurile de rețea NIS pot fi specificate cu @group.\n"
+"<span foreground=\"royalblue3\">grupuri de rețea:</span> grupurile de rețea "
+"NIS pot fi specificate cu @group.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">metacaractere:</span> numele mașinilor pot conține metacaracterele * și ?. De exemplu: *.cs.foo.edu  corespunde cu toate gazdele din domeniul cs.foo.edu.\n"
+"<span foreground=\"royalblue3\">metacaractere:</span> numele mașinilor pot "
+"conține metacaracterele * și ?. De exemplu: *.cs.foo.edu  corespunde cu "
+"toate gazdele din domeniul cs.foo.edu.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">rețele IP:</span> puteți de asemenea exporta simultan directoare la toate gazdele dintr-o (sub)rețea adăugînd o mască la sfîrșitul adresei de (sub)rețea. Exemplu: 192.168.1.0/255.255.255.0 sau 192.168.1.0/24\n"
+"<span foreground=\"royalblue3\">rețele IP:</span> puteți de asemenea exporta "
+"simultan directoare la toate gazdele dintr-o (sub)rețea adăugînd o mască la "
+"sfîrșitul adresei de (sub)rețea. Exemplu: 192.168.1.0/255.255.255.0 sau "
+"192.168.1.0/24\n"
 
 #: ../bin/draknfs:161
 #, c-format
@@ -1028,31 +1108,49 @@ 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\">Opțiuni ID utilizator</span>\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">asociază utilizatorul root cu anonymous (root_squash):</span> transformă cererile de la UID/GID 0 în UID/GID anonime.\n"
+"<span foreground=\"royalblue3\">asociază utilizatorul root cu anonymous "
+"(root_squash):</span> transformă cererile de la UID/GID 0 în UID/GID "
+"anonime.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">permite accesul distant direct cu utilizatorul root (no_root_squash):</span> nu se transformă cererile UID/GID 0. Această opțiune este folosită în particular pentru stațiile de lucru ce nu dispun de un disc local.\n"
+"<span foreground=\"royalblue3\">permite accesul distant direct cu "
+"utilizatorul root (no_root_squash):</span> nu se transformă cererile UID/GID "
+"0. Această opțiune este folosită în particular pentru stațiile de lucru ce "
+"nu dispun de un disc local.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">asociază toți utilizatorii cu anonymous (all_squash):</span> transformă toate UID/GID în utilizator anonim. Este folositor pentru a exporta cu NFS directoare publice de FTP, directoare de News, etc... Opțiunea inversă este no_all_squash, ce se aplică în mod implicit.\n"
+"<span foreground=\"royalblue3\">asociază toți utilizatorii cu anonymous "
+"(all_squash):</span> transformă toate UID/GID în utilizator anonim. Este "
+"folositor pentru a exporta cu NFS directoare publice de FTP, directoare de "
+"News, etc... Opțiunea inversă este no_all_squash, ce se aplică în mod "
+"implicit.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">utilizatori si grup anonim (anonuid și anongid):</span> aceaste opțiuni definesc implicit UID si GID al contului anonymus.\n"
+"<span foreground=\"royalblue3\">utilizatori si grup anonim (anonuid și "
+"anongid):</span> aceaste opțiuni definesc implicit UID si GID al contului "
+"anonymus.\n"
 
 #: ../bin/draknfs:177
 #, c-format
@@ -1081,23 +1179,50 @@ msgstr "Opțiuni avansate"
 
 #: ../bin/draknfs:183
 #, 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> această opțiune obligă ca cererea să fie inițiată de pe un port IP inferior decît IPPORT_RESERVED (1024). Această opțiune este activată în mod implicit."
+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> această opțiune obligă ca "
+"cererea să fie inițiată de pe un port IP inferior decît IPPORT_RESERVED "
+"(1024). Această opțiune este activată în mod implicit."
 
 #: ../bin/draknfs:184
 #, 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> permite fie numai citirea, fie accesul în citire/scriere pe acest volum NFS. În mod implicit, cererile de modificare sînt refuzate. Această opțiune activează în mod explicit acest comportament."
+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> permite fie numai citirea, fie "
+"accesul în citire/scriere pe acest volum NFS. În mod implicit, cererile de "
+"modificare sînt refuzate. Această opțiune activează în mod explicit acest "
+"comportament."
 
 #: ../bin/draknfs:185
 #, 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> interzice serverului NFS să violeze protocolul NFS, răspunzînd la cereri înainte ca acțiunile asociate acestora să fie înregistrate pe mediul de stocare (ex: unitatea de disc)."
+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> interzice serverului NFS să "
+"violeze protocolul NFS, răspunzînd la cereri înainte ca acțiunile asociate "
+"acestora să fie înregistrate pe mediul de stocare (ex: unitatea de disc)."
 
 #: ../bin/draknfs:186
 #, 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> activează verificarea subdirectoarelor, ce permite ameliorarea securității în unele cazuri, dar poate afecta fiabilitatea. Consultați pagina de manual exports(5) pentru mai multe detalii."
+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> activează verificarea "
+"subdirectoarelor, ce permite ameliorarea securității în unele cazuri, dar "
+"poate afecta fiabilitatea. Consultați pagina de manual exports(5) pentru mai "
+"multe detalii."
 
 #: ../bin/draknfs:191 ../bin/draksambashare:623 ../bin/draksambashare:789
 #, c-format
@@ -1460,13 +1585,10 @@ msgstr "Acesta este o unealtă simplă pentru a gestiona ușor Samba."
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #: ../bin/draksambashare:205
 #, c-format
-msgid ""
-"_: Translator(s) name(s) & email(s)\n"
-""
+msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Florin GRAD <florin@mandriva.com>\n"
 "Dragoș Marian BARBU <dragosb@softhome.net>\n"
@@ -1515,8 +1637,12 @@ msgstr "Comentariu:"
 
 #: ../bin/draksambashare:393
 #, c-format
-msgid "Share with the same name already exist or share name empty, please choose another name."
-msgstr "Un partaj cu același nume există deja sau partaj nespecificat, alegeți un alt nume."
+msgid ""
+"Share with the same name already exist or share name empty, please choose "
+"another name."
+msgstr ""
+"Un partaj cu același nume există deja sau partaj nespecificat, alegeți un "
+"alt nume."
 
 #: ../bin/draksambashare:400
 #, c-format
@@ -1546,8 +1672,11 @@ msgstr "Adaugă un partaj de imprimantă special"
 
 #: ../bin/draksambashare:448
 #, c-format
-msgid "Goal of this wizard is to easily create a new special printer Samba share."
-msgstr "Scopul acestui asistent este de a facilita crearea unui nou partaj Samba de imprimantă special."
+msgid ""
+"Goal of this wizard is to easily create a new special printer Samba share."
+msgstr ""
+"Scopul acestui asistent este de a facilita crearea unui nou partaj Samba de "
+"imprimantă special."
 
 #: ../bin/draksambashare:455
 #, c-format
@@ -1572,7 +1701,9 @@ msgstr "Asistentul a adăugat cu succes partajul Samba de imprimantă"
 #: ../bin/draksambashare:552
 #, c-format
 msgid "Please add or select a Samba printer share to be able to modify it."
-msgstr "Adăugați sau selectați un partaj Samba de imprimantă pentru a-l putea modifica."
+msgstr ""
+"Adăugați sau selectați un partaj Samba de imprimantă pentru a-l putea "
+"modifica."
 
 #: ../bin/draksambashare:570
 #, c-format
@@ -1686,8 +1817,11 @@ msgstr "Public:"
 
 #: ../bin/draksambashare:795
 #, c-format
-msgid "Create mask, create mode and directory mask should be numeric. ie: 0755."
-msgstr "Masca de creare, drepturile pe directoare și fișiere ar trebui să fie numerice. Ex: 0755."
+msgid ""
+"Create mask, create mode and directory mask should be numeric. ie: 0755."
+msgstr ""
+"Masca de creare, drepturile pe directoare și fișiere ar trebui să fie "
+"numerice. Ex: 0755."
 
 #: ../bin/draksambashare:803
 #, c-format
@@ -1736,8 +1870,12 @@ msgstr "Asistentul de configurare al serverului Samba"
 
 #: ../bin/draksambashare:1057
 #, c-format
-msgid "Samba allows your server to behave as a file and print server for workstations running non-Linux systems."
-msgstr "Samba permite serverului vostru să se comporte ca un server de fișiere și imprimante pentru stațiile de lucru non-Linux."
+msgid ""
+"Samba allows your server to behave as a file and print server for "
+"workstations running non-Linux systems."
+msgstr ""
+"Samba permite serverului vostru să se comporte ca un server de fișiere și "
+"imprimante pentru stațiile de lucru non-Linux."
 
 #: ../bin/draksambashare:1073
 #, c-format
@@ -1746,18 +1884,29 @@ msgstr "Server PDC: controlor de domeniu principal"
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Server configured as a PDC is responsible for Windows authentication throughout the domain."
-msgstr "Serverul configurat ca PDC răspunde de autentificarea stațiilor Windows în întreg domeniul."
+msgid ""
+"Server configured as a PDC is responsible for Windows authentication "
+"throughout the domain."
+msgstr ""
+"Serverul configurat ca PDC răspunde de autentificarea stațiilor Windows în "
+"întreg domeniul."
 
 #: ../bin/draksambashare:1073
 #, c-format
-msgid "Single server installations may use smbpasswd or tdbsam password backends"
-msgstr "Instalările de server simplu pot folosi utilitarele de parole smbpasswd sau tdbsam"
+msgid ""
+"Single server installations may use smbpasswd or tdbsam password backends"
+msgstr ""
+"Instalările de server simplu pot folosi utilitarele de parole smbpasswd sau "
+"tdbsam"
 
 #: ../bin/draksambashare:1073
 #, 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, impune serverului să se declare cu numele NetBIOS <pdc name>. Acest nume va fi cel recunoscut de către celelalte servere."
+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, impune serverului să se declare cu numele NetBIOS <pdc "
+"name>. Acest nume va fi cel recunoscut de către celelalte servere."
 
 #: ../bin/draksambashare:1090
 #, c-format
@@ -1781,8 +1930,18 @@ msgstr "Os level:"
 
 #: ../bin/draksambashare:1092
 #, 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 "Opțiunea globală „Os level” determină nivelul sistemului de operare pe care Samba îl va simula în timpul scrutinului între servere. Dacă doriți ca Samba să cîștige alegerile și să devină noul server principal, trebuie să-i specificați un nivel superior celui dintre sistemele de operare cu nivelul cel mai mare, prezent în rețea. Ex: 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 ""
+"Opțiunea globală „Os level” determină nivelul sistemului de operare pe care "
+"Samba îl va simula în timpul scrutinului între servere. Dacă doriți ca Samba "
+"să cîștige alegerile și să devină noul server principal, trebuie să-i "
+"specificați un nivel superior celui dintre sistemele de operare cu nivelul "
+"cel mai mare, prezent în rețea. Ex: Os level = 34"
 
 #: ../bin/draksambashare:1096
 #, c-format
@@ -1797,7 +1956,8 @@ msgstr "Grup de lucru"
 #: ../bin/draksambashare:1103
 #, c-format
 msgid "Samba needs to know the Windows Workgroup it will serve."
-msgstr "Samba trebuie să cunoască grupul de lucru Windows pe care-l va deservi."
+msgstr ""
+"Samba trebuie să cunoască grupul de lucru Windows pe care-l va deservi."
 
 #: ../bin/draksambashare:1110 ../bin/draksambashare:1177
 #, c-format
@@ -1821,8 +1981,13 @@ msgstr "Mod de securitate"
 
 #: ../bin/draksambashare:1122
 #, c-format
-msgid "User level: the client sends a session setup request directly following protocol negotiation. This request provides a username and password."
-msgstr "Nivel utilizator: clientul trimite direct o cerere de deschidere de sesiune după negocierea protocolului. Această cerere conține un nume de utilizator și o parolă."
+msgid ""
+"User level: the client sends a session setup request directly following "
+"protocol negotiation. This request provides a username and password."
+msgstr ""
+"Nivel utilizator: clientul trimite direct o cerere de deschidere de sesiune "
+"după negocierea protocolului. Această cerere conține un nume de utilizator "
+"și o parolă."
 
 #: ../bin/draksambashare:1122
 #, c-format
@@ -1831,8 +1996,14 @@ msgstr "Nivel partaj: clientul se identifică separat pentru fiecare partaj"
 
 #: ../bin/draksambashare:1122
 #, 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 "Nivel domeniu: permite stocarea tuturor conturilor și grupurilor de utilizatori într-un spațiu de conturi centralizat, partajat între controlorii (securitate) de domeniu."
+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 ""
+"Nivel domeniu: permite stocarea tuturor conturilor și grupurilor de "
+"utilizatori într-un spațiu de conturi centralizat, partajat între "
+"controlorii (securitate) de domeniu."
 
 #: ../bin/draksambashare:1133
 #, c-format
@@ -1846,8 +2017,12 @@ msgstr "Bandiera serverului."
 
 #: ../bin/draksambashare:1138
 #, c-format
-msgid "The banner is the way this server will be described in the Windows workstations."
-msgstr "Bandiera serverului este modul în care serverul va fi descris pe stațiile Windows."
+msgid ""
+"The banner is the way this server will be described in the Windows "
+"workstations."
+msgstr ""
+"Bandiera serverului este modul în care serverul va fi descris pe stațiile "
+"Windows."
 
 #: ../bin/draksambashare:1143
 #, c-format
@@ -1866,13 +2041,19 @@ msgstr "Jurnale Samba"
 
 #: ../bin/draksambashare:1154
 #, c-format
-msgid "Log file: use file.%m to use a separate log file for each machine that connects"
-msgstr "Fișier jurnal: utilizați fișier.%m pentru a dispune de un fișier jurnal diferit pentru fiecare mașină care se conectează."
+msgid ""
+"Log file: use file.%m to use a separate log file for each machine that "
+"connects"
+msgstr ""
+"Fișier jurnal: utilizați fișier.%m pentru a dispune de un fișier jurnal "
+"diferit pentru fiecare mașină care se conectează."
 
 #: ../bin/draksambashare:1154
 #, c-format
 msgid "Log level: set the log (verbosity) level (0 <= log level <= 10)"
-msgstr "Nivel jurnal: determină nivelul (de detaliu al) jurnalului (0 <= nivel <= 10) "
+msgstr ""
+"Nivel jurnal: determină nivelul (de detaliu al) jurnalului (0 <= nivel <= "
+"10) "
 
 #: ../bin/draksambashare:1154
 #, c-format
@@ -1901,13 +2082,21 @@ msgstr "Asistentul a colectat următorii parametri pentru a configura Samba."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "To accept these values, and configure your server, click the Next button or use the Back button to correct them."
-msgstr "Ca să acceptați aceste valori, și să configurați serverul, alegeți să continuați, sau să reveniți la etapa precedentă pentru corectare."
+msgid ""
+"To accept these values, and configure your server, click the Next button or "
+"use the Back button to correct them."
+msgstr ""
+"Ca să acceptați aceste valori, și să configurați serverul, alegeți să "
+"continuați, sau să reveniți la etapa precedentă pentru corectare."
 
 #: ../bin/draksambashare:1168
 #, c-format
-msgid "If you have previously create some shares, they will appear in this configuration. Run 'drakwizard sambashare' to manage your shares."
-msgstr "Dacă ați creat partaje precedent, vor apărea în această configurație. Lansați „drakwizard sambashare” pentru a vă gestiona partajele."
+msgid ""
+"If you have previously create some shares, they will appear in this "
+"configuration. Run 'drakwizard sambashare' to manage your shares."
+msgstr ""
+"Dacă ați creat partaje precedent, vor apărea în această configurație. "
+"Lansați „drakwizard sambashare” pentru a vă gestiona partajele."
 
 #: ../bin/draksambashare:1176
 #, c-format
@@ -2063,7 +2252,9 @@ msgstr "Rețeaua este inactivă pe interfața %s."
 msgid ""
 "You do not have any configured Internet connection.\n"
 "Run the \"%s\" assistant from the Mageia Linux Control Center"
-msgstr "Nu aveți configurată nici o conexiune la Internet. Lansați asistentul „%s” din centrul de control Mageia"
+msgstr ""
+"Nu aveți configurată nici o conexiune la Internet. Lansați asistentul „%s” "
+"din centrul de control Mageia"
 
 #: ../bin/net_applet:107 ../lib/network/connection_manager.pm:206
 #, c-format
@@ -2296,15 +2487,19 @@ msgstr "Măsură locală"
 
 #: ../bin/net_monitor:512
 #, c-format
-msgid "Warning, another internet connection has been detected, maybe using your network"
-msgstr "Atenție, o altă conexiune la Internet a fost detectată, probabil vă utilizează rețeaua"
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"Atenție, o altă conexiune la Internet a fost detectată, probabil vă "
+"utilizează rețeaua"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Conectat"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Deconectat"
@@ -2369,7 +2564,7 @@ msgstr "Activează contabilizarea traficului"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Permite controlul interfeței de către gestionarul de rețea"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrică"
@@ -2382,7 +2577,9 @@ msgstr "MTU"
 #: ../lib/network/connection.pm:253
 #, c-format
 msgid "Maximum size of network message (MTU). If unsure, left blank."
-msgstr "Lungimea maximă a unui mesaj de rețea (MTU). Lăsați gol dacă nu sînteți sigur."
+msgstr ""
+"Lungimea maximă a unui mesaj de rețea (MTU). Lăsați gol dacă nu sînteți "
+"sigur."
 
 #: ../lib/network/connection.pm:333
 #, c-format
@@ -2409,19 +2606,22 @@ msgstr "Modem de cablu"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Utilizează BPALogin (necesar pentru Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentificare"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Numele utilizatorului contului"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Parola contului"
@@ -2473,7 +2673,8 @@ msgid ""
 "Entering the wrong PIN code multiple times may lock your SIM card!"
 msgstr ""
 "Ați introdus un cod PIN greșit.\n"
-"Introducerea repetată a unui cod PIN greșit poate duce la blocarea cartelei SIM!"
+"Introducerea repetată a unui cod PIN greșit poate duce la blocarea cartelei "
+"SIM!"
 
 #: ../lib/network/connection/dvb.pm:9
 #, c-format
@@ -2518,7 +2719,9 @@ msgstr "Interfață virtuală"
 #: ../lib/network/connection/ethernet.pm:60
 #, c-format
 msgid "Unable to find network interface for selected device (using %s driver)."
-msgstr "Nu se găsește interfața de rețea pentru dispozitivul selecționat (se utilizează pilotul %s)."
+msgstr ""
+"Nu se găsește interfața de rețea pentru dispozitivul selecționat (se "
+"utilizează pilotul %s)."
 
 #: ../lib/network/connection/ethernet.pm:70 ../lib/network/vpn/openvpn.pm:209
 #, c-format
@@ -2546,13 +2749,15 @@ msgstr ""
 "Fiecare rubrică va trebui să fie completată ca o adresă IP în format\n"
 "zecimal-punctat (de exemplu: 192.168.1.55)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Pasarelă"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Recuperează serverele DNS din DHCP"
@@ -2575,24 +2780,30 @@ msgstr "Domeniu de căutare"
 #: ../lib/network/connection/ethernet.pm:157
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
-msgstr "Implicit, domeniul de căutare va fi dedus din numele mașinii complet calificat"
+msgstr ""
+"Implicit, domeniul de căutare va fi dedus din numele mașinii complet "
+"calificat"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Durată de expirare DHCP (în secunde)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Recuperează serverele YP din DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Recuperează serverele NTPD din DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Nume de gazdă DHCP"
@@ -2603,11 +2814,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Nu reveni la ZeroConf (rețeaua 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Adresa IP ar trebui să fie în formatul 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Masca de rețea ar trebui să fie în formatul 255.255.224.0"
@@ -2619,25 +2832,47 @@ msgstr "Atenție: adresa IP %s este de obicei rezervată!"
 
 #: ../lib/network/connection/ethernet.pm:195
 #, c-format
-msgid "%s is already used by a connection that starts on boot (%s). To use this address with this connection, first disable all other devices which use it, or configure them not to start at boot"
-msgstr "%s este deja utilizată de conexiunea inițiată la pornire (%s). Pentru a utiliza această adresă cu această conexiune, va trebui să dezactivați mai întîi toate dispozitivele care o utilizează, sau să le configurați să nu fie inițiate la pornire"
+msgid ""
+"%s is already used by a connection that starts on boot (%s). To use this "
+"address with this connection, first disable all other devices which use it, "
+"or configure them not to start at boot"
+msgstr ""
+"%s este deja utilizată de conexiunea inițiată la pornire (%s). Pentru a "
+"utiliza această adresă cu această conexiune, va trebui să dezactivați mai "
+"întîi toate dispozitivele care o utilizează, sau să le configurați să nu fie "
+"inițiate la pornire"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Atribuie nume gazdei de la serverul DHCP (sau generează unul unic)"
 
 #: ../lib/network/connection/ethernet.pm:223
 #, c-format
-msgid "This will allow the server to attribute a name for this machine. If the server does not provides a valid host name, it will be generated automatically."
-msgstr "Aceasta va permite serverului să atribuie un nume acestei mașini. Dacă serverul nu poate furniza un nume de gazdă valid, acesta va fi generat în mod automat."
+msgid ""
+"This will allow the server to attribute a name for this machine. If the "
+"server does not provides a valid host name, it will be generated "
+"automatically."
+msgstr ""
+"Aceasta va permite serverului să atribuie un nume acestei mașini. Dacă "
+"serverul nu poate furniza un nume de gazdă valid, acesta va fi generat în "
+"mod automat."
 
 #: ../lib/network/connection/ethernet.pm:226
 #, c-format
-msgid "You should define a hostname for this machine, which will identify this PC. Note that this hostname will be shared among all network connections.  If left blank, 'localhost.localdomain' will be used."
-msgstr "Trebuie să definiți un nume de gazdă pentru această mașină, nume prin care va fi identificat acest calculator. De notat că acest nume va fi utilizat detoate conexiunile de rețea. Dacă-l lăsați gol, „localhost.localdomain” va fi folosit."
+msgid ""
+"You should define a hostname for this machine, which will identify this PC. "
+"Note that this hostname will be shared among all network connections.  If "
+"left blank, 'localhost.localdomain' will be used."
+msgstr ""
+"Trebuie să definiți un nume de gazdă pentru această mașină, nume prin care "
+"va fi identificat acest calculator. De notat că acest nume va fi utilizat "
+"detoate conexiunile de rețea. Dacă-l lăsați gol, „localhost.localdomain” va "
+"fi folosit."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Cuplarea la cald a rețelei"
@@ -2665,7 +2900,8 @@ msgstr "Adresă de rețea atribuită pentru interfața %s (protocol %s)"
 #: ../lib/network/connection/ethernet.pm:309
 #, c-format
 msgid "Failed to get a network address on interface %s (%s protocol)"
-msgstr "Atribuirea unei adrese de rețea pentru interfața %s (protocol %s) a eșuat"
+msgstr ""
+"Atribuirea unei adrese de rețea pentru interfața %s (protocol %s) a eșuat"
 
 #: ../lib/network/connection/isdn.pm:8
 #, c-format
@@ -2706,27 +2942,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem analogic (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Bazat pe script"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Manual prin terminal"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3885,88 +4126,95 @@ msgstr "WPA/WPA2 cu cheie pre-partajată (PSK)"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Pilot Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
-msgid "Your wireless card is disabled, please enable the wireless switch (RF kill switch) first."
-msgstr "Placa de rețea fără-fir este dezactivată, activați-o apăsînd butonul prevăzut în acest scop."
+msgid ""
+"Your wireless card is disabled, please enable the wireless switch (RF kill "
+"switch) first."
+msgstr ""
+"Placa de rețea fără-fir este dezactivată, activați-o apăsînd butonul "
+"prevăzut în acest scop."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Parametrii conexiunii fără-fir"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Mod de operare"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Adhoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Gestionat"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Principal"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repetor"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secundar"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Numele rețelei (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Mod de criptare"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Cheia de criptare"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Ascunde parola"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Forțează utilizarea acestei chei ca șir ASCII (ex: pentru Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Utilizator/Cont EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3977,12 +4225,12 @@ msgstr ""
 "Dacă trebuie precizat un domeniu, utilizați sintaxa\n"
 "(netestată) DOMENIU\\utilizator"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Parolă EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4015,12 +4263,12 @@ msgstr ""
 "  Modul TLS este bazat în mod unic pe un certificat și poate\n"
 "ignora numele utilizatorului și parola specificate aici."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Certificat client EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4033,84 +4281,98 @@ msgstr ""
 "Poate fi considerată ca o alternativă cuplului utilizator/parolă.\n"
 " Notă: ceilalți parametri asociați îi găsiți în „Opțiuni avansate”."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID rețea"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frecvența de operare"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Prag de sensibilitate"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Rată de transfer (în biți/secundă)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, 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 ""
 "RTS/CTS rezervă canalul înainte de fiecare transmisie de pachet ca să-i\n"
 "verifice disponibilitatea. Acest lucru reduce lățimea de bandă, dar mărește\n"
 "performanțele în cazul nodurilor ascunse, sau prezența unui număr mare de\n"
-"noduri active. Acest parametru definește mărimea celui mai mic pachet pentru\n"
+"noduri active. Acest parametru definește mărimea celui mai mic pachet "
+"pentru\n"
 "care nodul trimite o ramă RTS; o valoare egală cu mărimea maximă a\n"
 "pachetului dezactivează acest mecanism. De asemenea, acest parametru mai\n"
 "poate fi definit ca „auto”, „fixed” sau „off”."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentare"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 "argumente suplimentare\n"
 "pentru comanda iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, 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 ""
-"Aici, se pot configura parametrii suplimentari pentru placa de rețea fără-fir precum:\n"
-"ap, channel, commit, enc, power, retry, sens, txpower (nick est deja configurat de numele gazdei).\n"
+"Aici, se pot configura parametrii suplimentari pentru placa de rețea fără-"
+"fir precum:\n"
+"ap, channel, commit, enc, power, retry, sens, txpower (nick est deja "
+"configurat de numele gazdei).\n"
 "\n"
 "Consultați pagina de manual iwconfig(8) pentru mai multe informații."
 
-#. -PO: split the "xyz command extra argument" translated string into two
-#. lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 "argumente suplimentare\n"
 "pentru comanda iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4130,28 +4392,33 @@ msgstr ""
 "\n"
 "Consultați pagina de manual iwspy(8) pentru mai multe informații."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 "argumente suplimentare\n"
 "pentru comanda iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, 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 permite specificarea parametrilor opționali (și privați) ai unei interfețe\n"
+"iwpriv permite specificarea parametrilor opționali (și privați) ai unei "
+"interfețe\n"
 "de rețea fără-fir.\n"
 "\n"
 "impriv permite manipularea parametrilor și reglajelor specifice fiecărui\n"
@@ -4164,28 +4431,28 @@ msgstr ""
 "\n"
 "Consultați pagina de manual iwpriv(8) pentru mai multe informații."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protocol EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Detectare automată"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4194,67 +4461,67 @@ msgstr ""
 "Auto-detecția este recomandată deoarece mai întîi se încearcă WPA\n"
 "versiunea 2, cu WPA versiunea 1 în secundar"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Mod EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4263,12 +4530,12 @@ msgstr ""
 "lista protocoalelor de gestiune de chei de autentificare acceptate.\n"
 "valori posibile: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Identitate externă EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4279,12 +4546,12 @@ msgstr ""
 "ca identitate necriptată cu tipurile de EAP ce suportă\n"
 "diferite identități încapsulate în tunele, ex: TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4297,12 +4564,12 @@ msgstr ""
 "auth=MSCHAPV2 pentru PEAP sau\n"
 "autheap=MSCHAPV2 autheap=MD5 pentru TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Certificat CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4317,12 +4584,12 @@ msgstr ""
 "Dacă se poate, un certificat CA de încredere trebuie întotdeauna\n"
 "configurat dacă se utilizează TLS, TTLS sau PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Model de subiect de certificat EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4337,12 +4604,12 @@ msgstr ""
 "Formatul subiectului trebuie să fie următorul:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Directive suplimentare"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4373,42 +4640,57 @@ msgstr ""
 "\tAltele, precum key_mgmt și eap, permit forțarea\n"
 "\tde valori diferite de cele ale interfeței."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Este necesară o cheie de criptare."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
-msgid "The pre-shared key should have between 8 and 63 ASCII characters, or 64 hexadecimal characters."
-msgstr "Cheia pre-partajată conține între 8 și 63 de caractere ASCII, sau 64 de caractere hexazecimale."
+msgid ""
+"The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
+"hexadecimal characters."
+msgstr ""
+"Cheia pre-partajată conține între 8 și 63 de caractere ASCII, sau 64 de "
+"caractere hexazecimale."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
-msgid "The WEP key should have at most %d ASCII characters or %d hexadecimal characters."
-msgstr "Cheia WEP conține cel mult %d caractere ASCII sau %d caractere hexazecimale."
+msgid ""
+"The WEP key should have at most %d ASCII characters or %d hexadecimal "
+"characters."
+msgstr ""
+"Cheia WEP conține cel mult %d caractere ASCII sau %d caractere hexazecimale."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, 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 "Frecvența trebuie să conțină sufixul k, M or G (de exemplu: „2.46G” pentru frecvența de 2.46 GHz), sau să aibă suficiente „0” (zerouri)."
+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 ""
+"Frecvența trebuie să conțină sufixul k, M or G (de exemplu: „2.46G” pentru "
+"frecvența de 2.46 GHz), sau să aibă suficiente „0” (zerouri)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
-msgid "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add enough '0' (zeroes)."
-msgstr "Debitul trebuie să conțină sufixul k, M or G (de exemplu, \"11M\" pentru 11M), sau să aibă suficiente „0” (zerouri)."
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Debitul trebuie să conțină sufixul k, M or G (de exemplu, \"11M\" pentru "
+"11M), sau să aibă suficiente „0” (zerouri)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Autorizează conexiunile itinerante"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Asociat rețelei fără-fir „%s” pe interfața %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "S-a pierdut asocierea cu rețeaua fără-fir pe interfața %s"
@@ -4426,18 +4708,24 @@ msgstr "Modem USB Alcatel speedtouch"
 #: ../lib/network/connection/xdsl.pm:125
 #, 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 ""
-"Modemul ECI Hi-Focus nu poate fi configurat din cauza unei probleme de redistribuire a pilotului binar.\n"
+"Modemul ECI Hi-Focus nu poate fi configurat din cauza unei probleme de "
+"redistribuire a pilotului binar.\n"
 "\n"
 "Puteți găsi pilotul la adresa http://eciadsl.flashtux.org/"
 
 #: ../lib/network/connection/xdsl.pm:185
 #, c-format
-msgid "Modems using Conexant AccessRunner chipsets cannot be supported due to binary firmware distribution problem."
-msgstr "Modemurile ce folosesc cipurile Conexant AccessRunner nu sînt suportate din cauza unei probleme de distribuție binară a microcodului."
+msgid ""
+"Modems using Conexant AccessRunner chipsets cannot be supported due to "
+"binary firmware distribution problem."
+msgstr ""
+"Modemurile ce folosesc cipurile Conexant AccessRunner nu sînt suportate din "
+"cauza unei probleme de distribuție binară a microcodului."
 
 #: ../lib/network/connection/xdsl.pm:205
 #, c-format
@@ -4550,6 +4838,285 @@ msgstr "Conectează"
 msgid "Hostname changed to \"%s\""
 msgstr "Numele gazdei a fost schimbat în „%s”"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Interfață de rețea"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Selectați interfața de rețea pentru configurare:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"S-a ivit o problemă la repornirea rețelei: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Felicitări, configurarea rețelei este finalizată."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Gestionați conexiunile VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Dispozitiv: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Configurare VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Server DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Domeniu de căutare"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automat"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Inițiată la pornire"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Mod de numerotare"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Viteza conexiunii"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Durata de expirare a conexiunii (în sec)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Numărul de telefon al furnizorului de acces"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Conexiune modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Selectează fișierul"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuweit"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Numărul IRQ al plăcii"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Zona de memorie (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO a plăcii"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 a plăcii"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocol European (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocol pentru restul lumii\n"
+"Fără D-Channel (linii închiriate)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Adresă reală"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Belarus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Adresa pasarelei ar trebui să fie în formatul 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Pasarelă"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Interfață"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Nu este configurată nici o conexiune la Internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Nu aveți configurată nici o conexiune la Internet. Lansați asistentul „%s” "
+"din centrul de control Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Primul server DNS (opțional)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primul server DNS (opțional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Al doilea server DNS (opțional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Primul server DNS (opțional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Configurare conexiune"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Accesul la imprimantă"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Timp de conectare:"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Stare"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Se testează conexiunea..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Parametri IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4741,10 +5308,12 @@ msgstr "Înregistrează mesajele parafocului în jurnalele sistemului"
 #: ../lib/network/drakfirewall.pm:311
 #, 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 ""
-"Puteți fi avertizat cînd cineva accesează serviciile sau cînd un terț încearcă să intre pe calculatorul vostru.\n"
+"Puteți fi avertizat cînd cineva accesează serviciile sau cînd un terț "
+"încearcă să intre pe calculatorul vostru.\n"
 "Selectați serviciile de rețea pe care doriți să le supravegheați."
 
 #: ../lib/network/drakfirewall.pm:316
@@ -4757,11 +5326,6 @@ msgstr "Utilizează parafocul interactiv"
 msgid "No device found"
 msgstr "Nu s-a găsit nici un dispozitiv"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Dispozitiv: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4815,7 +5379,8 @@ msgstr "Nume nou"
 #: ../lib/network/drakvpn.pm:70
 #, c-format
 msgid "You must select an existing connection or enter a new name."
-msgstr "Trebuie să selectați o conexiune existentă sau să introduceți un nume nou."
+msgstr ""
+"Trebuie să selectați o conexiune existentă sau să introduceți un nume nou."
 
 #: ../lib/network/drakvpn.pm:81
 #, c-format
@@ -4837,14 +5402,17 @@ msgstr "Doriți să porniți conexiunea acum?"
 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 ""
 "Conexiunea VPN este acum configurată.\n"
 "\n"
-"Această conexiune VPN poate fi pornită automat odată cu conectarea la rețea.\n"
-"Acest lucru se poate efectua reconfigurînd conectarea la rețea și selecționînd această conexiune VPN.\n"
+"Această conexiune VPN poate fi pornită automat odată cu conectarea la "
+"rețea.\n"
+"Acest lucru se poate efectua reconfigurînd conectarea la rețea și "
+"selecționînd această conexiune VPN.\n"
 
 #: ../lib/network/ifw.pm:132
 #, c-format
@@ -4898,11 +5466,13 @@ msgstr "Un atac „%s” a fost tentat de %s"
 
 #: ../lib/network/ifw.pm:151
 #, c-format
-msgid "The \"%s\" application is trying to make a service (%s) available to the network."
-msgstr "Aplicația „%s” a încercat să pună la dispoziție un serviciu (%s) în rețea."
+msgid ""
+"The \"%s\" application is trying to make a service (%s) available to the "
+"network."
+msgstr ""
+"Aplicația „%s” a încercat să pună la dispoziție un serviciu (%s) în rețea."
 
-#. -PO: this should be kept lowercase since the expression is meant to be used
-#. between brackets
+#. -PO: this should be kept lowercase since the expression is meant to be used between brackets
 #: ../lib/network/ifw.pm:155
 #, c-format
 msgid "port %d"
@@ -4929,7 +5499,8 @@ msgstr "Automat"
 #: ../lib/network/ndiswrapper.pm:30
 #, c-format
 msgid "No device supporting the %s ndiswrapper driver is present!"
-msgstr "Nu este prezent nici un dispozitiv care să suporte pilotul ndiswrapper %s!"
+msgstr ""
+"Nu este prezent nici un dispozitiv care să suporte pilotul ndiswrapper %s!"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
@@ -4938,8 +5509,14 @@ msgstr "Selectați pilotul corect"
 
 #: ../lib/network/ndiswrapper.pm:36
 #, c-format
-msgid "Please select the Windows driver description (.inf) file, or corresponding driver file (.dll or .o files). Note that only drivers up to Windows XP are supported."
-msgstr "Selectați fișierul de descriere a pilotului Windows (.inf), sau fișierul pilot corespunzător (fișiere .dll sau .o). Notați că sînt suportați piloții numai pînă la versiunea de Windows XP."
+msgid ""
+"Please select the Windows driver description (.inf) file, or corresponding "
+"driver file (.dll or .o files). Note that only drivers up to Windows XP are "
+"supported."
+msgstr ""
+"Selectați fișierul de descriere a pilotului Windows (.inf), sau fișierul "
+"pilot corespunzător (fișiere .dll sau .o). Notați că sînt suportați piloții "
+"numai pînă la versiunea de Windows XP."
 
 #: ../lib/network/ndiswrapper.pm:45
 #, c-format
@@ -4985,6 +5562,103 @@ msgstr "Instalează un pilot nou"
 msgid "Select a device:"
 msgstr "Selectați un dispozitiv:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Atac de serviciu"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Parafoc interactiv în mod automat"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Cum doriți să formați această conexiune?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interfață de rețea"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocol"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Adresă IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Atac de serviciu"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Parafoc interactiv"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Conexiune fără-fir"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Cum doriți să formați această conexiune?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5028,20 +5702,6 @@ msgstr "Modem ISDN intern"
 msgid "Protocol for the rest of the world"
 msgstr "Protocol pentru restul lumii"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocol European (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocol pentru restul lumii\n"
-"Fără D-Channel (linii închiriate)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5092,11 +5752,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Control conexiune"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Se testează conexiunea..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5117,11 +5772,6 @@ msgstr "Numărul vostru de telefon personal"
 msgid "Provider name (ex provider.net)"
 msgstr "Numele furnizorului de acces (ex: furnizor.ro)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Numărul de telefon al furnizorului de acces"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5132,41 +5782,6 @@ msgstr "Primul DNS al furnizorului de acces (opțional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Al doilea DNS al furnizorului de acces (opțional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Mod de numerotare"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Viteza conexiunii"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Durata de expirare a conexiunii (în sec)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Numărul IRQ al plăcii"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Zona de memorie (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO a plăcii"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 a plăcii"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5200,13 +5815,15 @@ 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"
-"Dacă aveți o placă ISA, valorile din ecranul următor ar trebui să fie corecte.\n"
+"Dacă aveți o placă ISA, valorile din ecranul următor ar trebui să fie "
+"corecte.\n"
 "\n"
-"Dacă aveți o placă PCMCIA, trebuie să cunoașteți parametrii „IRQ” și „IO” ai plăcii.\n"
+"Dacă aveți o placă PCMCIA, trebuie să cunoașteți parametrii „IRQ” și „IO” ai "
+"plăcii.\n"
 
 #: ../lib/network/netconnect.pm:437
 #, c-format
@@ -5225,8 +5842,14 @@ msgstr "Care din următoarele este placa voastră ISDN?"
 
 #: ../lib/network/netconnect.pm:461
 #, 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 "Un pilot CAPIE este disponibil pentru acest modem. Acest pilot CAPI poate oferi mai multe capabilități decît pilotul liber (precum trimiterea de faxuri). Ce pilot doriți să utilizați?"
+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 ""
+"Un pilot CAPIE este disponibil pentru acest modem. Acest pilot CAPI poate "
+"oferi mai multe capabilități decît pilotul liber (precum trimiterea de "
+"faxuri). Ce pilot doriți să utilizați?"
 
 #: ../lib/network/netconnect.pm:475
 #, c-format
@@ -5326,16 +5949,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nume de domeniu"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primul server DNS (opțional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Al doilea server DNS (opțional)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5397,13 +6010,20 @@ msgstr "S-au ivit probleme în timpul testului de conectare la rețea."
 
 #: ../lib/network/netconnect.pm:771
 #, c-format
-msgid "This can be caused by invalid network configuration, or problems with your modem or router."
-msgstr "Acest lucru poate fi cauzat de o configurație de rețea invalidă, sau de probleme cu modemul sau ruterul."
+msgid ""
+"This can be caused by invalid network configuration, or problems with your "
+"modem or router."
+msgstr ""
+"Acest lucru poate fi cauzat de o configurație de rețea invalidă, sau de "
+"probleme cu modemul sau ruterul."
 
 #: ../lib/network/netconnect.pm:772
 #, c-format
-msgid "You might want to relaunch the configuration to verify the connection settings."
-msgstr "Ar trebui să relansați configurarea să vă verificați parametrii de conexiune."
+msgid ""
+"You might want to relaunch the configuration to verify the connection "
+"settings."
+msgstr ""
+"Ar trebui să relansați configurarea să vă verificați parametrii de conexiune."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
@@ -5412,23 +6032,36 @@ msgstr "Felicitări, configurarea rețelei este finalizată."
 
 #: ../lib/network/netconnect.pm:775
 #, c-format
-msgid "However, the Internet connectivity test failed. You should test your connection manually, and verify your Internet modem or router."
-msgstr "Totuși, testul de conectare la Internet a eșuat. Va trebui să testați conexiunea manual, și verificați modemul sau ruterul de Internet."
+msgid ""
+"However, the Internet connectivity test failed. You should test your "
+"connection manually, and verify your Internet modem or router."
+msgstr ""
+"Totuși, testul de conectare la Internet a eșuat. Va trebui să testați "
+"conexiunea manual, și verificați modemul sau ruterul de Internet."
 
 #: ../lib/network/netconnect.pm:776
 #, c-format
-msgid "If your connection does not work, you might want to relaunch the configuration."
-msgstr "Conexiunea de rețea nu funcționează, poate ar trebui să relansați configurarea."
+msgid ""
+"If your connection does not work, you might want to relaunch the "
+"configuration."
+msgstr ""
+"Conexiunea de rețea nu funcționează, poate ar trebui să relansați "
+"configurarea."
 
 #: ../lib/network/netconnect.pm:778
 #, c-format
 msgid "Congratulations, the network and Internet configuration are finished."
-msgstr "Felicitări, configurarea rețelei și a conexiunii la Internet este finalizată."
+msgstr ""
+"Felicitări, configurarea rețelei și a conexiunii la Internet este finalizată."
 
 #: ../lib/network/netconnect.pm:779
 #, c-format
-msgid "After this is done, we recommend that you restart your X environment to avoid any hostname-related problems."
-msgstr "Odată terminată, se recomandă repornirea interfeței grafice, pentru a evita problemele legate de schimbarea numelui de gazdă."
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+"Odată terminată, se recomandă repornirea interfeței grafice, pentru a evita "
+"problemele legate de schimbarea numelui de gazdă."
 
 #: ../lib/network/netconnect.pm:790
 #, c-format
@@ -5528,12 +6161,14 @@ msgstr "Numele ZeroConf al gazdei nu trebuie să conțină nici un spațiu."
 #: ../lib/network/netconnect.pm:813
 #, 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 ""
 "Pentru că efectuați o instalare prin rețea, rețeaua este deja configurată.\n"
-"Apăsați pe Ok pentru a păstra configurația, sau anulați pentru a reconfigura rețeaua și conexiunea la Internet.\n"
+"Apăsați pe Ok pentru a păstra configurația, sau anulați pentru a reconfigura "
+"rețeaua și conexiunea la Internet.\n"
 
 #: ../lib/network/netconnect.pm:816
 #, c-format
@@ -5575,7 +6210,6 @@ msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
-""
 msgstr ""
 "Ați configurat mai multe modalități de conectare la Internet.\n"
 "Alegeți-o pe cea pe care doriți s-o utilizați.\n"
@@ -5593,8 +6227,12 @@ msgstr "Se configurează placa de rețea %s (pilotul %s)"
 
 #: ../lib/network/netconnect.pm:824
 #, c-format
-msgid "The following protocols can be used to configure a LAN connection. Please choose the one you want to use."
-msgstr "Următoarele protocoale pot fi utilizate pentru a configura o conexiune LAN. Alegeți protocolul pe care doriți să-l utilizați."
+msgid ""
+"The following protocols can be used to configure a LAN connection. Please "
+"choose the one you want to use."
+msgstr ""
+"Următoarele protocoale pot fi utilizate pentru a configura o conexiune LAN. "
+"Alegeți protocolul pe care doriți să-l utilizați."
 
 #: ../lib/network/netconnect.pm:825
 #, c-format
@@ -5619,11 +6257,6 @@ msgstr "În sfîrșit, puteți să introduceți și adresele IP ale serverelor D
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Adresa serverului DNS ar trebui să fie în formatul 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Adresa pasarelei ar trebui să fie în formatul 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5645,8 +6278,12 @@ msgstr "Configurări avansate de rețea"
 
 #: ../lib/network/network.pm:524
 #, c-format
-msgid "Here you can configure advanced network settings. Please note that you have to reboot the machine for changes to take effect."
-msgstr "Aici puteți configura parametri avansați de rețea. Va trebui să reporniți calculatorul pentru a activa modificările."
+msgid ""
+"Here you can configure advanced network settings. Please note that you have "
+"to reboot the machine for changes to take effect."
+msgstr ""
+"Aici puteți configura parametri avansați de rețea. Va trebui să reporniți "
+"calculatorul pentru a activa modificările."
 
 #: ../lib/network/network.pm:526
 #, c-format
@@ -5705,8 +6342,12 @@ msgstr "Configurare proxy"
 
 #: ../lib/network/network.pm:549
 #, c-format
-msgid "Here you can set up your proxies configuration (eg: http://my_caching_server:8080)"
-msgstr "Puteți defini aici configurația serverelor proxy (ex : http://serverul_meu_proxy:8080)"
+msgid ""
+"Here you can set up your proxies configuration (eg: http://"
+"my_caching_server:8080)"
+msgstr ""
+"Puteți defini aici configurația serverelor proxy (ex : http://"
+"serverul_meu_proxy:8080)"
 
 #: ../lib/network/network.pm:550
 #, c-format
@@ -5760,7 +6401,6 @@ msgid ""
 "unselect interfaces which will be connected to local network.\n"
 "\n"
 "Which interfaces should be protected?\n"
-""
 msgstr ""
 "Selectați interfețele care vor fi protejate de parafoc.\n"
 "\n"
@@ -5796,7 +6436,9 @@ msgstr ""
 #: ../lib/network/thirdparty.pm:144
 #, c-format
 msgid "Some components (%s) are required but aren't available for %s hardware."
-msgstr "Cîteva componente (%s) sînt necesare, dar nu sînt disponibile pentru componenta %s."
+msgstr ""
+"Cîteva componente (%s) sînt necesare, dar nu sînt disponibile pentru "
+"componenta %s."
 
 #: ../lib/network/thirdparty.pm:145
 #, c-format
@@ -5807,7 +6449,8 @@ msgstr "Cîteva pachete (%s) sînt necesare dar nu sînt disponibile."
 #. -PO: second argument is a package media name
 #: ../lib/network/thirdparty.pm:150
 #, c-format
-msgid "These packages can be found in %s, or in the official %s package repository."
+msgid ""
+"These packages can be found in %s, or in the official %s package repository."
 msgstr "Aceste pachete se pot fi găsite pe %s, sau pe mediul oficial %s."
 
 #: ../lib/network/thirdparty.pm:152
@@ -5866,8 +6509,12 @@ msgstr "Introduceți discheta"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s with %s in root directory and press %s"
-msgstr "Introduceți o dischetă formatată FAT în unitatea %s cu %s în directorul rădăcină și apăsați %s"
+msgid ""
+"Insert a FAT formatted floppy in drive %s with %s in root directory and "
+"press %s"
+msgstr ""
+"Introduceți o dischetă formatată FAT în unitatea %s cu %s în directorul "
+"rădăcină și apăsați %s"
 
 #: ../lib/network/thirdparty.pm:243
 #, c-format
diff --git a/po/ru.po b/po/ru.po
index 182f992..31cfb00 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-20 22:30+0500\n"
 "Last-Translator: akdengi <kazancas@mandriva.ru>\n"
 "Language-Team: Russian <gnu@mx.ru>\n"
@@ -36,14 +36,16 @@ msgid "Interface"
 msgstr "Интерфейс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-адрес"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
@@ -79,23 +81,27 @@ msgid "Configure Local Area Network..."
 msgstr "Настроить локальную сеть..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Справка"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Применить"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Отмена"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "ОК"
@@ -105,7 +111,8 @@ msgstr "ОК"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -114,7 +121,7 @@ msgstr "ОК"
 msgid "Please wait"
 msgstr "Подождите, пожалуйста"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Подождите, пожалуйста... Применяются настройки"
@@ -150,6 +157,7 @@ msgstr "Адаптер %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Сетевая маска"
@@ -165,6 +173,7 @@ msgid "Started on boot"
 msgstr "Запущен при загрузке"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Клиент DHCP"
@@ -179,17 +188,19 @@ msgstr ""
 "Запустите помощника \"%s\" из Центра Управления Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Настройка нового сетевого интерфейса (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Отсутствует IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Отсутствует Маска"
@@ -260,12 +271,12 @@ msgstr ""
 "\n"
 "Что нужно сделать?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Отключить"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Включить"
@@ -280,8 +291,8 @@ msgstr "Заново настроить"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Выберите сетевой интерфейс, непосредственно подключённый к Интернету."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Сетевое устройство"
@@ -358,7 +369,11 @@ msgstr "Имя внутреннего домена"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -659,13 +674,14 @@ msgstr "Разрешённые адреса"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Интерактивный файервол"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Невозможно связаться с демоном"
@@ -675,12 +691,12 @@ msgstr "Невозможно связаться с демоном"
 msgid "Log"
 msgstr "Журнал"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Блокировать"
@@ -707,12 +723,12 @@ msgstr "Разрешённые службы"
 msgid "Clear logs"
 msgstr "Очистить журнал"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Чёрный список"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Белый список"
@@ -862,7 +878,7 @@ msgstr "Модуль"
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Описание"
@@ -910,9 +926,9 @@ msgstr ""
 "как обычно, и все ваши сетевые настройки с этого момента будут записаны в "
 "этот сетевой профиль."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Внимание"
@@ -2478,12 +2494,12 @@ msgstr ""
 "Предупреждение: было обнаружено другое подключение к Интернету, возможно "
 "использующее вашу сеть"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Подключён"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Не подключён"
@@ -2548,7 +2564,7 @@ msgstr "Включить подсчет трафика"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Метрика"
@@ -2590,19 +2606,22 @@ msgstr "Кабельный модем"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Использовать BPALogin (нужно для Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Аутентификация"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Логин (имя пользователя)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Пароль"
@@ -2730,13 +2749,15 @@ msgstr ""
 "Каждый пункт должен быть указан как IP-адрес в виде\n"
 "десятичных чисел, разделенных точками (например, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Шлюз"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Получать серверы DNS от DHCP"
@@ -2762,21 +2783,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "По умолчанию домен поиска будет взят из полного доменного имени хоста"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Тайм-аут DHCP (в секундах)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Получать серверы YP от DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Получать серверы NTPD от DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Имя хоста DHCP"
@@ -2787,11 +2812,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Не откатываться до Zeroconf (сеть 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-адрес должен быть в формате 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Сетевая маска должна быть в формате 255.255.224.0"
@@ -2814,6 +2841,7 @@ msgstr ""
 "системы."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2841,6 +2869,7 @@ msgstr ""
 "оставите его пустым, будет использовано имя 'localhost.localdomain'"
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "\"Горячая\" коммутация"
@@ -2909,27 +2938,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Аналоговый телефонный модем (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "На базе скрипта"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "На базе терминала"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4088,12 +4122,12 @@ msgstr "Ключ WPA/WPA2"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Драйвер Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4102,80 +4136,83 @@ msgstr ""
 "Ваша карта беспроводной связи отключена. Включите её сначала (переключатель "
 "RF)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Параметры беспроводного соединения"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Режим управления"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Управляемый"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Мастер"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Повторитель"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Вторичный"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Сетевое имя (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Режим шифрования"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Ключ шифрования"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Скрыть пароль"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Принудительно использовать этот ключ в качестве ASCII-строки (например для "
 "Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Логин EAP (имя пользователя)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4187,12 +4224,12 @@ msgstr ""
 "ещё непроверенным синтаксисом\n"
 "  ДОМЕН\\имя_пользователя"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Пароль EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4228,12 +4265,12 @@ msgstr ""
 "него могут игнорироваться указанные здесь имя пользователя\n"
 "и пароль."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Сертификат клиента EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4248,32 +4285,37 @@ msgstr ""
 "Замечание: на странице дополнительной настройки доступны\n"
 "другие параметры."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Сетевой ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Рабочая частота"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Порог чувствительности"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4294,17 +4336,19 @@ msgstr ""
 "посылает RTS, значение равное максимальному размеру пакета отключает схему.\n"
 " Вы также можете установить значение этого параметра в auto, fixed или off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Фрагментация"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Дополнительные аргументы команды iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4320,12 +4364,13 @@ msgstr ""
 "Читайте iwconfig(8) man страницу для получения подробной информации."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Дополнительные аргументы команды iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4345,12 +4390,13 @@ msgstr ""
 "\n"
 "Читайте iwpspy(8) man страницу для получения подробной информации."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Дополнительные аргументы команды iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4381,28 +4427,28 @@ msgstr ""
 "\n"
 "Читайте iwpriv(8) man страницу для получения подробной информации."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Протокол EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Автоопределение"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4412,67 +4458,67 @@ msgstr ""
 "сначала выполняется попытка задействовать WPA версии 2,\n"
 "а затем WPA версии 1."
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Режим EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "Управление ключами EAP"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4482,12 +4528,12 @@ msgstr ""
 "аутентификации.\n"
 "Возможные значения: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Внешний идентификатор EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4499,12 +4545,12 @@ msgstr ""
 "вместе с типами EAP, которые поддерживают различные\n"
 "виды туннелирования, например, TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "Вторая фаза EAP"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4518,12 +4564,12 @@ msgstr ""
 "auth=MSCHAPV2 для PEAP или\n"
 "autheap=MSCHAPV2 autheap=MD5 для TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Центр сертификации EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4539,12 +4585,12 @@ msgstr ""
 "доверенный сертификат всегда нужно настраивать при\n"
 "использовании вместе с TLS or TTLS или PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Соответствие описания сертификата EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4560,12 +4606,12 @@ msgstr ""
 "Строка описания имеет следующий формат:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Дополнительные директивы"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4600,12 +4646,12 @@ msgstr ""
 "значений параметров, отличных от тех, что указываются \n"
 "в графическом инерфейсе."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Требуется ключ шифрования."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4614,7 +4660,7 @@ msgstr ""
 "Ключ должен быть длиной от 8 до 63 ASCII-символов, или 64 шестнадцатиричных "
 "символа."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4623,7 +4669,7 @@ msgstr ""
 "WEP-ключ должен быть диной не более %d ASCII-символов или %d "
 "шестнадцатиричных символов."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4632,7 +4678,7 @@ msgstr ""
 "Freq (частота) должна иметь суффикс k, M или G (например, \"2.46G\" для "
 "частоты 2.46 ГГц), или добавьте нужное количество '0' (нулей)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4641,17 +4687,17 @@ msgstr ""
 "Rate должна иметь суффикс k, M или G (например, \"11M\" для 11M), или "
 "добавьте нужное количество '0' (нулей)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Разрешить роуминг точки доступа"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Установлена связь с беспроводной сетью \"%s\" на интерфейсе %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Потеряна связь с беспроводной сетью на интерфейсе %s"
@@ -4799,6 +4845,285 @@ msgstr "Подключиться"
 msgid "Hostname changed to \"%s\""
 msgstr "Имя хоста изменено на \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Сетевой интерфейс"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Выберите сетевой интерфейс для настройки:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Возникла проблема при перезагрузке сети: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Настройка сети успешно завершена."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Управление VPN-соединениями"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Устройство: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Настройка VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "1-й DNS-сервер"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Домен поиска"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Автоматический"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Запущен при загрузке"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Режим дозвона"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Скорость соединения"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Тайм-аут соединения (в секундах)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Номер телефона провайдера"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Модемное соединение"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Выберите файл"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Кувейт"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Модем"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ карты"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Память карты (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO карты"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 карты"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Европейский протокол (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Протокол для всего остального мира\n"
+"Отсутствует D-канал (выделенные линии)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Модуль"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Реальный адрес"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Беларусь"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Адрес шлюза должен быть в формате 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Шлюз"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Интерфейс"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Подключение к Интернету не настроено"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"У вас ещё нет ни одного настроенного соединения с Интернет.\n"
+"Запустите помощника \"%s\" из Центра Управления Mageia"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Первый сервер DNS (необязательно)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Первый сервер DNS (необязательно)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Второй сервер DNS (необязательно)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Первый сервер DNS (необязательно)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Настройка соединения"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Доступ к принтеру"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Время соединения: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Статус"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Проверяется ваше соединение..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Параметры IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -5005,11 +5330,6 @@ msgstr "Использовать интерактивный файервол"
 msgid "No device found"
 msgstr "Устройства не найдены"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Устройство: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5244,6 +5564,103 @@ msgstr "Установить новый драйвер"
 msgid "Select a device:"
 msgstr "Выбрать устройство:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Атака службы"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Автоматический режим интерактивного файервола"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Как вы желаете подключать данное соединение?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Сетевой интерфейс"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Протокол"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP-адрес: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Атака службы"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Интерактивный файервол"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Беспроводное соединение"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Как вы желаете подключать данное соединение?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5287,20 +5704,6 @@ msgstr "Внутренняя карта ISDN"
 msgid "Protocol for the rest of the world"
 msgstr "Протокол для всего остального мира"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Европейский протокол (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Протокол для всего остального мира\n"
-"Отсутствует D-канал (выделенные линии)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5351,11 +5754,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Управление соединением"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Проверяется ваше соединение..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5376,11 +5774,6 @@ msgstr "Ваш личный телефонный номер"
 msgid "Provider name (ex provider.net)"
 msgstr "Имя провайдера (например, provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Номер телефона провайдера"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5391,41 +5784,6 @@ msgstr "Первый DNS провайдера (опционально)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Второй DNS провайдера (опционально)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Режим дозвона"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Скорость соединения"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Тайм-аут соединения (в секундах)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ карты"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Память карты (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO карты"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 карты"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5592,16 +5950,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Имя домена"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Первый сервер DNS (необязательно)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Второй сервер DNS (необязательно)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5907,11 +6255,6 @@ msgstr "В конце концов вы можете также набрать �
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Адрес DNS-сервера должен быть в формате 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Адрес шлюза должен быть в формате 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/sc.po b/po/sc.po
index bce72b2..13d7a7a 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Interfaci"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Bivimentu IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocollu"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr ""
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ajudu"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Àprica"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Annudda"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -95,7 +101,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Abeta"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Abeta... Àprigu s'assètiu"
@@ -138,6 +145,7 @@ msgstr ""
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -153,6 +161,7 @@ msgid "Started on boot"
 msgstr ""
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Client DHCP"
@@ -165,17 +174,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Assètia un'atra interfaci de arretza (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr ""
@@ -228,12 +239,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Disabiva"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Abiva"
@@ -248,8 +259,8 @@ msgstr "Torra a assetiai"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Trastu de arretza"
@@ -315,7 +326,11 @@ msgstr ""
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -597,13 +612,14 @@ msgstr "Bivimentus permìtius"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interactive Firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "No potzu cuntatai su dimòniu"
@@ -613,12 +629,12 @@ msgstr "No potzu cuntatai su dimòniu"
 msgid "Log"
 msgstr "Arrelatu"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Totu"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -645,12 +661,12 @@ msgstr "Serbìtziu Xinetd"
 msgid "Clear logs"
 msgstr "Lìmpia is arrelatas"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Blacklist"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Whitelist"
@@ -798,7 +814,7 @@ msgstr "Modem"
 msgid "Enabled"
 msgstr "Abiva"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Descriidura"
@@ -840,9 +856,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Atentu"
@@ -2304,12 +2320,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr ""
@@ -2374,7 +2390,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr ""
@@ -2414,19 +2430,22 @@ msgstr "Modellu de sa skeda:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentigadura"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr ""
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr ""
@@ -2546,13 +2565,15 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr ""
@@ -2578,21 +2599,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP timeout (in segundus)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr ""
@@ -2603,11 +2628,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr ""
@@ -2626,6 +2653,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2647,6 +2675,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr ""
@@ -2715,27 +2744,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3894,90 +3928,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Acàpiu wireless"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Crai de cuadura"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Nòmini umperadori"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3985,12 +4022,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4009,12 +4046,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4023,32 +4060,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4062,17 +4104,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4083,12 +4127,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4100,12 +4145,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4123,107 +4169,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protocollu"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Automàtigu"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Modem"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4231,12 +4277,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4245,12 +4291,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4260,12 +4306,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4275,12 +4321,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4298,50 +4344,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4483,6 +4529,280 @@ msgstr "Acàpia"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Interfaci de arretza"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Sçobera s'interfaci de arretza de assetiai:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Manija is acàpius"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Trastu: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Assètiu IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS server 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Automàtigu"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Parti a s'alluidura"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Lestresa de s'acàpiu"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Controllu passada"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Acàpiu a modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Sçobera file"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuwait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocolllu europeu (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Produsidori"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Bivimentu IP:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfaci:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Nisçunu acàpiu a s'Arretza assetiau"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Primu server DNS (ki bolis)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primu server DNS (ki bolis)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Segundu server DNS (ki bolis)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Primu server DNS (ki bolis)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Assètiu Acàpiu"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Intrada in Internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr ""
+"Acàpiu\n"
+"tempus: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Stadu"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Paràmetrus"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4674,11 +4994,6 @@ msgstr "Imprea Interactive Firewall"
 msgid "No device found"
 msgstr "Nisçunu trastu agatau"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Trastu: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4901,6 +5216,103 @@ msgstr ""
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Serbìtzius"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interactive Firewall"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Ita bolis fai cun custu afracadori?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Interfaci de arretza"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protocollu"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Bivimentu IP:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Serbìtzius"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interactive Firewall"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Acàpiu wireless"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Ita bolis fai cun custu afracadori?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4944,18 +5356,6 @@ msgstr ""
 msgid "Protocol for the rest of the world"
 msgstr "Protocollu de totu s'atru mundu"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocolllu europeu (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5004,11 +5404,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr ""
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5029,11 +5424,6 @@ msgstr ""
 msgid "Provider name (ex provider.net)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5044,41 +5434,6 @@ msgstr ""
 msgid "Provider DNS 2 (optional)"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Lestresa de s'acàpiu"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5237,16 +5592,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Nòmini domìniu"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primu server DNS (ki bolis)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Segundu server DNS (ki bolis)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5521,11 +5866,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5985,51 +6325,3 @@ msgstr ""
 
 #~ msgid "Level"
 #~ msgstr "Arrasu"
-
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Serbìtzius"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Ita bolis fai cun custu afracadori?"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Acàpiu wireless"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Ita bolis fai cun custu afracadori?"
-
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfaci:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Manija is acàpius"
-
-#~ msgid "IP configuration"
-#~ msgstr "Assètiu IP"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Parti a s'alluidura"
-
-#~ msgid "Flow control"
-#~ msgstr "Controllu passada"
-
-#~ msgid "Vendor"
-#~ msgstr "Produsidori"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Internet access"
-#~ msgstr "Intrada in Internet"
-
-#~ msgid "Parameters"
-#~ msgstr "Paràmetrus"
diff --git a/po/sk.po b/po/sk.po
index edd9f81..d64e646 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "Rozhranie"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adresa"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfigurácia lokálnej siete..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Pomoc"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Použiť"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Zrušiť"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -96,7 +102,8 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "OK"
 msgid "Please wait"
 msgstr "Prosím čakajte"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Prosím čakajte... Aplikuje sa konfigurácia"
@@ -141,6 +148,7 @@ msgstr "Adaptér %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Maska siete"
@@ -156,6 +164,7 @@ msgid "Started on boot"
 msgstr "Spustené pri štarte"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klient"
@@ -170,17 +179,19 @@ msgstr ""
 "Spustite sprievodcu \"Pridanie rozhrania\" z Mageia kontrolného centra"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Nastaviť nové sieťové rozhranie (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Bez IP adresy"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Žiadna maska"
@@ -249,12 +260,12 @@ msgstr ""
 "\n"
 "Čo chcete urobiť?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Zakázať"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Povoliť"
@@ -269,8 +280,8 @@ msgstr "Rekonfigurácia"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Sieťové zariadenie"
@@ -338,7 +349,11 @@ msgstr "Interné doménové meno"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -630,13 +645,14 @@ msgstr "Povolené adresy"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktívny firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Nebolo možné spojiť sa s démonom"
@@ -646,12 +662,12 @@ msgstr "Nebolo možné spojiť sa s démonom"
 msgid "Log"
 msgstr "Záznam"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Všetko"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -678,12 +694,12 @@ msgstr "Zálohuj používateľské súbory"
 msgid "Clear logs"
 msgstr "Vymazať logy"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Čierna listina"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Whitelist"
@@ -831,7 +847,7 @@ msgstr "Mód"
 msgid "Enabled"
 msgstr "Povoliť"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Popis"
@@ -873,9 +889,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Varovanie"
@@ -2411,12 +2427,12 @@ msgstr ""
 "Varovanie. Bolo rozpoznané iné pripojenie na Internet, možno používa vašu "
 "sieť."
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Pripojený."
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nepripojený"
@@ -2481,7 +2497,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrika"
@@ -2521,19 +2537,22 @@ msgstr "Model karty :"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Použiť BPALogin (potrebné pre Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentifikácia"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Meno účtu (používateľské meno)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Heslo účtu"
@@ -2658,13 +2677,15 @@ msgstr ""
 "Každý záznam by mal byť zadaný ako IP adresa v dekadickom tvare\n"
 "oddelenom bodkami (napr. 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Brána"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Získať adresu servera DNS z DHCP"
@@ -2692,21 +2713,25 @@ msgstr ""
 "hostiteľa"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Timeout pripojenia k DHCP (v sekundách)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Získať adresy YP serverov z DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Získať adresy serverov NTP z DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP meno hostiteľa"
@@ -2717,11 +2742,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresa musí byť vo formáte 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Maska siete musí byť vo formáte 255.255.224.0"
@@ -2740,6 +2767,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Priradí meno hostiteľa z DHCP adresy"
@@ -2761,6 +2789,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Sieťové dynamické pripojenie"
@@ -2829,27 +2858,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Založené na skriptoch"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Založené na terminály"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4008,90 +4042,93 @@ msgstr "WPA zdieľaný kľúč"
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Pripojenie mikrovlnným spojom"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Operačný mód"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Menežované"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Opakovač"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundárny"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automaticky"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Meno siete (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Mód šifrovania"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Kryptovací kľúč"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Heslo"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Meno účtu (používateľské meno)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4099,12 +4136,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Heslo"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4123,12 +4160,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Meno certifikátu"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4137,32 +4174,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID siete"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Použitá frekvencia"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Prah pre senzitivitu"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Rýchlosť (v b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4183,17 +4225,19 @@ msgstr ""
 "maximálnej veľkosti paketu zakazuje schému. Môžete tento parameter nastaviť\n"
 "na automatickú, fixnú hodnotu alebo vypnúť."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentácia"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "extra argumenty pre príkaz lwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4210,12 +4254,13 @@ msgstr ""
 "Prezrite si manuálovú stránku iwconfig(8) pre ďalšie podrobnosti."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "extra argumenty pre príkaz lwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4235,12 +4280,13 @@ msgstr ""
 "\n"
 "Prezrite si manuálovú stránku iwspy(8) pre ďalšie podrobnosti."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "extra argumenty pre príkaz lwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4269,107 +4315,107 @@ msgstr ""
 "\n"
 "Prezrite si manuálovú stránku iwpriv(8) pre ďalšie podrobnosti."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Auto-detekcia"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Mód"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4377,12 +4423,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4391,12 +4437,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Typ certifikátu"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4406,12 +4452,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4421,12 +4467,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4444,26 +4490,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4472,7 +4518,7 @@ msgstr ""
 "Frekvencia má mať príponu k, M alebo G (napríklad \"2.46G\" pre frekvenciu "
 "2.46 GHz) alebo pridajte adekvátny počet '0' (núl)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4481,17 +4527,17 @@ msgstr ""
 "Rýchlosť má mať príponu k, M alebo G (napríklad \"11M\" pre 11M) alebo "
 "pridajte adekvátny počet '0' (núl)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Povoliť roaming prístupových bodov"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4637,6 +4683,287 @@ msgstr "Pripojiť"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Vo vašom systéme nebol nájdený sieťový ethernet adaptér. Prosím spustite "
+"konfiguráciu hardvéru."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Odstrániť sieťové rozhranie"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Výber sieťového rozhrania pre konfiguráciu:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Nastal problém pri odstraňovaní sieťového rozhrania \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Sieťové rozhranie \"%s\" bolo úspešne odstránené"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Menežovanie pripojení"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Zariadenie:"
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Konfigurácia IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS servre"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Prehľadávať domény"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "Žiadna"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statická"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Spustiť pri štarte"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Mód vytáčania"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Rýchlosť pripojenia"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Timeout pripojenia (v sekundách)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telefónne číslo poskytovateľa"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Riadenie toku"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Ukončenie riadku"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "timeout pre modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Použiť lock súbor"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Čakať na oznamovací tón po vytočení čísla"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Čakať ak je obsadené"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "zvuk modemu"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ karty"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "DMA karty"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO karty"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 karty"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Európsky protokol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol pre zvyšok sveta \n"
+" bez D-kanálu (prenajaté linky)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Výrobca"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Skupina"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Meno modulu"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "MAC adresa"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Zbernica"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Pozícia na zbernici"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Adresa brány musí byť vo formáte 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Brána:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Rozhranie:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Konfigurácia pripojenia Internetu"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Nemáte nakonfigurované žiadne pripojenie k Internetu.\n"
+"Spustite sprievodcu \"%s\" z Mageia kontrolného centra"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Meno počítača (nepovinné)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Prvý DNS server (nepovinné)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Druhý DNS server (nepovinné)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Tretí DNS server (nepovinné)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Konfigurácia pripojenia Internetu"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Prístup k Internetu"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Typ pripojenia: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Status:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testovanie pripojenia..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametre"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4843,11 +5170,6 @@ msgstr "Použiť interaktívny firewall"
 msgid "No device found"
 msgstr "Neboli nájdené žiadne zariadenia"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Zariadenie:"
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5072,6 +5394,103 @@ msgstr "Inštalácia nového ovládača"
 msgid "Select a device:"
 msgstr "Vybrať zariadenie:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Útok na službu"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interaktívny firewall: detekovaný prienik"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Čo si želáte spraviť s týmto útočníkom?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Podrobnosti útoku"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Čas útoku: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Sieťové rozhranie: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Typ útoku: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP adresa útočníka: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Útočníkove meno hostiteľa: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Atakovaná služba: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "AtakovanýpPort: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Typ ICMP útoku: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Vždy zaradiť na čiernu listinu (znovu sa už nepýtať)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignorovať"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktívny firewall: detekovaný prienik"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Pripojenie mikrovlnným spojom"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Chcete teraz otestovať konfiguráciu?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Zapamätajte si toto heslo"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5115,20 +5534,6 @@ msgstr "Interná ISDN karta"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol pre zvyšok sveta"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Európsky protokol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol pre zvyšok sveta \n"
-" bez D-kanálu (prenajaté linky)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5177,11 +5582,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testovanie pripojenia..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5202,11 +5602,6 @@ msgstr "Vaše osobné telefónne číslo"
 msgid "Provider name (ex provider.net)"
 msgstr "Meno poskytovateľa (napr. poskytovatel.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telefónne číslo poskytovateľa"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5217,41 +5612,6 @@ msgstr "DNS 1 poskytovateľa (voliteľné)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 poskytovateľa (voliteľné)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Mód vytáčania"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Rýchlosť pripojenia"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Timeout pripojenia (v sekundách)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ karty"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "DMA karty"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO karty"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 karty"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5417,16 +5777,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Meno domény"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Prvý DNS server (nepovinné)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Druhý DNS server (nepovinné)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5737,11 +6087,6 @@ msgstr "V neposlednom rade môžete tiež vyplniť IP adresu vášho DNS servera
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Adresa DNS servera musí byť vo formáte 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Adresa brány musí byť vo formáte 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6188,16 +6533,6 @@ msgstr ""
 #~ "\n"
 #~ "Lokálna sieť bude nastavená práve s týmto adaptérom."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Vo vašom systéme nebol nájdený sieťový ethernet adaptér. Prosím spustite "
-#~ "konfiguráciu hardvéru."
-
-#~ msgid "Connection type: "
-#~ msgstr "Typ pripojenia: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s je v používaní\n"
 
@@ -7187,9 +7522,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "vymazať"
 
-#~ msgid "none"
-#~ msgstr "Žiadna"
-
 #~ msgid "tunnel"
 #~ msgstr "tunel"
 
@@ -7218,178 +7550,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Je potrebné sa odhlásiť a znovu prihlásiť aby sa stali zmeny aktívne"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Útok na službu"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Interaktívny firewall: detekovaný prienik"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Čo si želáte spraviť s týmto útočníkom?"
-
-#~ msgid "Attack details"
-#~ msgstr "Podrobnosti útoku"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Čas útoku: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Sieťové rozhranie: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Typ útoku: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP adresa útočníka: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Útočníkove meno hostiteľa: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Atakovaná služba: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "AtakovanýpPort: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Typ ICMP útoku: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Vždy zaradiť na čiernu listinu (znovu sa už nepýtať)"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorovať"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Interaktívny firewall: detekovaný prienik"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Pripojenie mikrovlnným spojom"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Chcete teraz otestovať konfiguráciu?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Zapamätajte si toto heslo"
-
-#~ msgid "Gateway:"
-#~ msgstr "Brána:"
-
-#~ msgid "Interface:"
-#~ msgstr "Rozhranie:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Menežovanie pripojení"
-
-#~ msgid "IP configuration"
-#~ msgstr "Konfigurácia IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS servre"
-
-#~ msgid "Search Domain"
-#~ msgstr "Prehľadávať domény"
-
-#~ msgid "static"
-#~ msgstr "statická"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Spustiť pri štarte"
-
-#~ msgid "Flow control"
-#~ msgstr "Riadenie toku"
-
-#~ msgid "Line termination"
-#~ msgstr "Ukončenie riadku"
-
-#~ msgid "Modem timeout"
-#~ msgstr "timeout pre modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Použiť lock súbor"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Čakať na oznamovací tón po vytočení čísla"
-
-#~ msgid "Busy wait"
-#~ msgstr "Čakať ak je obsadené"
-
-#~ msgid "Modem sound"
-#~ msgstr "zvuk modemu"
-
-#~ msgid "Vendor"
-#~ msgstr "Výrobca"
-
-#~ msgid "Media class"
-#~ msgstr "Skupina"
-
-#~ msgid "Module name"
-#~ msgstr "Meno modulu"
-
-#~ msgid "Mac Address"
-#~ msgstr "MAC adresa"
-
-#~ msgid "Bus"
-#~ msgstr "Zbernica"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Pozícia na zbernici"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Odstrániť sieťové rozhranie"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nastal problém pri odstraňovaní sieťového rozhrania \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Sieťové rozhranie \"%s\" bolo úspešne odstránené"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Odpojenie..."
 
 #~ msgid "Connect..."
 #~ msgstr "Pripojenie..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Konfigurácia pripojenia Internetu"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Meno počítača (nepovinné)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Tretí DNS server (nepovinné)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Konfigurácia pripojenia Internetu"
-
-#~ msgid "Internet access"
-#~ msgstr "Prístup k Internetu"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametre"
-
 #~ msgid "Attacker"
 #~ msgstr "Útočník"
 
diff --git a/po/sl.po b/po/sl.po
index d1af539..1fcbf5c 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sl\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-21 11:23+0200\n"
 "Last-Translator: Jure Repinc <jlp@holodeck1.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>\n"
@@ -34,14 +34,16 @@ msgid "Interface"
 msgstr "Vmesnik"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Naslov IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -77,23 +79,27 @@ msgid "Configure Local Area Network..."
 msgstr "Nastavitev krajevnega omrežja..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Pomoč"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Uporabi"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Prekliči"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "V redu"
@@ -103,7 +109,8 @@ msgstr "V redu"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -112,7 +119,7 @@ msgstr "V redu"
 msgid "Please wait"
 msgstr "Prosimo, počakajte"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Prosimo, počakajte. Uveljavljanje nastavitev ..."
@@ -148,6 +155,7 @@ msgstr "Vmesnik %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Maska omrežja"
@@ -163,6 +171,7 @@ msgid "Started on boot"
 msgstr "Vključeno ob zagonu"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Odjemalec DHCP"
@@ -177,17 +186,19 @@ msgstr ""
 "Uporabite »%s« iz nadzornega središča Mageia"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Nastavite nov omrežni vmesnik (LAN, ISDN, ADSL ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Ni naslova IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Ni maske omrežja"
@@ -259,12 +270,12 @@ msgstr ""
 "\n"
 "Kaj bi radi naredili?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Onemogoči"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Omogoči"
@@ -279,8 +290,8 @@ msgstr "Ponovno nastavi"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Izberite omrežni vmesnik, ki je na internet povezan neposredno."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Omrežna naprava"
@@ -356,7 +367,11 @@ msgstr "Notranje ime domene"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -657,13 +672,14 @@ msgstr "Dovoljeni naslovi"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktivni požarni zid"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Ni moč vzpostaviti stika z demonom"
@@ -673,12 +689,12 @@ msgstr "Ni moč vzpostaviti stika z demonom"
 msgid "Log"
 msgstr "Dnevnik"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Dovoli"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blokiraj"
@@ -705,12 +721,12 @@ msgstr "Blokirane storitve"
 msgid "Clear logs"
 msgstr "Počisti dnevnike"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Črni seznam"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Beli seznam"
@@ -860,7 +876,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Omogočeno"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Opis"
@@ -907,9 +923,9 @@ msgstr ""
 "Sedaj uporabljate omrežni profil %s. Sistem lahko nastavljate kot običajno, "
 "vse omrežne nastavitve pa bodo odslej shranjene v ta profil."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Opozorilo"
@@ -2457,12 +2473,12 @@ msgstr ""
 "Opozorilo, še ena internetna povezava je bila zaznana, morda uporablja vaše "
 "omrežje"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Povezano"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Brez povezave"
@@ -2527,7 +2543,7 @@ msgstr "Omogoči spremljanje prometa"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrika"
@@ -2568,19 +2584,22 @@ msgstr "Kabelski modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Uporabi prijavo BPALogin (za Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Overjanje"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Uporabniško ime za prijavo"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Geslo"
@@ -2707,13 +2726,15 @@ msgstr ""
 "Vsako postavko vnesite kot naslov IP v obliki decimalnih števil, ločenih s "
 "piko (n.pr.: 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Privzeti prehod"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Pridobi strežnike DNS prek DHCP"
@@ -2739,21 +2760,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "Domena za iskanje se privzeto oblikuje iz gostiteljskega imena."
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Premor pred povezavo z DHCP (v sekundah)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Pridobi strežnike YP prek DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Pridobi strežnike NTPD prek DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Ime gostitelja (DHCP)"
@@ -2764,11 +2789,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Ne vzpostavljaj ponovne povezave z Zeroconf (omrežje 169.254.0.0)."
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Naslov IP mora imeti obliko 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Mrežna maska bi morala biti v obliki 255.255.255.0"
@@ -2791,6 +2818,7 @@ msgstr ""
 "zagonu."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Ime gostitelja pridobi s strežnika DHCP (ali ustvari edinstvenega)"
@@ -2817,6 +2845,7 @@ msgstr ""
 "povezavami. Če pustite prazno, bo uporabljeno ime »localhost.localdomain«."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Samodejna vključitev omrežja (hotplugging)"
@@ -2886,27 +2915,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analogni telefonski modem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Temelječ na skripti"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Temelječ na terminalu"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4065,12 +4099,12 @@ msgstr "WPA/WPA2, v naprej deljen ključ"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2, podjetje"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Gonilnik za Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4079,78 +4113,81 @@ msgstr ""
 "Brezžična omrežna kartica je izključena. Najprej jo vključite (RF kill "
 "switch)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Nastavitve brezžične povezave"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Način delovanja"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Upravljano"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Glavno"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Ponavljalnik"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundarno"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Samodejno"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Omrežno ime (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Način šifriranja"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Šifrirni ključ"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Skrij geslo"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Vsili uporabo tega ključa kot niza ASCII (npr. za Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Uporabniško ime EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4161,12 +4198,12 @@ msgstr ""
 "Če je potrebno določiti domeno poskusite z obliko:\n"
 "  DOMENA\\uporabniško_ime"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Geslo EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4200,12 +4237,12 @@ msgstr ""
 "  Način TLS v celoti temelji na potrdilih in možno je,\n"
 "da bosta uporabniško ime in geslo spregledana."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Potrdilo odjemalca EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4218,32 +4255,37 @@ msgstr ""
 "kot alternativo uporabi uporabniškega imena in gesla.\n"
 " Opomba: ostale nastavitve so na zavihku Napredno."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Omrežna identiteta"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frekvenca delovanja"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Prag zaznave"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitna hitrost  (v b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4264,17 +4306,19 @@ msgstr ""
 "Lahko izbirate tudi med nastavitvami samodejno, \n"
 " omejeno in izključeno."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Drobitev (fragmentacija)"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Posebni argumenti ukaza iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4289,12 +4333,13 @@ msgstr ""
 "Za nadaljnje informacije si oglejte stran priročnika man iwconfig(8)."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Posebni argumenti ukaza iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4313,12 +4358,13 @@ msgstr ""
 "\n"
 "Za nadaljnje informacije si oglejte »man iwspy«."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Posebni argumenti ukaza iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4348,28 +4394,28 @@ msgstr ""
 "\n"
 "Več o tem v priročniku za iwpriv (man impriv)."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Protokol EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Samodejna zaznava"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4378,67 +4424,67 @@ msgstr ""
 "Priporočena je samodejna zaznava, ki najprej poskusi z\n"
 "WPA različice 2 in nato z WPA različice 1."
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Način EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS (Transport Layer Security protocol)"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP upravljanje s ključi"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4447,12 +4493,12 @@ msgstr ""
 "Seznam sprejemljivih protokolov za upravljanje s ključi.\n"
 "Možne vrednosti so: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP zunanja identiteta"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4463,12 +4509,12 @@ msgstr ""
 "nešifrirana identiteta z vrstami EAP, ki podpirajo različne\n"
 "tunelirane identitete. Npr. TTLS."
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP faza 2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4481,12 +4527,12 @@ msgstr ""
 "auth=MSCHAPV2 za PEAP ali\n"
 "autheap=MSCHAPV2 autheap=MD5 za TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP potrdilo CA"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4501,12 +4547,12 @@ msgstr ""
 "možno, naj bo pri uporabi  TLS, TTLS ali PEAP nastavljeno\n"
 "potrdilo CA, ki mu gre zaupati."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Ujemanje s temo potrdila EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4521,12 +4567,12 @@ msgstr ""
 "oblike:\n"
 "/C=US/ST=CA/L=Ljubljana/CN=Test/emailAddress=kot@primer.si"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Dodatne direktive"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4555,12 +4601,12 @@ msgstr ""
 "\tPreostale, kot sta key_mgmt in eap, lahko uporabite za\n"
 "\tvsilitev posebnih nastavitev, neodvisno od grafičnega vmesnika."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Potrebujete šifrirni ključ."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4569,7 +4615,7 @@ msgstr ""
 "Ta v naprej deljeni ključ naj bi imel od 8 do 63 znakov ASCII, ali pa 64 "
 "šestnajstiških znakov."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4578,7 +4624,7 @@ msgstr ""
 "Ključ WEP naj bi imel največ %d znakov ASCII, ali pa največ %d "
 "šestnajstiških znakov."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4586,24 +4632,24 @@ msgid ""
 msgstr ""
 "Frekvenca mora imeti predpono k, M ali G oziroma zadostno število ničel."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "Hitrost mora imeti predpono k, M ali G oziroma zadostno število ničel."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Dovoli menjavanje dostopnih točk"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Povezan z brezžičnim omrežjem  \"%s\" na vmesniku  %s."
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Povezava z brezžičnim omrežjem na vmesniku %s je izgubljena."
@@ -4750,6 +4796,287 @@ msgstr "Poveži"
 msgid "Hostname changed to \"%s\""
 msgstr "Sprememba gostiteljskega imena v:\"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Na vašem sistemu ni mogoče zaznati nobene omrežne naprave. Zaženite orodje "
+"za nastavljanje strojne opreme."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Omrežni vmesnik"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Izberite kartico, ki jo želite nastaviti"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Med ponovnim zagonom omrežja se je pojavila težava: \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Čestitamo, uspešno ste zaključili nastavitev omrežja."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Upravljanje povezav VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Naprava: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Nastavitev VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Prvi DNS strežnik"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Domena za iskanje"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "nič"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Samodejno"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Vključeno ob zagonu"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Klicni način"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Hitrost povezave"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Premor pred povezavo (v sekundah)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Telefonska številka ponudnika"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modemska"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Izberite datoteko"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuvajt"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ kartice"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Spomin kartice (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "IO kartice"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "IO_0 kartice"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Evropski protokol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol za preostali svet\n"
+"Brez D-kanala (najetih linij)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modul"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Pravi naslov"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "uporabi"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Naslov privzetega prehoda mora imeti obliko 1.2.3.4."
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Privzeti prehod"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Vmesnik"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Nobena internetna povezava ni nastavljena"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Nobena internetna povezava ni nastavljena.\n"
+"Zaženite »%s« v Mageia nadzornem središču"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Prvi DNS strežnik (neobvezno)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Prvi DNS strežnik (neobvezno)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Drugi DNS strežnik (neobvezno)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Prvi DNS strežnik (neobvezno)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Nastavitve povezave"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Dostop do tiskalnika"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Vrsta povezave: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Stanje"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Preverjanje povezave...."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Nastavitve IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4956,11 +5283,6 @@ msgstr "Omogoči interaktivni požarni zid"
 msgid "No device found"
 msgstr "Ne najdem nobene naprave"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Naprava: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5193,6 +5515,103 @@ msgstr "Namesti nov gonilnik"
 msgid "Select a device:"
 msgstr "Izberite napravo:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr "Obdelaj napad"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interaktivni požarni zid: zaznan vdor"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Kaj želite storiti s tem napadalcem?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Podrobnosti o napadu"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Čas napada: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Omrežni vmesnik: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Vrsta napada: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Napadalčev naslov IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Ime gostitelja napadalca: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Napadena storitev: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Napadena vrata: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Vrsta napada ICMP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Vedno uvrsti na črno listo (ne vprašaj ponovno)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Zanemari"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktivni požarni zid: nova storitev"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, c-format
+msgid "Process connection"
+msgstr "Obdelaj povezavo"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Želite omogočiti storitev?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Zapomni si ta odgovor"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5236,20 +5655,6 @@ msgstr "Notranja ISDN kartica"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol za preostali svet"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Evropski protokol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol za preostali svet\n"
-"Brez D-kanala (najetih linij)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5300,11 +5705,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Nadzor povezave"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Preverjanje povezave...."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5325,11 +5725,6 @@ msgstr "Vaša telefonska številka"
 msgid "Provider name (ex provider.net)"
 msgstr "Ime ponudnika interneta"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Telefonska številka ponudnika"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5340,41 +5735,6 @@ msgstr "DNS 1 ponudnika (neobvezno)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 ponudnika (neobvezno)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Klicni način"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Hitrost povezave"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Premor pred povezavo (v sekundah)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ kartice"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Spomin kartice (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "IO kartice"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "IO_0 kartice"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5541,16 +5901,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Ime domene"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Prvi DNS strežnik (neobvezno)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Drugi DNS strežnik (neobvezno)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5854,11 +6204,6 @@ msgstr "Vnesete lahko tudi naslov IP strežnika DNS."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Naslov DNS strežnika mora imeti obliko 1.2.3.4."
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Naslov privzetega prehoda mora imeti obliko 1.2.3.4."
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6336,16 +6681,6 @@ msgstr "Uporabi določena vrata UDP"
 #~ "\n"
 #~ "Nameravam nastaviti vaše krajevno omrežje z uporabo tega vmesnika."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Na vašem sistemu ni mogoče zaznati nobene omrežne naprave. Zaženite "
-#~ "orodje za nastavljanje strojne opreme."
-
-#~ msgid "Connection type: "
-#~ msgstr "Vrsta povezave: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s je že uporabljen\n"
 
@@ -7335,9 +7670,6 @@ msgstr "Uporabi določena vrata UDP"
 #~ msgid "discard"
 #~ msgstr "Opusti"
 
-#~ msgid "none"
-#~ msgstr "nič"
-
 #~ msgid "tunnel"
 #~ msgstr "tunel"
 
@@ -7356,71 +7688,11 @@ msgstr "Uporabi določena vrata UDP"
 #~ msgid "default"
 #~ msgstr "privzeto"
 
-#~ msgid "use"
-#~ msgstr "uporabi"
-
 #~ msgid "unique"
 #~ msgstr "enkraten"
 
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "Za uveljavitev sprememb se morate odjaviti in ponovno prijaviti."
 
-#~ msgid "Process attack"
-#~ msgstr "Obdelaj napad"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Interaktivni požarni zid: zaznan vdor"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Kaj želite storiti s tem napadalcem?"
-
-#~ msgid "Attack details"
-#~ msgstr "Podrobnosti o napadu"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Čas napada: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Omrežni vmesnik: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Vrsta napada: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Napadalčev naslov IP: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Ime gostitelja napadalca: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Napadena storitev: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Napadena vrata: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Vrsta napada ICMP: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Vedno uvrsti na črno listo (ne vprašaj ponovno)"
-
-#~ msgid "Ignore"
-#~ msgstr "Zanemari"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Interaktivni požarni zid: nova storitev"
-
-#~ msgid "Process connection"
-#~ msgstr "Obdelaj povezavo"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Želite omogočiti storitev?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Zapomni si ta odgovor"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Uporabi zaščito podatkov Cisco-UDP"
diff --git a/po/sq.po b/po/sq.po
index 146dfbb..1b0a276 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Interfaci"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Adresa IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoli"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfiguroni Rrjetin Lokal..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ndihmë"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Aplikoje"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Anulo"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -95,7 +101,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Një moment ju lutemi"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Një moment ju lutemi... Përshtatja e konfigurimit"
@@ -140,6 +147,7 @@ msgstr "Përshtate %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Maskë ndër rrjet"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "Nise në Nisje të Udhëzuar"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Klienti DHCP"
@@ -169,17 +178,19 @@ msgstr ""
 "Nise asistentin konfigurues në dritaren kryesore"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Zgjedheni kartelën e rrjetit"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Asnjë IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Asnjë Maskë"
@@ -250,12 +261,12 @@ msgstr ""
 "\n"
 "Çfarë dëshironi të bëni?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Ç'aktivo"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Aktivo"
@@ -270,8 +281,8 @@ msgstr "Rikonfiguro"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Mjeti Net"
@@ -339,7 +350,11 @@ msgstr "Emri i pronës së mbredshme"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -636,13 +651,14 @@ msgstr "Autorizoi të gjithë përdoruesit"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Mur i Zjarrt"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Nuk mundur të kontaktohet pasqyrja %s"
@@ -652,12 +668,12 @@ msgstr "Nuk mundur të kontaktohet pasqyrja %s"
 msgid "Log"
 msgstr "Log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Gjitha"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -684,12 +700,12 @@ msgstr "Regjistrimi i skedareve për përdorues"
 msgid "Clear logs"
 msgstr "Zhduki të gjitha ndarjet"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -837,7 +853,7 @@ msgstr "Modaliteti"
 msgid "Enabled"
 msgstr "Aktivo"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Përshkrimi"
@@ -879,9 +895,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Kujdes"
@@ -2345,12 +2361,12 @@ msgstr ""
 "KujDES, një lidhje tjetër internet është zbuluar, ndoshta përdorimi i "
 "rrjetit tuaj"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Lidhur"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nuk është lidhur"
@@ -2415,7 +2431,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrik"
@@ -2455,19 +2471,22 @@ msgstr "Model i kartelës:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Vërtetësimi"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Emri i përdoruesit të kontos"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Parulla a kontos"
@@ -2592,13 +2611,15 @@ msgstr ""
 "Secila zonë duhet të jetë e kompletuar me një adresë IP në shënim\n"
 "decimal shenjues (për shembull: 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Portë hyrëse"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Adresa IP për Serverin DNS"
@@ -2624,21 +2645,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Koha maksimale për tu lidhur (në sekonda)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Emri i ftuesit DHCP"
@@ -2649,11 +2674,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Adresa IP duhet të jetë në formën 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Adresa e Portës hyrëse Gateway duhe të jetë sikur 1.2.3.4"
@@ -2672,6 +2699,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Ju lutemi futne emrin nga adresa DHCP."
@@ -2693,6 +2721,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Rrjet (Network) i Prizuar"
@@ -2761,27 +2790,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Bazuar me një skript"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Doracak nga terminali"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, fuzzy, c-format
 msgid "PAP/CHAP"
 msgstr "CHAP"
@@ -3940,90 +3974,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Lidhje wireless"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Modë Ekspert"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Zgjedheni gjuhën tuaj"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Përsëritës"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Dytësor"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatike"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Çelës kriptues"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Parulla"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Emri i përdoruesit të kontos"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4031,12 +4068,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Parulla"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4055,12 +4092,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4069,32 +4106,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Rrjeti"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4108,17 +4150,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Stacion Lojërash"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4129,12 +4173,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4146,12 +4191,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4169,107 +4215,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokoli"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Auto-zbulues"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Modaliteti"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "TLS"
 msgstr "LSB"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4277,12 +4323,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4291,12 +4337,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4306,12 +4352,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4321,12 +4367,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4344,26 +4390,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4372,7 +4418,7 @@ msgstr ""
 "Frekuenca duhet të ketë shtesën k, M apo G (për shembull, \"2.46G\" për 2.46 "
 "GHz frekuencë), apo shtoje plotësuesin '0' (zero)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4381,17 +4427,17 @@ msgstr ""
 "Rrahja duhet të ketë shtesën k, M apo G (për shembull, \"11M\" për 11M), apo "
 "shtoje plotësuesin '0' (zero)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4533,6 +4579,289 @@ msgstr "Lidhe..."
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Asnjë përshtatës i rrjetit ethernet s'është zbuluar në sistemin tuaj. Ju "
+"lutemi niseni mjetin me veglën konfiguruese."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Zgjedheni kartelën e rrjetit"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Zgjedheni kartelën e rrjetit"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Një problem është paraqituar gjatë nisjes së rrjetit (network): \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"Urime, konfigurimi i rrjetit dhe i internetit mori fund.\n"
+"\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Lidhja kabëll"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Periferik: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Konfigurimi CUPS"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Server DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Pronë NIS"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "asnjë"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Shpërndarja automatike e adresës IP"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Nise në nisje të sistemit"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Modë Numërimi"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Shpejtësia e lidhjes"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Koha maksimale për tu lidhur (në sekonda)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Numri i telefonit të furnizuesit"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Stacion Interneti"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Kohë zgjatja e Shell"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Zgjedhe një skedare"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuvajti"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modemi"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kartela IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kartela e memorisë (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kartela IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kartela IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protokol evrope (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol për pjesën tjetër të botës\n"
+"Pa D-Kanal (vija të huazuara)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Shitës"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Klasë e medias"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Emri i Modulit"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Adresa Transmetuese:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Pozita në bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Adresa e Portës hyrëse Gateway duhe të jetë sikur 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Portë hyrëse:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfaci:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Konfigurimi i lidhjes internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Ky interfac nuk është i konfiguruar ende.\n"
+"Nise asistentin konfigurues në dritaren kryesore"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Konfigurimi i emrit ftues"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Server DNS Kryesor (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Server DNS i Dyti (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Server DNS Kryesor (opcional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Konfigurimi i Lidhjes Internet"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Hyrjet në internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tip lidhës:"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Statuti:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testimi i lidhjes suaj..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametrat"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4734,11 +5063,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Asnjë mjet i gjetur"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Periferik: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4961,6 +5285,103 @@ msgstr "Instalim sistemin"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Lloji i shërbimi_t:"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Zbulimi i Konfigurimi të Murit të Zjarrtë"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Dëshironi ta mbyllni lojën?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Asnjë detaj"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Veprimi:%s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Interfac rrjeti: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "tipi: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokoli: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Adresa statike IP"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Gabim gjatë marrjes së emrit të host: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Lloji i shërbimi_t:"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Porta: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Porta: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Injoroje"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Zbulimi i Konfigurimi të Murit të Zjarrtë"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Lidhje wireless"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "A dëshironi ta testoni konfigurimin?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Kujtoje këtë parullë"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5004,20 +5425,6 @@ msgstr "Modemi i mbrendshëm ISDN"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol për pjesën tjetër të botës"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protokol evrope (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol për pjesën tjetër të botës\n"
-"Pa D-Kanal (vija të huazuara)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5066,11 +5473,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testimi i lidhjes suaj..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5091,11 +5493,6 @@ msgstr "Numri i juaj personal i telefonit"
 msgid "Provider name (ex provider.net)"
 msgstr "Emri i furnizuesit (p.sh. provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Numri i telefonit të furnizuesit"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5106,41 +5503,6 @@ msgstr "DNS i parë furnizues (opcional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS i dytë furnizues (opcional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Modë Numërimi"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Shpejtësia e lidhjes"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Koha maksimale për tu lidhur (në sekonda)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kartela IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kartela e memorisë (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kartela IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kartela IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5305,16 +5667,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Emri i pronës"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Server DNS Kryesor (opcional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Server DNS i Dyti (opcional)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5620,11 +5972,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Adresa i portës hyrëse DNS duhet të jetë sikur 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Adresa e Portës hyrëse Gateway duhe të jetë sikur 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6063,16 +6410,6 @@ msgstr ""
 #~ "Do ta konfiguroj kartelën tuaj të Zonës së Rrjetit Lokal me këtë "
 #~ "përshtatës."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Asnjë përshtatës i rrjetit ethernet s'është zbuluar në sistemin tuaj. Ju "
-#~ "lutemi niseni mjetin me veglën konfiguruese."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tip lidhës:"
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s është në përdorim e sipër\n"
 
@@ -6099,9 +6436,6 @@ msgstr ""
 #~ msgid "Command"
 #~ msgstr "Urdhër"
 
-#~ msgid "none"
-#~ msgstr "asnjë"
-
 #~ msgid "Level"
 #~ msgstr "Niveli"
 
@@ -6110,189 +6444,12 @@ msgstr ""
 #~ "Ju duhet të lidheni jashtë tij dhe të hyni prapë për ndryshimet bëra më "
 #~ "parë"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Lloji i shërbimi_t:"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Zbulimi i Konfigurimi të Murit të Zjarrtë"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Dëshironi ta mbyllni lojën?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Asnjë detaj"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Veprimi:%s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Interfac rrjeti: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "tipi: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokoli: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Adresa statike IP"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Gabim gjatë marrjes së emrit të host: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Lloji i shërbimi_t:"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Porta: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Injoroje"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Zbulimi i Konfigurimi të Murit të Zjarrtë"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Lidhje wireless"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "A dëshironi ta testoni konfigurimin?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Kujtoje këtë parullë"
-
-#~ msgid "Gateway:"
-#~ msgstr "Portë hyrëse:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfaci:"
-
-#, fuzzy
-#~ msgid "Manage connections"
-#~ msgstr "Lidhja kabëll"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "Konfigurimi CUPS"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "Server DNS"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "Pronë NIS"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "Shpërndarja automatike e adresës IP"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Nise në nisje të sistemit"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>S"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Stacion Interneti"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Kohë zgjatja e Shell"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Zgjedhe një skedare"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Kuvajti"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Modemi"
-
-#~ msgid "Vendor"
-#~ msgstr "Shitës"
-
-#~ msgid "Media class"
-#~ msgstr "Klasë e medias"
-
-#~ msgid "Module name"
-#~ msgstr "Emri i Modulit"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "Adresa Transmetuese:"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Pozita në bus"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Zgjedheni kartelën e rrjetit"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Një problem është paraqituar gjatë nisjes së rrjetit (network): \n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Shkëpute..."
 
 #~ msgid "Connect..."
 #~ msgstr "Lidhe..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Konfigurimi i lidhjes internet"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Konfigurimi i emrit ftues"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Server DNS Kryesor (opcional)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Konfigurimi i Lidhjes Internet"
-
-#~ msgid "Internet access"
-#~ msgstr "Hyrjet në internet"
-
-#~ msgid "Status:"
-#~ msgstr "Statuti:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametrat"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Asnjë detaj"
diff --git a/po/sr.po b/po/sr.po
index 0e58076..1a950ef 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "Интерфејс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP адреса"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "Подеси локални мрежу..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Помоћ"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Промени"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Поништи"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "У реду"
@@ -96,7 +102,8 @@ msgstr "У реду"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "У реду"
 msgid "Please wait"
 msgstr "Само моменат..."
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Само моменат... примена конфигурације"
@@ -141,6 +148,7 @@ msgstr "Адаптер %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Мрежна маска"
@@ -156,6 +164,7 @@ msgid "Started on boot"
 msgstr "Покренуто при стартању"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP клијент"
@@ -170,17 +179,19 @@ msgstr ""
 "Покрените конфигурационог чаробњака у главном прозору"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Изаберите мрежни интерфејс"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Лош пакет"
@@ -249,12 +260,12 @@ msgstr ""
 "\n"
 "шта желите да урадите?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Искључи"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Омогући"
@@ -269,8 +280,8 @@ msgstr "Промени поставке"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Xinetd Сервис"
@@ -336,7 +347,11 @@ msgstr "Интерно име домена"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -628,13 +643,14 @@ msgstr "Дозволи све кориснике"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Заштитни зид (Firewall)"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Не могу да контактирам мирор %s"
@@ -644,12 +660,12 @@ msgstr "Не могу да контактирам мирор %s"
 msgid "Log"
 msgstr "Дневник"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Све"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -676,12 +692,12 @@ msgstr "Backup-уј корисничке фајлове"
 msgid "Clear logs"
 msgstr "Очисти све"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -829,7 +845,7 @@ msgstr "Начин рада"
 msgid "Enabled"
 msgstr "Омогући"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Опис"
@@ -871,9 +887,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Упозорење"
@@ -2337,12 +2353,12 @@ msgstr ""
 "Упозорење, детектована је још једна Интернет конекција, можда користи вашу "
 "мрежу"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Конектован"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Није конектован"
@@ -2407,7 +2423,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Мере"
@@ -2447,19 +2463,22 @@ msgstr "Модел картице :"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Аутентификација"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Логовање за рачун (корисничко име)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Лозинка за рачун"
@@ -2584,13 +2603,15 @@ msgstr ""
 "Свака ставка треба де буде tavka треба да буде унета као\n"
 "IP адреса (на пример, 123.45.67.89)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS сервер IP"
@@ -2616,21 +2637,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Време паузе конекције (у сек.)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP име хоста"
@@ -2641,11 +2666,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP адреса треба да буде у формату 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Gateway адреса треба да буде у формату 1.2.3.4"
@@ -2664,6 +2691,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Доделите име хоста за DHCP адресу"
@@ -2685,6 +2713,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Директно прикључивање на мрежу"
@@ -2753,27 +2782,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Базирано на скрипти"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Базирано на терминалу"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3932,90 +3966,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Кабловска конекција"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Експерт мод"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Уређен"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Главно"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Рипитер"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Секундарни"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Аутоматски"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Кључ за енкрипцију"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Лозинка"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Логовање за рачун (корисничко име)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4023,12 +4060,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Лозинка"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4047,12 +4084,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4061,32 +4098,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Мрежа"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4100,17 +4142,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Станица за игру"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4121,12 +4165,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4138,12 +4183,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4161,107 +4207,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Протокол"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Ауто-детекција"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Начин рада"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4269,12 +4315,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4283,12 +4329,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4298,12 +4344,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4313,12 +4359,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4336,26 +4382,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4364,7 +4410,7 @@ msgstr ""
 "Фреквенција треба да има предзнак k, M или G (на пример, \"2.46G\" за 2.46 "
 "GHz фреквенцију), или додајте довољно '0'(нула)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4373,17 +4419,17 @@ msgstr ""
 "Распон треба да има предзнак k, M или G (на пример, \"11M\" за 11M), или "
 "додајте довољно '0' (нула)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4525,6 +4571,289 @@ msgstr "Повежи се"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Није детектована ниједна мрежна картица. Покрените алат за конфигурисање "
+"хардвера."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Изаберите мрежни интерфејс"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Изаберите мрежни интерфејс"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Појавио се проблем током рестартовања мреже?\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"честитамо, мрежна и интернет конфигурација је завршена.\n"
+"\n"
+"Конфигурација се сада може применити на систем.\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Управљање конекцијама"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Уређај: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS конфигурација"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS сервер"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Домен за претрагу"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ниједан"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "статички"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Покрени при стартању"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Мод за бирање"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Брзина конекције "
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Време паузе конекције (у сек.)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Број телефона провајдера"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Интернет станица"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Пауза при стартању кернела"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Изаберите датотеку"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Кувајт"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Модем"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ картице"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "(DMA) картице"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr " IO картице"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr " IO_0 картице"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Европски протокол (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Протокол за Остатак света \n"
+" без Д-канала (закупљене линије)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Произвођач"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Класа Медија"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Име модула"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Broadcast Адреса:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Бус"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Локација на бусу"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway адреса треба да буде у формату 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Интерфејс:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Конфигурација Интернет конекција"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Овај интерфејс још увек није подешен.\n"
+"Покрените конфигурационог чаробњака у главном прозору"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Конфигурација система"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Први DNS Сервер (опција)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Други DNS Сервер (опција)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Први DNS Сервер (опција)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Конфигурација Интернет Конекција"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Интернет приступ"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Тип конекције: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Статус:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Тестирање конекције..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Параметри"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4726,11 +5055,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Нисам нашао уређај"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Уређај: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4953,6 +5277,103 @@ msgstr "Инсталирај систем"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "\tИме сервера: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Детектована Firewalling конфигурација"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Желите ли да завршите игру?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Без детаља"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Акција: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Мрежни интерфејси"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Врста приступа: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Протоколи"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP адреса:\t%s\n"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Подешавам hostname %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "\tИме сервера: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Zанемари"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Детектована Firewalling конфигурација"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Кабловска конекција"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Да ли хоћете да тестирате конфигурацију?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Запамти ову лозинку"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4996,20 +5417,6 @@ msgstr "Интерна  ISDN картица"
 msgid "Protocol for the rest of the world"
 msgstr "Протокол за статак света"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Европски протокол (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Протокол за Остатак света \n"
-" без Д-канала (закупљене линије)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5058,11 +5465,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Тестирање конекције..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5083,11 +5485,6 @@ msgstr "Ваш лични број телефона"
 msgid "Provider name (ex provider.net)"
 msgstr "Име провајдера (нпр. provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Број телефона провајдера"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5098,41 +5495,6 @@ msgstr "Провајдеров dns 1 (опционо)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Провајдеров dns 2 (опционо)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Мод за бирање"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Брзина конекције "
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Време паузе конекције (у сек.)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ картице"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "(DMA) картице"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr " IO картице"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr " IO_0 картице"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5296,16 +5658,6 @@ msgstr "ДНС"
 msgid "Domain name"
 msgstr "Име домена"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Први DNS Сервер (опција)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Други DNS Сервер (опција)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5613,11 +5965,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS адреса треба да буде у формату 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway адреса треба да буде у формату 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6054,16 +6401,6 @@ msgstr ""
 #~ "\n"
 #~ "Сада подеавам вашу локалну мрежу са овим адаптером."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Није детектована ниједна мрежна картица. Покрените алат за конфигурисање "
-#~ "хардвера."
-
-#~ msgid "Connection type: "
-#~ msgstr "Тип конекције: "
-
 #~ msgid "Edit"
 #~ msgstr "Измени"
 
@@ -6090,193 +6427,15 @@ msgstr ""
 #~ msgid "Flag"
 #~ msgstr "Застава"
 
-#~ msgid "none"
-#~ msgstr "ниједан"
-
 #~ msgid "Level"
 #~ msgstr "Ниво"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "\tИме сервера: %s\n"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Детектована Firewalling конфигурација"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Желите ли да завршите игру?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Без детаља"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Акција: %s"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Мрежни интерфејси"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Врста приступа: %s\n"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Протоколи"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP адреса:\t%s\n"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Подешавам hostname %s: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "\tИме сервера: %s\n"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Порт: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Zанемари"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Детектована Firewalling конфигурација"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Кабловска конекција"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Да ли хоћете да тестирате конфигурацију?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Запамти ову лозинку"
-
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Интерфејс:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Управљање конекцијама"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS конфигурација"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS сервер"
-
-#~ msgid "Search Domain"
-#~ msgstr "Домен за претрагу"
-
-#~ msgid "static"
-#~ msgstr "статички"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Покрени при стартању"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>S"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Интернет станица"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Пауза при стартању кернела"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "Изаберите датотеку"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Кувајт"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Модем"
-
-#~ msgid "Vendor"
-#~ msgstr "Произвођач"
-
-#~ msgid "Media class"
-#~ msgstr "Класа Медија"
-
-#~ msgid "Module name"
-#~ msgstr "Име модула"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "Broadcast Адреса:"
-
-#~ msgid "Bus"
-#~ msgstr "Бус"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Локација на бусу"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Изаберите мрежни интерфејс"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Појавио се проблем током рестартовања мреже?\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Дисконектован..."
 
 #~ msgid "Connect..."
 #~ msgstr "Конектовање..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Конфигурација Интернет конекција"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Конфигурација система"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Први DNS Сервер (опција)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Конфигурација Интернет Конекција"
-
-#~ msgid "Internet access"
-#~ msgstr "Интернет приступ"
-
-#~ msgid "Status:"
-#~ msgstr "Статус:"
-
-#~ msgid "Parameters"
-#~ msgstr "Параметри"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Без детаља"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index a814b9d..3e0d3a6 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "Interfejs"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adresa"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "Podesi lokalni mrežu..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Pomoć"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Promeni"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Poništi"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "U redu"
@@ -96,7 +102,8 @@ msgstr "U redu"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "U redu"
 msgid "Please wait"
 msgstr "Samo momenat..."
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Samo momenat... primena konfiguracije"
@@ -141,6 +148,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Mrežna maska"
@@ -156,6 +164,7 @@ msgid "Started on boot"
 msgstr "Pokrenuto pri startanju"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klijent"
@@ -170,17 +179,19 @@ msgstr ""
 "Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Izaberite mrežni interfejs"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "Loš paket"
@@ -249,12 +260,12 @@ msgstr ""
 "\n"
 "šta želite da uradite?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Isključi"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Omogući"
@@ -269,8 +280,8 @@ msgstr "Promeni postavke"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "Xinetd Servis"
@@ -336,7 +347,11 @@ msgstr "Interno ime domena"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -628,13 +643,14 @@ msgstr "Dozvoli sve korisnike"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Zaštitni zid (Firewall)"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Ne mogu da kontaktiram miror %s"
@@ -644,12 +660,12 @@ msgstr "Ne mogu da kontaktiram miror %s"
 msgid "Log"
 msgstr "log"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Sve"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -676,12 +692,12 @@ msgstr "Backup-uj korisničke fajlove"
 msgid "Clear logs"
 msgstr "Očisti sve"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -829,7 +845,7 @@ msgstr "Način rada"
 msgid "Enabled"
 msgstr "Omogući"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Opis"
@@ -871,9 +887,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Upozorenje"
@@ -2337,12 +2353,12 @@ msgstr ""
 "Upozorenje, detektovana je još jedna Internet konekcija, možda koristi vašu "
 "mrežu"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Konektovan"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nije konektovan"
@@ -2407,7 +2423,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Mere"
@@ -2447,19 +2463,22 @@ msgstr "Model kartice :"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentifikacija"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Logovanje za račun (korisničko ime)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Lozinka za račun"
@@ -2584,13 +2603,15 @@ msgstr ""
 "Svaka stavka treba de bude tavka treba da bude uneta kao\n"
 "IP adresa (na primer, 123.45.67.89)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS server IP"
@@ -2616,21 +2637,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Vreme pauze konekcije (u sek.)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP ime hosta"
@@ -2641,11 +2666,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresa treba da bude u formatu 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Gateway adresa treba da bude u formatu 1.2.3.4"
@@ -2664,6 +2691,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Dodelite ime hosta za DHCP adresu"
@@ -2685,6 +2713,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Direktno priključivanje na mrežu"
@@ -2753,27 +2782,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Bazirano na skripti"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Bazirano na terminalu"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3932,90 +3966,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Kablovska konekcija"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "Ekspert mod"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "Izaberite jezik"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Glavno"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Ripiter"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundarni"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatski"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Ključ za enkripciju"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Lozinka"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Logovanje za račun (korisničko ime)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4023,12 +4060,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Lozinka"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4047,12 +4084,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4061,32 +4098,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Mreža"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4100,17 +4142,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Stanica za igru"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4121,12 +4165,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4138,12 +4183,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4161,107 +4207,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Auto-detekcija"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Način rada"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4269,12 +4315,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4283,12 +4329,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4298,12 +4344,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4313,12 +4359,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4336,26 +4382,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4364,7 +4410,7 @@ msgstr ""
 "Frekvencija treba da ima predznak k, M ili G (na primer, \"2.46G\" za 2.46 "
 "GHz frekvenciju), ili dodajte dovoljno '0'(nula)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4373,17 +4419,17 @@ msgstr ""
 "Raspon treba da ima predznak k, M ili G (na primer, \"11M\" za 11M), ili "
 "dodajte dovoljno '0' (nula)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4525,6 +4571,289 @@ msgstr "Poveži se"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nije detektovana nijedna mrežna kartica. Pokrenite alat za konfigurisanje "
+"hardvera."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Izaberite mrežni interfejs"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Izaberite mrežni interfejs"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Pojavio se problem tokom restartovanja mreže?\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"čestitamo, mrežna i internet konfiguracija je završena.\n"
+"\n"
+"Konfiguracija se sada može primeniti na sistem.\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Upravljanje konekcijama"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Uređaj: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS konfiguracija"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS server"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "NIS Domen"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "nijedan"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statički"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Pokreni pri startanju"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Mod za biranje"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Brzina konekcije "
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Vreme pauze konekcije (u sek.)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Broj telefona provajdera"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>S"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "Internet stanica"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Pauza pri startanju kernela"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Koristi fajl za zaključavanje"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuvajt"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ kartice"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "(DMA) kartice"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr " IO kartice"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr " IO_0 kartice"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Evropski protokol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokol za Ostatak sveta \n"
+" bez D-kanala (zakupljene linije)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Proizvođač"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Klasa Medija"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Ime modula"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Broadcast Adresa:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Lokacija na busu"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway adresa treba da bude u formatu 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfejs:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Konfiguracija Internet konekcija"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Ovaj interfejs još uvek nije podešen.\n"
+"Pokrenite konfiguracionog čarobnjaka u glavnom prozoru"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Konfiguracija sistema"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Prvi DNS Server (opcija)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Drugi DNS Server (opcija)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Prvi DNS Server (opcija)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Konfiguracija Internet Konekcija"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internet pristup"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Tip konekcije: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Status:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testiranje konekcije..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametri"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4726,11 +5055,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Nisam našao uređaj"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Uređaj: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4953,6 +5277,103 @@ msgstr "Instaliraj sistem"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "\tIme servera: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Detektovana Firewalling konfiguracija"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Želite li da završite igru?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Bez detalja"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Akcija: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Mrežni interfejs: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Vrsta pristupa: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP adresa:\t%s\n"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Podešavam hostname %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "\tIme servera: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Zanemari"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Detektovana Firewalling konfiguracija"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Kablovska konekcija"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Da li hoćete da testirate konfiguraciju?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Zapamti ovu lozinku"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4996,20 +5417,6 @@ msgstr "Interna  ISDN kartica"
 msgid "Protocol for the rest of the world"
 msgstr "Protokol za statak sveta"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Evropski protokol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokol za Ostatak sveta \n"
-" bez D-kanala (zakupljene linije)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5058,11 +5465,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testiranje konekcije..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5083,11 +5485,6 @@ msgstr "Vaš lični broj telefona"
 msgid "Provider name (ex provider.net)"
 msgstr "Ime provajdera (npr. provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Broj telefona provajdera"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5098,41 +5495,6 @@ msgstr "Provajderov dns 1 (opciono)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provajderov dns 2 (opciono)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Mod za biranje"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Brzina konekcije "
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Vreme pauze konekcije (u sek.)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ kartice"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "(DMA) kartice"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr " IO kartice"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr " IO_0 kartice"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5296,16 +5658,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Ime domena"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Prvi DNS Server (opcija)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Drugi DNS Server (opcija)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5613,11 +5965,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS adresa treba da bude u formatu 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway adresa treba da bude u formatu 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6054,16 +6401,6 @@ msgstr ""
 #~ "\n"
 #~ "Sada podeavam vašu lokalnu mrežu sa ovim adapterom."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Nije detektovana nijedna mrežna kartica. Pokrenite alat za konfigurisanje "
-#~ "hardvera."
-
-#~ msgid "Connection type: "
-#~ msgstr "Tip konekcije: "
-
 #~ msgid "Edit"
 #~ msgstr "Izmeni"
 
@@ -6090,191 +6427,15 @@ msgstr ""
 #~ msgid "Flag"
 #~ msgstr "Zastava"
 
-#~ msgid "none"
-#~ msgstr "nijedan"
-
 #~ msgid "Level"
 #~ msgstr "Nivo"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "\tIme servera: %s\n"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Detektovana Firewalling konfiguracija"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Želite li da završite igru?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Bez detalja"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "Akcija: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Mrežni interfejs: %s"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Vrsta pristupa: %s\n"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP adresa:\t%s\n"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Podešavam hostname %s: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "\tIme servera: %s\n"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Port: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Zanemari"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Detektovana Firewalling konfiguracija"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Kablovska konekcija"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Da li hoćete da testirate konfiguraciju?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Zapamti ovu lozinku"
-
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfejs:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Upravljanje konekcijama"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS konfiguracija"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS server"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "NIS Domen"
-
-#~ msgid "static"
-#~ msgstr "statički"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Pokreni pri startanju"
-
-#, fuzzy
-#~ msgid "Flow control"
-#~ msgstr "<control>S"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "Internet stanica"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Pauza pri startanju kernela"
-
-#~ msgid "Use lock file"
-#~ msgstr "Koristi fajl za zaključavanje"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "Kuvajt"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Modem"
-
-#~ msgid "Vendor"
-#~ msgstr "Proizvođač"
-
-#~ msgid "Media class"
-#~ msgstr "Klasa Medija"
-
-#~ msgid "Module name"
-#~ msgstr "Ime modula"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "Broadcast Adresa:"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Lokacija na busu"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "Izaberite mrežni interfejs"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Pojavio se problem tokom restartovanja mreže?\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Diskonektovan..."
 
 #~ msgid "Connect..."
 #~ msgstr "Konektovanje..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Konfiguracija Internet konekcija"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "Konfiguracija sistema"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Prvi DNS Server (opcija)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Konfiguracija Internet Konekcija"
-
-#~ msgid "Internet access"
-#~ msgstr "Internet pristup"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametri"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Bez detalja"
diff --git a/po/sv.po b/po/sv.po
index acaf99e..5d4260c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: network-tools-sv\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-24 22:51+0100\n"
 "Last-Translator: Thomas Backlund <tmb@mageia.org>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -36,14 +36,16 @@ msgid "Interface"
 msgstr "Gränssnitt"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-adress"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
@@ -79,23 +81,27 @@ msgid "Configure Local Area Network..."
 msgstr "Konfigurera lokalt nätverk..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Hjälp"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Verkställ"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Avbryt"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -105,7 +111,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -114,7 +121,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Vänta"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Vänta... verkställer konfigurationen"
@@ -150,6 +157,7 @@ msgstr "Kort %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Nätmask"
@@ -165,6 +173,7 @@ msgid "Started on boot"
 msgstr "Startad vid uppstart"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP-klient"
@@ -179,17 +188,19 @@ msgstr ""
 "Starta guiden \"%s\" från Mageia kontrollcentral"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Skapa nytt nätverksinterface (för LAN, ISDN, ADSL,...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Inget IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Ingen mask"
@@ -260,12 +271,12 @@ msgstr ""
 "\n"
 "Vad vill du göra?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Inaktivera"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Aktivera"
@@ -280,8 +291,8 @@ msgstr "Konfigurera om"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Välj det nätverksgränssnitt som är direktanslutet mot Internet."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Nätenhet"
@@ -357,7 +368,11 @@ msgstr "Det interna domännamnet"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -653,13 +668,14 @@ msgstr "Tillåtna adresser"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiv Brandvägg"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Kan inte kontakta demonen"
@@ -669,12 +685,12 @@ msgstr "Kan inte kontakta demonen"
 msgid "Log"
 msgstr "Logg"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Tillåt"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Blockera"
@@ -701,12 +717,12 @@ msgstr "Blockerade tjänster"
 msgid "Clear logs"
 msgstr "Töm loggar"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Svartlista"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Vitlista"
@@ -856,7 +872,7 @@ msgstr "Modul"
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Beskrivning"
@@ -903,9 +919,9 @@ msgstr ""
 "Du använder nu nätverksprofilen %s. Du kan konfigurera ditt system som "
 "vanligt, och alla dina nätverksinställningar sparas till nuvarande profil."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Varning"
@@ -2470,12 +2486,12 @@ msgstr ""
 "Varning: en annan Internetanslutning har identifierats som kanske använder "
 "ditt nätverk"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Inte ansluten"
@@ -2540,7 +2556,7 @@ msgstr "Aktivera trafikloggning"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Tillåt anslutningen att kontrolleras av Network Manager"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Meter"
@@ -2580,19 +2596,22 @@ msgstr "Kabelmodem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Använd BPALogin (krävs för australiensiska Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Autentisering"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Kontoinloggning (användarnamn)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Kontolösenord"
@@ -2717,13 +2736,15 @@ msgstr ""
 "Varje adress ska skrivas som en så kallad\n"
 "dotted-quad (t ex 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Hämta DNS servrar från DHCP"
@@ -2749,21 +2770,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "Som standard sätts sökdomän från det fullständiga värddatornamnet"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP tidsgräns (i sekunder)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Hämta YP servrar från DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Hämta NTPD servrar från DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP-värddatornamn"
@@ -2774,11 +2799,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Fall inte tillbaka till Zeroconf (169.254.0.0 nätverk)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP-adressen ska vara i formatet 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Nätmasken ska vara i formatet 255.255.224.0"
@@ -2801,6 +2828,7 @@ msgstr ""
 "vid systemstart."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Tilldela värddatornamn från DHCP-server (eller generera ett unikt)"
@@ -2827,6 +2855,7 @@ msgstr ""
 "du lämnar det tomt, kommer 'localhost.localdomain' att användas."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Nätverks \"hotplugging\""
@@ -2895,27 +2924,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analogt telefonmodem (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skriptbaserad"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalbaserad"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4074,12 +4108,12 @@ msgstr "WPA/WPA2 med redan utdelad nyckel"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows drivrutin"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4088,78 +4122,81 @@ msgstr ""
 "Ditt trådlösa nätverkskort är inaktiverat, vänligen aktivera trådös switch "
 "(RF bryt-switch) först."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Trådlös inställning"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Arbetsläge"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Administrerad"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater (upprepare)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Sekundär"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Automatisk"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Nätverksnamn (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Krypteringsläge"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Krypteringsnyckel"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Göm Lösenord"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "Tvinga användning av denna nyckel som ASCII sträng (för LiveBox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP Inloggning/Användarnamn"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4170,12 +4207,12 @@ msgstr ""
 "text. Om du måste definiera en domän, försök använda\n"
 "formatet DOMÄN\\användarnamn"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP Lösenord"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4208,12 +4245,12 @@ msgstr ""
 "  TTLS läge är helt baserat på certifikat och kan ignorera\n"
 "det användarnamn och lösenord du gett här."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP klientcertifikat"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4227,32 +4264,37 @@ msgstr ""
 "kombinationen av användarnamn/lösenord.\n"
 "Obs: andra relaterade inställningar visas på Avancerat."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Nätverks-ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "/Arbetsfrekvens"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Tröskelvärde för känslighet"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Hastighet (i bitar/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4272,17 +4314,19 @@ msgstr ""
 "maximala paketstorleken slår av detta. Du kan också sätta värdet till auto,"
 "fixed eller off. "
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentering"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "extra argument för iwconfig-kommandot"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4299,14 +4343,15 @@ msgstr ""
 "Se man-sidan iwconfig(8) för mera information. "
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 "iwspy-kommandot\n"
 "extra-argument"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4327,12 +4372,13 @@ msgstr ""
 "\n"
 "Se man-sidan iwspy(8) för att få mera information, "
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv extra argument"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4361,28 +4407,28 @@ msgstr ""
 "\n"
 "Se man-sidan iwpriv(8) för mera information. "
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP Protokoll"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Automatisk identifiering"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4391,67 +4437,67 @@ msgstr ""
 "AutoDetect rekommenderas eftersom det först prövar WPA version\n"
 "2 och faller tillbaka till WPA version 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP Läge"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4460,12 +4506,12 @@ msgstr ""
 "En lista av accepterade nyckel autentikeringsprotokoll.\n"
 "Möjliga värden är WPA-EAP, IEEE8021X, NONE "
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP yttre identitet"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4476,12 +4522,12 @@ msgstr ""
 "okrypterad identitet med EAP typer som stöder olika \n"
 "tunnlade identiteter, såsom TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4494,12 +4540,12 @@ msgstr ""
 "auth=MSCHAPV2 för PEAP eller\n"
 "autheap=MSCHAPV2 autheap=MD5 för TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA certifikat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4514,12 +4560,12 @@ msgstr ""
 "borde alltid ett betrott CA certifikat vara konfigurerat vid\n"
 "användning av TLS, TTLS eller PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP certifikat ämnesmotsvarighet"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4534,12 +4580,12 @@ msgstr ""
 "ämne. Ämnessträngen har följande format:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Extra direktiv"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4570,12 +4616,12 @@ msgstr ""
 "\tAndra såsom: key_mgmt, eap kan användas för att tvinga\n"
 "\tspeciella inställningar separat från det grafiska gränssnittet."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "En kypteringsnyckel krävs."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4584,14 +4630,14 @@ msgstr ""
 "Den för-utdelade nyckeln bör ha mellan 8 och 63 ASCII tecken, eller 64 "
 "hexadecimala tecken."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr "WEP nyckeln bör ha högst %d ASCII tecken eller %d hexadecimala tecken."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4600,7 +4646,7 @@ msgstr ""
 "Frekvens bör ha suffixet k, M eller G (till exempel \"2.46G\" för 2.46 Ghz "
 "frekvens), eller lägg till tillräckligt med \"0\" (nollor)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4609,17 +4655,17 @@ msgstr ""
 "Frekvensen bör ha ändelsen k, M eller G (till exempel \"11M\" för M11)\n"
 ", eller lägg till tillräckligt många \"0\" (nollor)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Tillåt basstation roaming"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Kopplat till trådlöst nätverk \"%s\" på anslutning %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Förlorade koppling till trådlöst nätverk på anslutning %s"
@@ -4766,6 +4812,287 @@ msgstr "Anslut"
 msgid "Hostname changed to \"%s\""
 msgstr "Maskinnamn ändrat till \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Inget Ethernet-nätverkskort har hittats i systemet. Kör "
+"konfigurationsverktyget för hårdvara."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Ta bort nätverksgränssnitt"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Välj vilken nätverksenhet som skall konfigureras"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Ett fel uppstod när nätverkesgränssnittet \"%s\" skulle tas bort_\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Gratulerar, nätverksgränssnittet \"%s\" togs bort utan problem"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Hantera anslutningar"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Enhet: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP-konfiguration"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS-servrar"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Sökdomän"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ingen"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statisk"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Starta vid uppstart"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Uppringningsmetod"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Anslutningshastighet"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Anslutningens tidsgräns (i sek)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Leverantörens telefonnummer"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Flödeskontroll"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Linjeterminering"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Tidsgräns för modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Använd låsningsfil"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Vänta på friton före uppringning"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Upptaget Vänta"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Modem ljud"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kortets IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kortets minne (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kortets IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kortets IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protokoll för Europa (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokoll för resten av världen.\n"
+"Ingen D-kanal (hyrd lina)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Tillverkare"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Mediaklass"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Modulnamn"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "MAC-adress:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Buss"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Bussens plats"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway-adressen ska vara i formatet 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Gränssnitt:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Konfiguration av Internetanslutning"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Gränssnittet har inte konfigurerats ännu.\n"
+"Starta guiden \"%s\" från Mageia kontrollcentral."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Värddatornamn (frivilligt)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Primär DNS-server (frivilligt)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Sekundär DNS-server (frivilligt)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr " Tredje DNS-server (frivilligt)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Konfiguration av Internetanslutning"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internetåtkomst"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Anslutningstyp: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Status:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testar anslutningen..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametrar"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4973,11 +5300,6 @@ msgstr "Använd den Interaktiva Brandväggen"
 msgid "No device found"
 msgstr "Inga enheter hittades"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Enhet: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5212,6 +5534,103 @@ msgstr "Installera en ny drivrutin"
 msgid "Select a device:"
 msgstr "Välj en enhet:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Tjänstattack"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interaktiv Brandvägg: intrång identifierat."
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Vad vill du göre med denna attackerare??"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Detaljer om attacken"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Attacktidpunkt: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Nätverksgränssnitt: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Attacktyp: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Attackerarens IP-adress: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Attackerarens värdnamn: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Attackerad tjänst: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Attackerad Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Typ av ICMP attack: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Svartlista alltid (fråga inte igen)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Ignorera"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktiv Brandvägg: ny tjänst"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Trådlös anslutning"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Vill du öppna denna tjänst?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Kom ihåg detta svar"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5255,20 +5674,6 @@ msgstr "Internt ISDN-kort"
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll för resten av världen"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protokoll för Europa (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokoll för resten av världen.\n"
-"Ingen D-kanal (hyrd lina)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5319,11 +5724,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Anslutningskontroll"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Testar anslutningen..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5344,11 +5744,6 @@ msgstr "Ditt personliga telefonnummer"
 msgid "Provider name (ex provider.net)"
 msgstr "Leverantörens namn (t ex leverantor.se)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Leverantörens telefonnummer"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5359,41 +5754,6 @@ msgstr "Leverantörens DNS 1 (frivilligt)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Leverantörens DNS 2 (frivilligt)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Uppringningsmetod"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Anslutningshastighet"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Anslutningens tidsgräns (i sek)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kortets IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kortets minne (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kortets IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kortets IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5559,16 +5919,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domännamn"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Primär DNS-server (frivilligt)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Sekundär DNS-server (frivilligt)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5876,11 +6226,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS-serveradressen ska vara i formatet 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway-adressen ska vara i formatet 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6357,16 +6702,6 @@ msgstr "Använd en specifik UDP port"
 #~ "\n"
 #~ "Ditt lokala nätverk kommer att ställas in med det kortet."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Inget Ethernet-nätverkskort har hittats i systemet. Kör "
-#~ "konfigurationsverktyget för hårdvara."
-
-#~ msgid "Connection type: "
-#~ msgstr "Anslutningstyp: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s används redan\n"
 
@@ -6801,9 +7136,6 @@ msgstr "Använd en specifik UDP port"
 #~ msgid "Flag"
 #~ msgstr "Flagga"
 
-#~ msgid "none"
-#~ msgstr "ingen"
-
 #~ msgid "Level"
 #~ msgstr "Nivå"
 
@@ -6811,178 +7143,15 @@ msgstr "Använd en specifik UDP port"
 #~ msgstr ""
 #~ "Du måste logga ut och logga in igen för att ändringarna ska verkställas."
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Tjänstattack"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Interaktiv Brandvägg: intrång identifierat."
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Vad vill du göre med denna attackerare??"
-
-#~ msgid "Attack details"
-#~ msgstr "Detaljer om attacken"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Attacktidpunkt: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Nätverksgränssnitt: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Attacktyp: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokoll: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Attackerarens IP-adress: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Attackerarens värdnamn: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Attackerad tjänst: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Attackerad Port: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Typ av ICMP attack: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Svartlista alltid (fråga inte igen)"
-
-#~ msgid "Ignore"
-#~ msgstr "Ignorera"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Interaktiv Brandvägg: ny tjänst"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Trådlös anslutning"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Vill du öppna denna tjänst?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Kom ihåg detta svar"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Använd Cisco-UDP inkapsling"
 
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Gränssnitt:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Hantera anslutningar"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP-konfiguration"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS-servrar"
-
-#~ msgid "Search Domain"
-#~ msgstr "Sökdomän"
-
-#~ msgid "static"
-#~ msgstr "statisk"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Starta vid uppstart"
-
-#~ msgid "Flow control"
-#~ msgstr "Flödeskontroll"
-
-#~ msgid "Line termination"
-#~ msgstr "Linjeterminering"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Tidsgräns för modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Använd låsningsfil"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Vänta på friton före uppringning"
-
-#~ msgid "Busy wait"
-#~ msgstr "Upptaget Vänta"
-
-#~ msgid "Modem sound"
-#~ msgstr "Modem ljud"
-
-#~ msgid "Vendor"
-#~ msgstr "Tillverkare"
-
-#~ msgid "Media class"
-#~ msgstr "Mediaklass"
-
-#~ msgid "Module name"
-#~ msgstr "Modulnamn"
-
-#~ msgid "Mac Address"
-#~ msgstr "MAC-adress:"
-
-#~ msgid "Bus"
-#~ msgstr "Buss"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Bussens plats"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Ta bort nätverksgränssnitt"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ett fel uppstod när nätverkesgränssnittet \"%s\" skulle tas bort_\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Gratulerar, nätverksgränssnittet \"%s\" togs bort utan problem"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Koppla ner..."
 
 #~ msgid "Connect..."
 #~ msgstr "Anslut..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Konfiguration av Internetanslutning"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Värddatornamn (frivilligt)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr " Tredje DNS-server (frivilligt)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Konfiguration av Internetanslutning"
-
-#~ msgid "Internet access"
-#~ msgstr "Internetåtkomst"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametrar"
-
 #~ msgid "Attacker"
 #~ msgstr "Attackerare"
 
diff --git a/po/ta.po b/po/ta.po
index 884e1f6..b8960e8 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -29,14 +29,16 @@ msgid "Interface"
 msgstr "அட்ைட"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr ""
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "வரைமுறை"
@@ -72,23 +74,27 @@ msgid "Configure Local Area Network..."
 msgstr "LAN-ஐ  வடிவமைக்கவும்..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "உதவி"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "செயல்படுத்து"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "தவிர்"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "சரி"
@@ -98,7 +104,8 @@ msgstr "சரி"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -107,7 +114,7 @@ msgstr "சரி"
 msgid "Please wait"
 msgstr "தயவுசெய்து காத்திருக்கவும்.."
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "தயவுசெய்து காத்திருக்கவும்...செயல்படுத்தப்படுகிறது"
@@ -143,6 +150,7 @@ msgstr "வலையமைப்பு அட்ைட %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "வளைமுகமூடி"
@@ -158,6 +166,7 @@ msgid "Started on boot"
 msgstr "தொடங்கும்போதே துவக்கிவிடு"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP வேண்டி"
@@ -172,17 +181,19 @@ msgstr ""
 "இதற்க்கான மாயாவியைத் துவக்கு"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "வலையமைப்பு அட்ைடயை தேர்வுச் செய்"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "தவறான பொதி"
@@ -247,12 +258,12 @@ msgstr ""
 "\n"
 "என்ன செய்ய வேண்டும்?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "செயல் நீக்கு"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "செயல்படுத்து"
@@ -267,8 +278,8 @@ msgstr "மறுவடிவமை"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "துவக்கச்சேவைகள்"
@@ -334,7 +345,11 @@ msgstr "புதிய அச்சுப்ெபறியின் பெய�
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -618,13 +633,14 @@ msgstr "அனைத்து பயனரையும் அனுமதி"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "நெருப்புச்சுவர்"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "கேபிள் இணைப்பு"
@@ -634,12 +650,12 @@ msgstr "கேபிள் இணைப்பு"
 msgid "Log"
 msgstr "உள்நுழை"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "அனைத்து"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -666,12 +682,12 @@ msgstr "துவக்கச்சேவைகள்"
 msgid "Clear logs"
 msgstr "அனைத்ைதயும் மாற்றியமை"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -819,7 +835,7 @@ msgstr "முறை"
 msgid "Enabled"
 msgstr "செயல்படுத்து"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "குறிப்பு"
@@ -861,9 +877,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "எச்சரிக்ைக"
@@ -2325,12 +2341,12 @@ msgstr ""
 "எச்சரிக்ைக, மற்றுமொறு இணையத்ெதாடர்பு கண்டுபிடிக்கப்பட்டுள்ளது. இது அநேகமாக உங்கள் "
 "வலையமைப்பாக்கத்ைத பயன்படுத்தலாம்"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "இணைக்கப்பட்டள்ளது"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "இணைக்கப்படவில்ைல"
@@ -2395,7 +2411,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "கட்டுபடுத்து"
@@ -2435,19 +2451,22 @@ msgstr "அட்ைட மாதிரி:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "நல்குாிமை"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "பயனர் பெயர்"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "பயனரின் கடவுச்ெசால்"
@@ -2567,13 +2586,15 @@ msgid ""
 "notation (for example, 1.2.3.4)."
 msgstr ""
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "நுழைவாயில்"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DHCP பரிமாறியின்    IP"
@@ -2599,21 +2620,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "தொடர்பு வெளியேற்ற நேரம்(விநாடிகளில்): "
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "கணினிப்ெபயர்: "
@@ -2624,11 +2649,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr ""
@@ -2647,6 +2674,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr ""
@@ -2668,6 +2696,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "வலையமைப்பாக்க  வடிவமைப்பு "
@@ -2736,27 +2765,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "கட்டளைத்ெதாடர் வழியாக"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP-பொதுவாக நம்நாட்டில் இதுதான் உள்ளது"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "முனையம் வழியாக"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3915,90 +3949,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "கேபிள் இணைப்பு"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "அறிஞர் முறைமை"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "நிர்வகிக்கப்பட்டது"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "பிரதான"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "மறுதொடக்கம்"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "இரண்டாவது"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "தானியங்கி"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "மறைக்குறியீட்டுச் சாவி"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "கடவுச்ெசால்"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "பயனர் பெயர்"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4006,12 +4043,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "கடவுச்ெசால்"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4030,12 +4067,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4044,32 +4081,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "வலையமைப்பு"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4083,17 +4125,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "விளையாட்டுகள்"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4104,12 +4148,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4121,12 +4166,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4144,107 +4190,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "வரைமுறை"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "தன்னியக்க-கண்டுபிடித்தல்"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP-பொதுவாக நம்நாட்டில் இதுதான் உள்ளது"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "முறை"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP-பொதுவாக நம்நாட்டில் இதுதான் உள்ளது"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4252,12 +4298,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4266,12 +4312,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4281,12 +4327,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4296,12 +4342,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4319,50 +4365,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4504,6 +4550,289 @@ msgstr "இணை "
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"வலையமைப்பு அட்ைட எதுவும் காணப்படவில்ைல. மீண்டும் வன்ெபாருள் வடிவமைப்புக் கருவியை இயக்கவும்"
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "வலையமைப்பு அட்ைடயை தேர்வுச் செய்"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "வலையமைப்பு அட்ைடயை தேர்வுச் செய்"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"வலையகமைப்புச் சேவைகள் மறுதொடங்கும்போது பிழை நேர்ந்துள்ளது \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"வாழ்த்துக்கள், உங்கள் வலையகமைப்பு மற்றும் இணையத் தொடர்பு\n"
+"வெற்றிகரமாக முடிந்தது. இந்த வடிவமைப்புகள் பயன்படுத்தப்படும்\n"
+"\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "இணைப்புகளை மேலான்மைசெய்"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "சாதனம்: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "CUPS  வடிவமைப்பு"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS சேவையகம்"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "தேடல் களம்"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ஒன்றுமில்ைல"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "நிலையான"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "தொடங்கலில்  துவக்கிவிடு "
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "அழைக்கும் முறை"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "தொடர்பு வேகம்: "
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "தொடர்பு வெளியேற்ற நேரம்(விநாடிகளில்): "
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "சேவையாளரின் தொலைபேசி எண்"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "வீழ்ச்சியின் கட்டுப்பாடு"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "இணையக் கணினி"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "கரு தொடங்கல் வெளியேற்ற நேரம்"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "கோப்ேபா தேர்வுச் செய்"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "குவைத்"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "ேமாடம்"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "அட்ைடயின் IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "அட்ைடயின் உள்/வெளி IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "அட்ைடயின் உள்/வெளி IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "ஐரோப்பிய வரைமுறை(EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"ஏனைய பகுதிகளில் பயன்படுத்தப்படும் வரைமுறை\n"
+"No D-Channel (குத்தகை இணைப்புகள்)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "விற்பவர்"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "ஊடக வகை"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "கூற்றின் பெயர்"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "IP முகவரி:"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "பாட்ைட"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "பாட்ைடயின் இடம்"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "நுழைவாயில்:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "அட்ைட:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "இணையத்ெதாடர்பு  வடிவமைக்கப்பாளன்"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"இந்த வலையமைப்பு அட்ைட இன்னும் வடிவமைக்கப்படவில்ைல\n"
+"இதற்க்கான மாயாவியைத் துவக்கு"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "இயக்க வடிவமைப்பு "
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "முதல் DNS சேவையகத்தின் பெயர்"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "2வது DNS சேவையகத்தின் பெயர்"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "முதல் DNS சேவையகத்தின் பெயர்"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "இணையத்ெதாடர்பு  வடிவமைக்கப்பாளன்"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "இணையத்ெதாடர்பு"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "தொடர்பு வகை: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "நிலை:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "இணைப்பு சோதித்து பார்க்கப்படுகிறது"
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "வரைமுறை"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4705,11 +5034,6 @@ msgstr ""
 msgid "No device found"
 msgstr "சாதனம் எதுவும் கிடைக்கவில்லை"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "சாதனம்: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4932,6 +5256,103 @@ msgstr "இயக்கத்ைத நிறுவுங்கள்"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "(_t)சேவை வகை:"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "நெருப்புச்சுவர் வடிவமைப்பு காணப்பட்டுள்ளது"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "ஆட்டத்தை நிறுத்த வேண்டுமா ?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "விவரங்கள்"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "செயல்: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "வலை முகப்புக்கள்"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "வகை: "
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "ஒப்புநெறிகள்"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "(_R)தொலை IP முகவரி:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "புரவலன் பெயரை பெறுவதில் தோல்வி: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "(_t)சேவை வகை:"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "துறை: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "துறை: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "புறக்கணி"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "நெருப்புச்சுவர் வடிவமைப்பு காணப்பட்டுள்ளது"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "கேபிள் இணைப்பு"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "உங்கள் வடிவமைப்ைப சோதித்து பார்க்க வேண்டுமா? [சோதித்து பார்ப்பது முக்கியம்]"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4975,20 +5396,6 @@ msgstr "உள்ளமை ISDN ேமாடம்"
 msgid "Protocol for the rest of the world"
 msgstr "ஏனைய பகுதிகளில் பயன்படுத்தப்படும் வரைமுறை"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "ஐரோப்பிய வரைமுறை(EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"ஏனைய பகுதிகளில் பயன்படுத்தப்படும் வரைமுறை\n"
-"No D-Channel (குத்தகை இணைப்புகள்)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5037,11 +5444,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "இணைப்பு சோதித்து பார்க்கப்படுகிறது"
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5062,11 +5464,6 @@ msgstr "உங்கள் தொலைபேசி எண்"
 msgid "Provider name (ex provider.net)"
 msgstr "சேவையாளரின் பெயர்"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "சேவையாளரின் தொலைபேசி எண்"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5077,41 +5474,6 @@ msgstr "சேவையாளரின் dns1 சேவையகம்"
 msgid "Provider DNS 2 (optional)"
 msgstr "சேவையாளரின் dns2 சேவையகம்"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "அழைக்கும் முறை"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "தொடர்பு வேகம்: "
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "தொடர்பு வெளியேற்ற நேரம்(விநாடிகளில்): "
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "அட்ைடயின் IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "அட்ைடயின் உள்/வெளி IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "அட்ைடயின் உள்/வெளி IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5273,16 +5635,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "களத்தின் பெயர்"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "முதல் DNS சேவையகத்தின் பெயர்"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "2வது DNS சேவையகத்தின் பெயர்"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5579,11 +5931,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6020,16 +6367,6 @@ msgstr ""
 #~ "\n"
 #~ "இதை வைத்து உங்கள் வலையமைப்பாக்கத்ைத அமைக்கட்டுமா"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "வலையமைப்பு அட்ைட எதுவும் காணப்படவில்ைல. மீண்டும் வன்ெபாருள் வடிவமைப்புக் கருவியை "
-#~ "இயக்கவும்"
-
-#~ msgid "Connection type: "
-#~ msgstr "தொடர்பு வகை: "
-
 #~ msgid "Edit"
 #~ msgstr "மாற்றியமை"
 
@@ -6050,182 +6387,15 @@ msgstr ""
 #~ msgid "Flag"
 #~ msgstr "குறி"
 
-#~ msgid "none"
-#~ msgstr "ஒன்றுமில்ைல"
-
 #~ msgid "Level"
 #~ msgstr "நிலை"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "(_t)சேவை வகை:"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "நெருப்புச்சுவர் வடிவமைப்பு காணப்பட்டுள்ளது"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "ஆட்டத்தை நிறுத்த வேண்டுமா ?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "விவரங்கள்"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "செயல்: %s"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "வலை முகப்புக்கள்"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "வகை: "
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "ஒப்புநெறிகள்"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "(_R)தொலை IP முகவரி:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "புரவலன் பெயரை பெறுவதில் தோல்வி: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "(_t)சேவை வகை:"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "துறை: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "புறக்கணி"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "நெருப்புச்சுவர் வடிவமைப்பு காணப்பட்டுள்ளது"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "கேபிள் இணைப்பு"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "உங்கள் வடிவமைப்ைப சோதித்து பார்க்க வேண்டுமா? [சோதித்து பார்ப்பது முக்கியம்]"
-
-#~ msgid "Gateway:"
-#~ msgstr "நுழைவாயில்:"
-
-#~ msgid "Interface:"
-#~ msgstr "அட்ைட:"
-
-#~ msgid "Manage connections"
-#~ msgstr "இணைப்புகளை மேலான்மைசெய்"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "CUPS  வடிவமைப்பு"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "DNS சேவையகம்"
-
-#~ msgid "Search Domain"
-#~ msgstr "தேடல் களம்"
-
-#~ msgid "static"
-#~ msgstr "நிலையான"
-
-#~ msgid "Start at boot"
-#~ msgstr "தொடங்கலில்  துவக்கிவிடு "
-
-#~ msgid "Flow control"
-#~ msgstr "வீழ்ச்சியின் கட்டுப்பாடு"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "இணையக் கணினி"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "கரு தொடங்கல் வெளியேற்ற நேரம்"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "கோப்ேபா தேர்வுச் செய்"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "குவைத்"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "ேமாடம்"
-
-#~ msgid "Vendor"
-#~ msgstr "விற்பவர்"
-
-#~ msgid "Media class"
-#~ msgstr "ஊடக வகை"
-
-#~ msgid "Module name"
-#~ msgstr "கூற்றின் பெயர்"
-
-#~ msgid "Bus"
-#~ msgstr "பாட்ைட"
-
-#~ msgid "Location on the bus"
-#~ msgstr "பாட்ைடயின் இடம்"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "வலையமைப்பு அட்ைடயை தேர்வுச் செய்"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "வலையகமைப்புச் சேவைகள் மறுதொடங்கும்போது பிழை நேர்ந்துள்ளது \n"
-#~ "\n"
-#~ "%s"
-
 #~ msgid "Disconnect..."
 #~ msgstr "இணைப்பிலிருந்து விடுபடு"
 
 #~ msgid "Connect..."
 #~ msgstr "இணை..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "இணையத்ெதாடர்பு  வடிவமைக்கப்பாளன்"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "இயக்க வடிவமைப்பு "
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "முதல் DNS சேவையகத்தின் பெயர்"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "இணையத்ெதாடர்பு  வடிவமைக்கப்பாளன்"
-
-#~ msgid "Internet access"
-#~ msgstr "இணையத்ெதாடர்பு"
-
-#~ msgid "Status:"
-#~ msgstr "நிலை:"
-
-#~ msgid "Parameters"
-#~ msgstr "வரைமுறை"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "விவரங்கள்"
diff --git a/po/tg.po b/po/tg.po
index 56a924f..f5dcca9 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -36,14 +36,16 @@ msgid "Interface"
 msgstr "интерфейс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Суроғаи IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Қарордод"
@@ -79,23 +81,27 @@ msgid "Configure Local Area Network..."
 msgstr "Шабакаи Маҳаллӣ ба танзим дароварда шуда истодааст..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ёрӣ"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Татбиқ намудан"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Бекор кардан"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -105,7 +111,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -114,7 +121,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Лутфан интизор шавед"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Марҳамат карда Интизор шавед... Батанзимдарорӣ истифода шуда истодааст"
@@ -151,6 +158,7 @@ msgstr "Созгор %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Қолаби шабака"
@@ -166,6 +174,7 @@ msgid "Started on boot"
 msgstr "Дар худборшав шурӯъ шудааст"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP мизоҷ"
@@ -180,17 +189,19 @@ msgstr ""
 "Аз Маркази Идораи Mageia ёрдамчии \"Иловакунии интерфейс\"-ро ба кор андозед"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Танзими интерфейси шабакаи нав (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IP нест"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Ниқоб нест"
@@ -262,12 +273,12 @@ msgstr ""
 "\n"
 "Шумо чӣ кор кардан мехоҳед?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Хомӯш сохтан"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Даргиронадан"
@@ -282,8 +293,8 @@ msgstr "Бозбатанзимдарорӣ"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Дастгоҳи Шабакавӣ"
@@ -351,7 +362,11 @@ msgstr "Номи соҳиби дохилӣ"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -648,13 +663,14 @@ msgstr "Ба ҳамаи корвандон иҷозат додан"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Фейрвол"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Имконияти пайвастшавӣ бо оинаи %s мавҷуд нест"
@@ -664,12 +680,12 @@ msgstr "Имконияти пайвастшавӣ бо оинаи %s мавҷу�
 msgid "Log"
 msgstr "Маҷала "
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Ҳама"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -696,12 +712,12 @@ msgstr "Файлҳои корвандро захира кунед"
 msgid "Clear logs"
 msgstr "Тоза кардани ҳамааш"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -849,7 +865,7 @@ msgstr "Усул"
 msgid "Enabled"
 msgstr "Даргиронадан"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Тавсиф"
@@ -891,9 +907,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Огоҳӣ"
@@ -2364,12 +2380,12 @@ msgstr ""
 "Огоҳӣ, пайвастшавии дигар ба интернет муаяйн карда шуд, шояд он шабака "
 "шумороистифода мебарад"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Пайваст шудааст"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Паваст нашудааст"
@@ -2434,7 +2450,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Маҳдуд"
@@ -2474,19 +2490,22 @@ msgstr "Модели корт:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Аслшиносӣ"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Номи дохилии қайд (исми корванд)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Гузарвожаи Қайд"
@@ -2611,13 +2630,15 @@ msgstr ""
 "Ҳар як нуқта бояд ҳамчун IP-суроға дар намуди қайди рақамҳои даҳяке ки бо\n"
 "вергул ҷудо шудааст, дохил гардад (масалан, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Суроғаи IP-и хидматрасони DNS"
@@ -2644,21 +2665,25 @@ msgstr ""
 "Бо нобаёнӣ ҷустуҷӯи фазо аз номи соҳиби пурра шарҳдодашуда барпо мешавад"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Пайвастшавӣ дар вақти иловагӣ(бо сония)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP номи соҳиб"
@@ -2669,11 +2694,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Суроғаи IP бояд дар шаклбандии 1.2.3.4 бошад"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Суроғаи даричаи тадохул бояд дар шаклбандии 1.2.3.4 бошад"
@@ -2692,6 +2719,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Номи соҳибро аз суроғаи DHCP таъин кунед"
@@ -2713,6 +2741,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Шабакаи Hotplugging"
@@ -2781,27 +2810,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Дар дастнавис асос шуда"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Дар асоси поёна"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3960,90 +3994,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Пайвастшавии бе ноқил"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Усули амалкунанда"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Идорашуда"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Усто"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Такроркунанда"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Дуюмӣ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Худ"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Номи шабакавӣ (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Калиди Encryption"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Гузарвожа"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Номи дохилии қайд (исми корванд)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4051,12 +4088,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Гузарвожа"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4075,12 +4112,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Номи сертификат"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4089,32 +4126,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID шабакавӣ"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Зуддии амалкунанда"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Сарҳади ҳассосият"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4137,17 +4179,19 @@ msgstr ""
 "месозад. Инчунин шумо метавонед ин параметрҳоро барои худкор, устувор ё\n"
 "хомӯш барпо созед."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Фрагментатсия"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Нишонвандҳои иловгии фармони iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4163,12 +4207,13 @@ msgstr ""
 "Ба iwconfig(8) man саҳифа барои гирифтани маълумоти муфассал, нигаред."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Нишонвандҳои иловагии фармони iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4188,12 +4233,13 @@ msgstr ""
 "\n"
 "Ба iwpspy(8) man саҳифа барои гирифтани маълумоти муфассал, нигаред."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Нишонвандҳои иловагии фармони iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4224,107 +4270,107 @@ msgstr ""
 "\n"
 "Барои маълумоти муфассал ба iwpriv(8) man саҳифа нигаред."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Қарордод"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Автомуаяйнамоӣ"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Усул"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4332,12 +4378,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4346,12 +4392,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Навъ сертификат"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4361,12 +4407,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4376,12 +4422,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4399,26 +4445,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4427,7 +4473,7 @@ msgstr ""
 "Freq бояд суффикси k, M ё G-ро дошта бошад (масалан, \"2.46G\" барои 2.46 "
 "GHz), ё ин ки миқдори лозимаи '0' (сифрҳоро) илова намоед."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4436,17 +4482,17 @@ msgstr ""
 "Rate бояд пасванди k, M ё G дошта бошад (масалан, \"11M\" барои 11M), ё "
 "шумораи зарурии '0' (сифр)-ро илова кунед."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4592,6 +4638,287 @@ msgstr "Васл шудан"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Дар системаи шумо созгори шабакавии ethernet муайян нагардид. Марҳамат карда "
+"асбоби батанзимдарории сахтафзорро корандозӣ кунед."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Интерфейси шабакавиро хориҷ кунед"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Интерфейси шабакавиро барои батанзимдарорӣ интихоб намоед:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Ҳангоми нобудсозии интерфейси шабакавии \"%s\" хатогӣ рух дод:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Табрик, интерфейси шабакавии \"%s\" бо мувафақият нобуд карда шуд"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Идораи пайвастагиҳо"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Дастгоҳ: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP танзимкунӣ"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS хидматрасонҳо"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Ҷустуҷӯи Фазо"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "мавҷуд нест"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "оморӣ"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Ҳангоми худборшавӣ оғоз намудан"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Усули ҷавоб додани телефонӣ"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Суръати алоқа"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Пайвастшавӣ дар вақти иловагӣ(бо сония)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Рақами телефонии таҳиягар"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Идораи ҷараён"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Кандашавии хат"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Истироҳати модем"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Истифодаи lock файл"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Пеш аз занг задан овози зангзаниро интизор шавед"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Busy интизор"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Овози модем"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Корти IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Хотираи харитаи (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Корти IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Корти IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Протоколи аврупоӣ (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Протокол ба тамоми ҷаҳон\n"
+"Канали D мавҷуд нест (хатҳои чудошуда)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Баранда"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Синфи расона"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Номи модул"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Mac Суроға"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Автобус"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Ҷойгиршавӣ дар гузаргоҳ"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Суроғаи даричаи тадохул бояд дар шаклбандии 1.2.3.4 бошад"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Даричаи тадохул:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Интерфейс:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Батанзимдарории пайвастшавӣ ба Интернет"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Шумо ягон пайвастшавии Интернети танзимшударо надоред.\n"
+"\"%s\"-ро аз Маркази Идораи Mageia сар диҳед"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Номи соҳибӣ (оптсионалӣ)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Хидматрасони DNS-и якум (интихобӣ)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Хидматрасони дуюми DNS (интихобӣ)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Хидматрасони сеюми DNS (интихобӣ)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Батанзимдарории Пайвастшавӣ ба Интернет"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Роҳ ба Интернет"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Навъи алоқа: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Ҳолат:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Санҷиши алоқаи шумо..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Параметрҳо"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4797,11 +5124,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Дастгоҳҳо пайдо нагардиданд"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Дастгоҳ: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5024,6 +5346,103 @@ msgstr "Боркунии дастии гардонанда"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Мудири хидмат"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Танзимдарории Firewalling муаяйн шудааст!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Шумо ин хислатро истифрда бурдан мехоҳед?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Тафсилот нест"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "Навъ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Интерфейсҳои шабака"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "Навъ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Қарордодҳо"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP суроғаи компютер:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Бозгузориши номи асосӣ %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Мудири хидмат"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Даргоҳ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Даргоҳ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Рад кардан"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Танзимдарории Firewalling муаяйн шудааст!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Пайвастшавии бе ноқил"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Оё дар айни замон инро танзим кардан мехоҳед ?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Ин гузарвожаро дар хотир нигоҳ доред"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5067,20 +5486,6 @@ msgstr "Корти дохилии ISDN"
 msgid "Protocol for the rest of the world"
 msgstr "Қарор барои ҷаҳони боқимонда"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Протоколи аврупоӣ (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Протокол ба тамоми ҷаҳон\n"
-"Канали D мавҷуд нест (хатҳои чудошуда)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5129,11 +5534,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Санҷиши алоқаи шумо..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5154,11 +5554,6 @@ msgstr "Рақами телефони шахсии шумо"
 msgid "Provider name (ex provider.net)"
 msgstr "Номи таҳиягар (масалан, provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Рақами телефонии таҳиягар"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5169,41 +5564,6 @@ msgstr "Таҳиягари DNS 1 (интихобӣ)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Таҳиягари DNS 2 (интихобӣ)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Усули ҷавоб додани телефонӣ"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Суръати алоқа"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Пайвастшавӣ дар вақти иловагӣ(бо сония)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Корти IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Хотираи харитаи (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Корти IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Корти IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5374,16 +5734,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Номи фазо"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Хидматрасони DNS-и якум (интихобӣ)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Хидматрасони дуюми DNS (интихобӣ)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5702,11 +6052,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Суроғаи хидматрасони DNS дар шакли 1.2.3.4 бояд бошад"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Суроғаи даричаи тадохул бояд дар шаклбандии 1.2.3.4 бошад"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6155,16 +6500,6 @@ msgstr ""
 #~ "\n"
 #~ "Ман Шабакаи Маҳалии шуморо бо он созгор барпо сохтанӣ ҳастам."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Дар системаи шумо созгори шабакавии ethernet муайян нагардид. Марҳамат "
-#~ "карда асбоби батанзимдарории сахтафзорро корандозӣ кунед."
-
-#~ msgid "Connection type: "
-#~ msgstr "Навъи алоқа: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s аллакай дар истифода аст\n"
 
@@ -7160,9 +7495,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "партофтан"
 
-#~ msgid "none"
-#~ msgstr "мавҷуд нест"
-
 #~ msgid "tunnel"
 #~ msgstr "tunnel"
 
@@ -7191,179 +7523,12 @@ msgstr ""
 #~ msgstr ""
 #~ "Шумо бояд бароед ва аз нав дароед барои он ки тағиротҳо натиҷа бахшанд"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Мудири хидмат"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Танзимдарории Firewalling муаяйн шудааст!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Шумо ин хислатро истифрда бурдан мехоҳед?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Тафсилот нест"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Интерфейсҳои шабака"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "Навъ: %s"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Қарордодҳо"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP суроғаи компютер:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Бозгузориши номи асосӣ %s: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Мудири хидмат"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Даргоҳ: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Рад кардан"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Танзимдарории Firewalling муаяйн шудааст!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Пайвастшавии бе ноқил"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Оё дар айни замон инро танзим кардан мехоҳед ?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Ин гузарвожаро дар хотир нигоҳ доред"
-
-#~ msgid "Gateway:"
-#~ msgstr "Даричаи тадохул:"
-
-#~ msgid "Interface:"
-#~ msgstr "Интерфейс:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Идораи пайвастагиҳо"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP танзимкунӣ"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS хидматрасонҳо"
-
-#~ msgid "Search Domain"
-#~ msgstr "Ҷустуҷӯи Фазо"
-
-#~ msgid "static"
-#~ msgstr "оморӣ"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Ҳангоми худборшавӣ оғоз намудан"
-
-#~ msgid "Flow control"
-#~ msgstr "Идораи ҷараён"
-
-#~ msgid "Line termination"
-#~ msgstr "Кандашавии хат"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Истироҳати модем"
-
-#~ msgid "Use lock file"
-#~ msgstr "Истифодаи lock файл"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Пеш аз занг задан овози зангзаниро интизор шавед"
-
-#~ msgid "Busy wait"
-#~ msgstr "Busy интизор"
-
-#~ msgid "Modem sound"
-#~ msgstr "Овози модем"
-
-#~ msgid "Vendor"
-#~ msgstr "Баранда"
-
-#~ msgid "Media class"
-#~ msgstr "Синфи расона"
-
-#~ msgid "Module name"
-#~ msgstr "Номи модул"
-
-#~ msgid "Mac Address"
-#~ msgstr "Mac Суроға"
-
-#~ msgid "Bus"
-#~ msgstr "Автобус"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Ҷойгиршавӣ дар гузаргоҳ"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Интерфейси шабакавиро хориҷ кунед"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ҳангоми нобудсозии интерфейси шабакавии \"%s\" хатогӣ рух дод:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Табрик, интерфейси шабакавии \"%s\" бо мувафақият нобуд карда шуд"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Хомӯш намоед..."
 
 #~ msgid "Connect..."
 #~ msgstr "Алоқа..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Батанзимдарории пайвастшавӣ ба Интернет"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Номи соҳибӣ (оптсионалӣ)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Хидматрасони сеюми DNS (интихобӣ)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Батанзимдарории Пайвастшавӣ ба Интернет"
-
-#~ msgid "Internet access"
-#~ msgstr "Роҳ ба Интернет"
-
-#~ msgid "Status:"
-#~ msgstr "Ҳолат:"
-
-#~ msgid "Parameters"
-#~ msgstr "Параметрҳо"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Тафсилот нест"
diff --git a/po/th.po b/po/th.po
index 0aa0eba..b3f9890 100644
--- a/po/th.po
+++ b/po/th.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "Interface"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "ค่า IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "ปรับแต่งระบบเน็ตเวิร์กภายใน..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "ความช่วยเหลือ"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "มีผลทันที"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "ยกเลิก"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "ตกลง"
@@ -95,7 +101,8 @@ msgstr "ตกลง"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "ตกลง"
 msgid "Please wait"
 msgstr "โปรดรอสักครู่"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "กรุณารอสักครู่ ..."
@@ -138,6 +145,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "เน็ตมาสก์"
@@ -153,6 +161,7 @@ msgid "Started on boot"
 msgstr "เริ่มทำงานตอน boot"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP client"
@@ -165,17 +174,19 @@ msgid ""
 msgstr ""
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "เลือก network interface"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr ""
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, fuzzy, c-format
 msgid "No Mask"
 msgstr "แพ็คเก็จชำรุด"
@@ -233,12 +244,12 @@ msgid ""
 "What would you like to do?"
 msgstr ""
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "ปิดการใช้งาน"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "เปิดใช้งาน"
@@ -253,8 +264,8 @@ msgstr "ปรับแต่งใหม่"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, fuzzy, c-format
 msgid "Net Device"
 msgstr "ชื่อเซิร์ฟเวอร์ของพรินเตอร์"
@@ -320,7 +331,11 @@ msgstr "ไม่มีเครื่องพิมพ์"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -604,13 +619,14 @@ msgstr "เพิ่มผู้ใช้"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "ตรวจพบคอนฟิกของ Firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "ไม่สามารถ forkได้.%s"
@@ -620,12 +636,12 @@ msgstr "ไม่สามารถ forkได้.%s"
 msgid "Log"
 msgstr "บันทึกการทำงาน"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "ทั้งหมด"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -652,12 +668,12 @@ msgstr "ไฟล์แบ็คอัพมีปัญหา"
 msgid "Clear logs"
 msgstr "ล้างทั้งหมด"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -805,7 +821,7 @@ msgstr "โมเด็ม"
 msgid "Enabled"
 msgstr "เปิดใช้งาน"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "รายละเอียด"
@@ -847,9 +863,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "คำเตือน"
@@ -2307,12 +2323,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "เชื่อมต่ออยู่"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "ไม่เชื่อมต่อ"
@@ -2377,7 +2393,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "จำเพาะ"
@@ -2417,19 +2433,22 @@ msgstr "Card mem (DMA)"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "การตรวจสอบสิทธิ์การใช้งาน"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Account Login (user name)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "รหัสผ่าน"
@@ -2552,13 +2571,15 @@ msgstr ""
 "ข้อมูลแต่ละอย่างสามารถใส่เข้าไปได้โดยใช้ค่า IP ในรูปแบบตัวเลขคั่นด้วยจุด\n"
 "(dotted-decimal notation) ตัวอย่างเช่น 1.2.3.4"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "เกตเวย์"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "ค่า IP ของ CUPS เซิร์ฟเวอร์"
@@ -2584,21 +2605,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "ชนิดการเชื่อมต่อ"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, fuzzy, c-format
 msgid "DHCP host name"
 msgstr "ชื่อโฮสต์:"
@@ -2609,11 +2634,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
@@ -2632,6 +2659,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "กรุณาทดสอบเม้าส์"
@@ -2653,6 +2681,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, fuzzy, c-format
 msgid "Network Hotplugging"
 msgstr "การคอนฟิกระบบเน็ตเวิร์ก"
@@ -2721,27 +2750,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "รูปแบบสคริปต์"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "รูปแบบเทอร์มินอล"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3900,90 +3934,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "ไร้สาย"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, fuzzy, c-format
 msgid "Operating Mode"
 msgstr "โหมดผู้เชี่ยวชาญ"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Managed"
 msgstr "เลือกภาษาที่คุณใช้"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Master"
 msgstr "Mouse"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, fuzzy, c-format
 msgid "Repeater"
 msgstr "เรียกคืนจากไฟล์"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "รอง (Secondary)"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "อัตโนมัติ"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "รหัสผ่าน"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Account Login (user name)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -3991,12 +4028,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "รหัสผ่าน"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4015,12 +4052,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4029,32 +4066,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, fuzzy, c-format
 msgid "Network ID"
 msgstr "Network interface"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4068,17 +4110,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, fuzzy, c-format
 msgid "Fragmentation"
 msgstr "Workstation ที่ทำงาน"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4089,12 +4133,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4106,12 +4151,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4129,107 +4175,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protocol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "ตรวจสอบอัตโนมัติ"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "โมเด็ม"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4237,12 +4283,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4251,12 +4297,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4266,12 +4312,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4281,12 +4327,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4304,50 +4350,50 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
 "frequency), or add enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4489,6 +4535,283 @@ msgstr "เชื่อมต่อ"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr "ไม่สามารถตรวจพบ network adapter บนเครื่องนี้ กรุณารันโปรแกรมปรับแต่ง hardware"
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "เลือก network interface"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "เลือก network interface"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"การปรับแต่ง internet/network เรียบร้อยแล้ว\n"
+"\n"
+"ค่าต่างๆจะถูกนำไปใช้เดี๋ยวนี้\n"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "cable connection"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "อุปกรณ์: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "การปรับแต่ง LAN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "เซิร์ฟเวอร์ DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "โดเมน NIS"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "ไม่มี"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "กำหนดค่า IP แบบอัตโนมัติ"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "เริ่มทำงานตอน boot"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "การหมุนโทรศัพท์ด้วยโมเด็ม"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, fuzzy, c-format
+msgid "Connection speed"
+msgstr "ชนิดการเชื่อมต่อ"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, fuzzy, c-format
+msgid "Connection timeout (in sec)"
+msgstr "ชนิดการเชื่อมต่อ"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "หมายเลขโทรศัพท์"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Flow control"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, fuzzy, c-format
+msgid "Line termination"
+msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Kernel Boot Timeout"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "เลือกไฟล์"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "ออก"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Mouse"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Card IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Card mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Card IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Card IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, fuzzy, c-format
+msgid "European protocol (EDSS1)"
+msgstr "ยุโรป (EDS11)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, fuzzy, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Rest of the world \n"
+"No D-Channel (leased lines)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "เวนเดอร์"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "ชี่อ module"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "ค่า IP"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "เบลารัส"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, fuzzy, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "เกตเวย์:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interface:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "การปรับแต่งการติดต่อเข้า internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "การคอนฟิก"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "เซิรฟ์เวอร์ DNS เครื่องที่สอง (optional)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "การปรับแต่งการติดต่อเข้า internet"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "การติดต่อ internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "ชนิดการเชื่อมต่อ"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "สถานะ:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "ทดสอบ connection..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parameters"
+
 #: ../lib/network/drakfirewall.pm:14
 #, fuzzy, c-format
 msgid "Web Server"
@@ -4680,11 +5003,6 @@ msgstr ""
 msgid "No device found"
 msgstr "เครื่องพิมพ์โลคอล (ต่อติดกับตัวเครื่อง)"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "อุปกรณ์: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4907,6 +5225,103 @@ msgstr "ติดตั้งระบบ"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "ชนิด_บริการ:"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "ตรวจพบคอนฟิกของ Firewall"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "จะเริ่มใช้แป้นเหนียวไหม?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "รายละเอียด"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "ปฏิบัติการ: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "แผงวงจรระบบเครือข่าย"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "ประเภท: "
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "โปรโตคอล"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "ที่อยู่ไอพีตายตัว"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "ไม่สามารถอ่านชื่อโฮสต์: %s\n"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "ชนิด_บริการ:"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Port"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Port"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "ไม่สนใจ"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "ตรวจพบคอนฟิกของ Firewall"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "ไร้สาย"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "ไม่มีรหัสผ่าน"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -4950,20 +5365,6 @@ msgstr "Internal ISDN card"
 msgid "Protocol for the rest of the world"
 msgstr "Rest of the world"
 
-#: ../lib/network/netconnect.pm:71
-#, fuzzy, c-format
-msgid "European protocol (EDSS1)"
-msgstr "ยุโรป (EDS11)"
-
-#: ../lib/network/netconnect.pm:72
-#, fuzzy, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Rest of the world \n"
-"No D-Channel (leased lines)"
-
 #: ../lib/network/netconnect.pm:122
 #, fuzzy, c-format
 msgid "Network & Internet Configuration"
@@ -5012,11 +5413,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "ทดสอบ connection..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5037,11 +5433,6 @@ msgstr "เบอร์โทรศัพท์ส่วนตัว"
 msgid "Provider name (ex provider.net)"
 msgstr "ชื่อผู้ให้บริการ (ex KSC)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "หมายเลขโทรศัพท์"
-
 #: ../lib/network/netconnect.pm:350
 #, fuzzy, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5052,41 +5443,6 @@ msgstr "ผู้ให้บริการ dns 1 (optional)"
 msgid "Provider DNS 2 (optional)"
 msgstr "ผู้ให้บริการ dns 2 (optional)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "การหมุนโทรศัพท์ด้วยโมเด็ม"
-
-#: ../lib/network/netconnect.pm:353
-#, fuzzy, c-format
-msgid "Connection speed"
-msgstr "ชนิดการเชื่อมต่อ"
-
-#: ../lib/network/netconnect.pm:354
-#, fuzzy, c-format
-msgid "Connection timeout (in sec)"
-msgstr "ชนิดการเชื่อมต่อ"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Card IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Card mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Card IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Card IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5247,16 +5603,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "ชื่อโดเมน"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "เซิรฟ์เวอร์ DNS เครื่องที่สอง (optional)"
-
 #: ../lib/network/netconnect.pm:653
 #, fuzzy, c-format
 msgid "Set hostname from IP"
@@ -5549,11 +5895,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, fuzzy, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "ค่าของ IP ควรอยู่ในรูปแบบ 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -5970,15 +6311,6 @@ msgstr ""
 #~ "\n"
 #~ "ผมกำลังจะใช้ adapter นี้กับระบบ LAN"
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "ไม่สามารถตรวจพบ network adapter บนเครื่องนี้ กรุณารันโปรแกรมปรับแต่ง hardware"
-
-#~ msgid "Connection type: "
-#~ msgstr "ชนิดการเชื่อมต่อ"
-
 #~ msgid "Edit"
 #~ msgstr "ปรับแต่ง"
 
@@ -6005,185 +6337,15 @@ msgstr ""
 #~ msgid "Flag"
 #~ msgstr "ธง"
 
-#~ msgid "none"
-#~ msgstr "ไม่มี"
-
 #~ msgid "Level"
 #~ msgstr "ระดับ"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "ชนิด_บริการ:"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "ตรวจพบคอนฟิกของ Firewall"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "จะเริ่มใช้แป้นเหนียวไหม?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "รายละเอียด"
-
-#, fuzzy
-#~ msgid "Attack time: %s"
-#~ msgstr "ปฏิบัติการ: %s"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "แผงวงจรระบบเครือข่าย"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "ประเภท: "
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "โปรโตคอล"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "ที่อยู่ไอพีตายตัว"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "ไม่สามารถอ่านชื่อโฮสต์: %s\n"
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "ชนิด_บริการ:"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Port"
-
-#~ msgid "Ignore"
-#~ msgstr "ไม่สนใจ"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "ตรวจพบคอนฟิกของ Firewall"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "ไร้สาย"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "คุณต้องการทดสอบการคอนฟิกหรือไม่"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "ไม่มีรหัสผ่าน"
-
-#~ msgid "Gateway:"
-#~ msgstr "เกตเวย์:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interface:"
-
-#, fuzzy
-#~ msgid "Manage connections"
-#~ msgstr "cable connection"
-
-#, fuzzy
-#~ msgid "IP configuration"
-#~ msgstr "การปรับแต่ง LAN"
-
-#, fuzzy
-#~ msgid "DNS servers"
-#~ msgstr "เซิร์ฟเวอร์ DNS"
-
-#, fuzzy
-#~ msgid "Search Domain"
-#~ msgstr "โดเมน NIS"
-
-#, fuzzy
-#~ msgid "static"
-#~ msgstr "กำหนดค่า IP แบบอัตโนมัติ"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#, fuzzy
-#~ msgid "Start at boot"
-#~ msgstr "เริ่มทำงานตอน boot"
-
-#~ msgid "Flow control"
-#~ msgstr "Flow control"
-
-#, fuzzy
-#~ msgid "Line termination"
-#~ msgstr "การเชื่อมต่อกับ Internet แบบ sharing"
-
-#, fuzzy
-#~ msgid "Modem timeout"
-#~ msgstr "Kernel Boot Timeout"
-
-#, fuzzy
-#~ msgid "Use lock file"
-#~ msgstr "เลือกไฟล์"
-
-#, fuzzy
-#~ msgid "Busy wait"
-#~ msgstr "ออก"
-
-#, fuzzy
-#~ msgid "Modem sound"
-#~ msgstr "Mouse"
-
-#~ msgid "Vendor"
-#~ msgstr "เวนเดอร์"
-
-#~ msgid "Module name"
-#~ msgstr "ชี่อ module"
-
-#, fuzzy
-#~ msgid "Mac Address"
-#~ msgstr "ค่า IP"
-
-#, fuzzy
-#~ msgid "Remove a network interface"
-#~ msgstr "เลือก network interface"
-
-#, fuzzy
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr "คุณต้องการเริ่มทำงาน Network ใหม่หรือไม่"
-
 #~ msgid "Disconnect..."
 #~ msgstr "ยกเลิกติดต่อ..."
 
 #~ msgid "Connect..."
 #~ msgstr "ติดต่อ"
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "การปรับแต่งการติดต่อเข้า internet"
-
-#, fuzzy
-#~ msgid "Host name (optional)"
-#~ msgstr "การคอนฟิก"
-
-#, fuzzy
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "เซิรฟ์เวอร์ DNS เครื่องแรก (optional)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "การปรับแต่งการติดต่อเข้า internet"
-
-#~ msgid "Internet access"
-#~ msgstr "การติดต่อ internet"
-
-#~ msgid "Status:"
-#~ msgstr "สถานะ:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parameters"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "รายละเอียด"
diff --git a/po/tl.po b/po/tl.po
index 298d609..c031981 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "Interface"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP address"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocol"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "I-configure ang Local Area Network (LAN)..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Tulong"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "I-apply"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Cancel"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -96,7 +102,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Maghintay lamang"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Maghintay Lamang... Ina-apply ang configuration"
@@ -141,6 +148,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Netmask"
@@ -156,6 +164,7 @@ msgid "Started on boot"
 msgstr "Sinimulan sa boot"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP client"
@@ -171,17 +180,19 @@ msgstr ""
 "Control Center"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, fuzzy, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Mag-alis ng network interface"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Walang IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Walang Mask"
@@ -252,12 +263,12 @@ msgstr ""
 "\n"
 "Ano ang gusto ninyong gawin?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "I-disable"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Paganahin"
@@ -272,8 +283,8 @@ msgstr "Muling i-configure"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Net Device"
@@ -341,7 +352,11 @@ msgstr "Ang internal domain name"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -636,13 +651,14 @@ msgstr "Payagan lahat ng mga \"user\""
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, fuzzy, c-format
 msgid "Interactive Firewall"
 msgstr "Firewall"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, fuzzy, c-format
 msgid "Unable to contact daemon"
 msgstr "Hindi nakayang makipag-alam sa mirror na %s"
@@ -652,12 +668,12 @@ msgstr "Hindi nakayang makipag-alam sa mirror na %s"
 msgid "Log"
 msgstr ""
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Lahat"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -684,12 +700,12 @@ msgstr "I-backup ang mga user file"
 msgid "Clear logs"
 msgstr "Liwanagin lahat"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -837,7 +853,7 @@ msgstr "Mode"
 msgid "Enabled"
 msgstr "Paganahin"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Paglalarawan"
@@ -879,9 +895,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Babala"
@@ -2351,12 +2367,12 @@ msgstr ""
 "Babala, may natiktikang ibang Internet connection, maaaring ginagamit ang "
 "inyong network"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Nakakonekta"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Hindi nakakonekta"
@@ -2421,7 +2437,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, fuzzy, c-format
 msgid "Metric"
 msgstr "i-restrict"
@@ -2461,19 +2477,22 @@ msgstr "Modelo ng Card:"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Authentication"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Account Login (user name)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Password ng Account"
@@ -2598,13 +2617,15 @@ msgstr ""
 "Bawat isang item ay dapat maipasok bilang IP address sa dotted-decimal\n"
 "na notation (halimbawa, 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Gateway"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, fuzzy, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Ang DNS Server IP"
@@ -2632,21 +2653,25 @@ msgstr ""
 "host name"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, fuzzy, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Timeout ng koneksyon (segundo)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP host name"
@@ -2657,11 +2682,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "ang IP address ay dapat nasa format na 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, fuzzy, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Ang Gateway address ay dapat naka-format na 1.2.3.4"
@@ -2680,6 +2707,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Itakda ang host name mula sa DHCP address"
@@ -2701,6 +2729,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Network Hotplugging"
@@ -2769,27 +2798,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Script-based"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal-based"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3948,90 +3982,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Wireless na koneksyon"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Mode ng Operasyon"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Secondary"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Auto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Pangalan ng Network (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "\"Encryption key\""
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Account Login (user name)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4039,12 +4076,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Password"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4063,12 +4100,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Pangalan ng certificate"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4077,32 +4114,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID ng Network"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Operating frequency"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Sensitivity threshold"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (sa b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4129,17 +4171,19 @@ msgstr ""
 "ito\n"
 "sa auto, fixed, o off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmentation"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Mga extrang argument ng iwconfig na command"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4155,12 +4199,13 @@ msgstr ""
 "Tingnan ang man page ng iwconfig(8) para sa karagdagang inpormasyon."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Mga extrang argument ng iwspy na command"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4180,12 +4225,13 @@ msgstr ""
 "\n"
 "Tingnan ang man page ng iwpspy(8) para sa karagdagang inpormasyon."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Mga extrang argument ng iwpriv na command"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4214,107 +4260,107 @@ msgstr ""
 "\n"
 "Tingnan ang man page ng iwpriv(8) para sa karagdagang inpormasyon."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protocol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Auto na pagtiktik"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Mode"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "TLS"
 msgstr "LSB"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4322,12 +4368,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4336,12 +4382,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Uri ng certificate"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4351,12 +4397,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4366,12 +4412,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4389,26 +4435,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4417,7 +4463,7 @@ msgstr ""
 "Ang Freq ay dapat may suffix na k, M or G (halimbawa, \"2.46G\" for 2.46 GHz "
 "frequency), o magdagdag ng sapat na '0' (zero)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4426,17 +4472,17 @@ msgstr ""
 "Ang Rate ay dapat may suffix na k, M or G (halimbawa, \"11M\" for 11M), o "
 "magdagdag ng sapat na '0' (zero)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4582,6 +4628,288 @@ msgstr ""
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Walang natiktikang ethernet network adapter sa inyong sistema. Patakbuhin "
+"ang hardware configuration tool."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Mag-alis ng network interface"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Piliin ang network interface na iko-configure:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"May nangyaring error habang inaalis ang \"%s\" na network interface:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr ""
+"Maligayang bati, ang \"%s\" na network interface ay matagumpay na naalis"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Pangasiwaan ang mga koneksyon"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Device: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Configuration ng IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Mga DNS server"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Search Domain"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "wala"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "static"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Simulan sa boot"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Dialing mode"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Tulin ng koneksyon"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Timeout ng koneksyon (segundo)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Numero ng telepono ng provider"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Flow control"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Line termination"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Modem timeout"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Gumamit ng lock file"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Maghintay ng dialup tone bago mag-dial"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Busy wait"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Tunog ng modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Card IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Card mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Card IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Card IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "European protocol (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocol para sa labi ng mundo\n"
+"Walang D-Channel (leased line)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Vendor"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Media class"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Pangalan ng module"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Mac Address"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Kinaroroonan sa bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Ang Gateway address ay dapat naka-format na 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Gateway:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interface:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Internet connection configuration"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Ang interface na ito ay hindi pa na-configure.\n"
+"Patakbuhin ang \"%s\" na assistant mula sa Mageia Control Center"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Host name (hindi obligado)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Unang DNS Server (hindi obligado)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Pangalawang DNS Server (hindi obligado)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Pangatlong DNS Server (hindi obligado)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Internet Connection Configuration"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internet access"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Uri ng connection: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Status:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Sinusubukan ang inyong koneksyon..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Mga parameter"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4785,11 +5113,6 @@ msgstr ""
 msgid "No device found"
 msgstr "Walang nahanap na device"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Device: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5012,6 +5335,103 @@ msgstr "Pangloob na mail server"
 msgid "Select a device:"
 msgstr ""
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Tagapangasiwa ng Service"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Natiktikan ang configuration ng firewall!"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Gusto ninyong gamitin ang katangian na ito?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, fuzzy, c-format
+msgid "Attack details"
+msgstr "Walang detalye"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, fuzzy, c-format
+msgid "Attack time: %s"
+msgstr "uri: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Mga Network interface"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, fuzzy, c-format
+msgid "Attack type: %s"
+msgstr "uri: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Mga Protocol"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP address ng computer:"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, fuzzy, c-format
+msgid "Attacker hostname: %s"
+msgstr "Sine-set ang hostname na %s: "
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Tagapangasiwa ng Service"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, fuzzy, c-format
+msgid "Port attacked: %s"
+msgstr "Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Di-pansinin"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Natiktikan ang configuration ng firewall!"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Wireless na koneksyon"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Gusto ninyo bang subukan ang configuration?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Tandaan ang password na ito"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5055,20 +5475,6 @@ msgstr "Internal ISDN card"
 msgid "Protocol for the rest of the world"
 msgstr "Protocol para sa labi ng mundo"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "European protocol (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocol para sa labi ng mundo\n"
-"Walang D-Channel (leased line)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5117,11 +5523,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Sinusubukan ang inyong koneksyon..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5142,11 +5543,6 @@ msgstr "Ang inyong personal na numero ng telepono"
 msgid "Provider name (ex provider.net)"
 msgstr "Pangalan ng provider (e.g. provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Numero ng telepono ng provider"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5157,41 +5553,6 @@ msgstr "Provider DNS 1 (hindi obligado)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provider DNS 2 (hindi obligado)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Dialing mode"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Tulin ng koneksyon"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Timeout ng koneksyon (segundo)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Card IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Card mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Card IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Card IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5356,16 +5717,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domain name"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Unang DNS Server (hindi obligado)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Pangalawang DNS Server (hindi obligado)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5676,11 +6027,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Ang DNS server address ay dapat naka-format na 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Ang Gateway address ay dapat naka-format na 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6128,16 +6474,6 @@ msgstr ""
 #~ "\n"
 #~ "Ise-setup ko ang inyong Local Area Network gamit ang adapter na iyon."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Walang natiktikang ethernet network adapter sa inyong sistema. Patakbuhin "
-#~ "ang hardware configuration tool."
-
-#~ msgid "Connection type: "
-#~ msgstr "Uri ng connection: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s ay gamit na\n"
 
@@ -7134,9 +7470,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "i-discard"
 
-#~ msgid "none"
-#~ msgstr "wala"
-
 #~ msgid "tunnel"
 #~ msgstr "tunnel"
 
@@ -7166,180 +7499,12 @@ msgstr ""
 #~ "Kailangan ninyong mag-logout at login ulit para magkabisa ang mga "
 #~ "pagbabago"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Tagapangasiwa ng Service"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Natiktikan ang configuration ng firewall!"
-
-#, fuzzy
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Gusto ninyong gamitin ang katangian na ito?"
-
-#, fuzzy
-#~ msgid "Attack details"
-#~ msgstr "Walang detalye"
-
-#, fuzzy
-#~ msgid "Network interface: %s"
-#~ msgstr "Mga Network interface"
-
-#, fuzzy
-#~ msgid "Attack type: %s"
-#~ msgstr "uri: %s"
-
-#, fuzzy
-#~ msgid "Protocol: %s"
-#~ msgstr "Mga Protocol"
-
-#, fuzzy
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP address ng computer:"
-
-#, fuzzy
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Sine-set ang hostname na %s: "
-
-#, fuzzy
-#~ msgid "Service attacked: %s"
-#~ msgstr "Tagapangasiwa ng Service"
-
-#, fuzzy
-#~ msgid "Port attacked: %s"
-#~ msgstr "Port: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Di-pansinin"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Natiktikan ang configuration ng firewall!"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Wireless na koneksyon"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Gusto ninyo bang subukan ang configuration?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Tandaan ang password na ito"
-
-#~ msgid "Gateway:"
-#~ msgstr "Gateway:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interface:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Pangasiwaan ang mga koneksyon"
-
-#~ msgid "IP configuration"
-#~ msgstr "Configuration ng IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Mga DNS server"
-
-#~ msgid "Search Domain"
-#~ msgstr "Search Domain"
-
-#~ msgid "static"
-#~ msgstr "static"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Simulan sa boot"
-
-#~ msgid "Flow control"
-#~ msgstr "Flow control"
-
-#~ msgid "Line termination"
-#~ msgstr "Line termination"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Modem timeout"
-
-#~ msgid "Use lock file"
-#~ msgstr "Gumamit ng lock file"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Maghintay ng dialup tone bago mag-dial"
-
-#~ msgid "Busy wait"
-#~ msgstr "Busy wait"
-
-#~ msgid "Modem sound"
-#~ msgstr "Tunog ng modem"
-
-#~ msgid "Vendor"
-#~ msgstr "Vendor"
-
-#~ msgid "Media class"
-#~ msgstr "Media class"
-
-#~ msgid "Module name"
-#~ msgstr "Pangalan ng module"
-
-#~ msgid "Mac Address"
-#~ msgstr "Mac Address"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Kinaroroonan sa bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Mag-alis ng network interface"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "May nangyaring error habang inaalis ang \"%s\" na network interface:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr ""
-#~ "Maligayang bati, ang \"%s\" na network interface ay matagumpay na naalis"
-
 #~ msgid "Disconnect..."
 #~ msgstr "I-disconnect..."
 
 #~ msgid "Connect..."
 #~ msgstr "I-connect..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Internet connection configuration"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Host name (hindi obligado)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Pangatlong DNS Server (hindi obligado)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Internet Connection Configuration"
-
-#~ msgid "Internet access"
-#~ msgstr "Internet access"
-
-#~ msgid "Status:"
-#~ msgstr "Status:"
-
-#~ msgid "Parameters"
-#~ msgstr "Mga parameter"
-
 #, fuzzy
 #~ msgid "Attacker"
 #~ msgstr "Walang detalye"
diff --git a/po/tr.po b/po/tr.po
index eee8733..e6c3246 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-10-21 09:39+0200\n"
 "Last-Translator: Atilla ÖNTAŞ <atilla_ontas@mandriva.org>\n"
 "Language-Team: Turkish <mageia-i18n@mandrivalinux.org>\n"
@@ -40,14 +40,16 @@ msgid "Interface"
 msgstr "Ara birim"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP adresi"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -83,23 +85,27 @@ msgid "Configure Local Area Network..."
 msgstr "Yerel ağı yapılandır..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Yardım"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Uygula"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "İptal"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Tamam"
@@ -109,7 +115,8 @@ msgstr "Tamam"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -118,7 +125,7 @@ msgstr "Tamam"
 msgid "Please wait"
 msgstr "Lütfen bekleyin"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Lütfen Bekleyin... Yapılandırma uygulanıyor"
@@ -154,6 +161,7 @@ msgstr "Bağdaştırıcı %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Ağ maskesi:"
@@ -169,6 +177,7 @@ msgid "Started on boot"
 msgstr "Ön yüklemede başlatılan"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP istemcisi"
@@ -183,17 +192,19 @@ msgstr ""
 "Mageia Denetim Merkezi' ndeki \"%s\" yardımcısını çalıştırın"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Yeni bir ağ ara birimi (Yerel ağ, ISDN, ADSL, ...) kur."
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IP Yok"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Maske Yok"
@@ -266,12 +277,12 @@ msgstr ""
 "\n"
 "Ne yapmak istersiniz?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Devre dışı bırak"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Etkinleştir"
@@ -286,8 +297,8 @@ msgstr "Yeniden yapılandır"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Lütfen internet doğrudan bağlı olan ağ ara biriminü seçin."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Ağ Aygıtı"
@@ -363,7 +374,11 @@ msgstr "Dahili alan adı"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -661,13 +676,14 @@ msgstr "İzin verilen adresler"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Etkileşimli Güvenlik Duvarı"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Uygulamacığa bağlanılamıyor"
@@ -677,12 +693,12 @@ msgstr "Uygulamacığa bağlanılamıyor"
 msgid "Log"
 msgstr "Günlük"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "İzin ver"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Engelle"
@@ -709,12 +725,12 @@ msgstr "Engellenen hizmetler"
 msgid "Clear logs"
 msgstr "Günlük kayıtlarını temizle"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Kara liste"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Ak liste"
@@ -864,7 +880,7 @@ msgstr "Modül"
 msgid "Enabled"
 msgstr "Etkinleştirildi"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Açıklama"
@@ -912,9 +928,9 @@ msgstr ""
 "yapılandırabilirsiniz. Bundan sonra ağ ayarlarınızda yapacağınız her "
 "değişiklik bu profile kaydedilecektir."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Uyarı"
@@ -2480,12 +2496,12 @@ msgid ""
 msgstr ""
 "Uyarı, başka bir Internet bağlantısı saptandı, ağınızı kullanıyor olabilir"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Bağlandı"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Bağlı değil"
@@ -2550,7 +2566,7 @@ msgstr "Trafik hesaplamasını etkinleştir"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrik"
@@ -2590,19 +2606,22 @@ msgstr "Kablo modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "BPALogin kullan (Telstra için gereklidir)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Kimlik kanıtlama"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Kullanıcı Adı"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Hesap Parolası"
@@ -2729,13 +2748,15 @@ msgstr ""
 "Her parça noktalı ondalık değer şeklindeki bir IP \n"
 "adresi olarak girilmelidir. (örneğin: 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Ağ geçidi"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DHCP yoluyla DNS sunucularını al"
@@ -2763,21 +2784,25 @@ msgstr ""
 "ayarlıdır"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP zaman aşımı (saniyede)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "DHCP yoluyla YP sunucularını al"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "DHCP yoluyla NTPD sunucularını al"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP makine adı"
@@ -2788,11 +2813,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Sıfır yapılandırmaya dönüş yapma (169.254.0.0. ağı)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP adresi 1.2.3.4 biçimide olmalıdır"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Net maskesi adresi 255.255.224.0 biçiminde olmalıdır"
@@ -2814,6 +2841,7 @@ msgstr ""
 "dışı bırakın veya açılışta başlamamalarını sağlayacak şekilde ayarlayın."
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Makine adını DHCP adrsinden tamamla (veya benzersiz bir tane üret)"
@@ -2840,6 +2868,7 @@ msgstr ""
 "'localhost.localdomain' adı kullanılacaktır."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Ağ Hotplugging"
@@ -2908,27 +2937,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analog telefon modemi (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Betik tabanlı"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal tabanlı"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4087,12 +4121,12 @@ msgstr "WPA/WPA2 Önceden Paylaşılmış Anahtar"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Kurumsal"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows sürücüsü"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4101,80 +4135,83 @@ msgstr ""
 "Kablosuz kartınız devre dışı, lütfen öncelikle kablosuz anahtarını (RF "
 "öldürme anahtarı) etkinleştirin."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Kablosuz ayarları"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "İşletim Kipi"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Yönet"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Ana"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Tekrarlayıcı"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "İkincil"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Otomatik"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Ağ adı (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Şifreleme kipi"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Şifreleme anahtarı"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Şifreyi gizle"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Bu anahtarın kullanımını ASCII söz dizisi olarak kullanmaya zorla (örn. "
 "Livebox için)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP Kullanıcı İsmi/Girişi"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4185,12 +4222,12 @@ msgstr ""
 "belirtmek durumundaysanız denenmemiş bir söz dizimi kullanın\n"
 " ALAN\\kullanıcı adı"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP Parolası"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4224,12 +4261,12 @@ msgstr ""
 " TLS kipi tamamen sertifika temellidir ve burada belirtilen kullanıcı adı\n"
 "ve parola değerlerini yok sayabilir."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP araç sertifikası"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4242,32 +4279,37 @@ msgstr ""
 "bileşeninin alternatifi olarak düşünülebilir.\n"
 "Not: ilgili diğer ayarlar Gelişmiş sayfasında gösterilmiştir."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Ağ ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "İşleme sıklığı"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Duyarlılık eşik değeri"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (b/s bazında)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4292,17 +4334,19 @@ msgstr ""
 "kapalı olarak\n"
 "da ayarlayabilirsiniz."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Parçalanma"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig komutu ek argümanları"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4318,12 +4362,13 @@ msgstr ""
 "Daha fazla bilgi için iwconfig(8) el kitabına bakın."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy komutu ek argümanları"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4342,12 +4387,13 @@ msgstr ""
 "\n"
 "Daha fazla bilgi için iwspy(8) el kitabına bakın."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv komutu ek argümanları"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4378,28 +4424,28 @@ msgstr ""
 "\n"
 "Daha fazla bilgi için iwpriv(8) el kitabına bakın."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP Protokolü"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Otomatik Algıla"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4408,67 +4454,67 @@ msgstr ""
 "Otomatik Algılama önerilir. Çünkü ilk önce WPA sürüm 2 kullanılır ve\n"
 "WPA sürüm 1' e geri dönülebilir."
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP Kipi"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4477,12 +4523,12 @@ msgstr ""
 "Kabul edilen yetkilendirilmiş anahtar yönetim protokollerinin listesi.\n"
 "Muhtemel değerler: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP dışsal kimliği"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4493,12 +4539,12 @@ msgstr ""
 "(örn. TTLS) destekleyen EAP türleri için şifrelenmemiş kimlik\n"
 "olarak kullanılır."
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4511,12 +4557,12 @@ msgstr ""
 "auth=MSCHAPV2 for PEAP or\n"
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA sertifikası"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4532,12 +4578,12 @@ msgstr ""
 "
PEAP kullanılırken güvenilir bir CA sertifikası her zaman\n"
 "
yapılandırılmalıdır."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP sertifikası özne eşleşmesi"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4547,12 +4593,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr " "
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Ek yönergeler"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4583,12 +4629,12 @@ msgstr ""
 "\tOthers such as key_mgmt, eap maybe used to force\n"
 "\tspecial settings different from the U.I settings."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Bir şifreleme anahtarı gerekli."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4597,7 +4643,7 @@ msgstr ""
 "Önceden paylaşılmış anahtar, 8 ile 63 ASCII karakter arasında veya 64 "
 "onaltılık karakter uzunluğunda olmalıdır."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4606,7 +4652,7 @@ msgstr ""
 "WEP anahtarı en fazla %d ASCII karakter veya %d onaltılık karakter "
 "uzunluğunda olmalıdır."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4615,7 +4661,7 @@ msgstr ""
 "Frekans k, M veya G son ekine sahip olmalıdır. (örneğin: 2.46 GHz frekans "
 "için \"2.46G\") veya yeterince '0' (sıfır) eklenmelidir."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4624,17 +4670,17 @@ msgstr ""
 "Oran k, M veya G son ekine sahip olmalıdır. (örneğin: 11Ms için \"11M\") "
 "veya yeterince '0' (sıfır) eklenmelidir."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Erişim noktası dolaşımına izin ver"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr " \"%s\" kablosuz ağı %s ara birimi üzerinde bağlandı"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "%s ara birimindeki kablosuz ağ bağlantısı kaybedildi."
@@ -4782,6 +4828,285 @@ msgstr "Bağlan"
 msgid "Hostname changed to \"%s\""
 msgstr "Makine adı \"%s\" olarak değişti"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Ağ ara birimi"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Yapılandırmak istediğiniz ağ ara birimini seçin:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Ağınızı yeniden başlatırken bir hata oluştu : \n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Tebrikler, ağ yapılandırması tamamlandı."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "VPN bağlantılarını yönet"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Aygıt: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN yapılandırması"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS sunucusu 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Arama Alanı"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Otomatik"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Ön yüklemede başlatılan"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Çevirme kipi"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Bağlantı hızı"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Bağlantı zaman aşımı (saniyede)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Hizmet sağlayıcının telefon numarası"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modem bağlantısı"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Dosya seçin"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuveyt"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kartın IRQ değeri"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kartın DMA değeri"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kartın IO değeri"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kartın IO_0 değeri"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Avrupa protokolü (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Dünyanın diğer kısımları için protokol \n"
+" D-Kanalı yok (kiralık hat)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Modül"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Gerçek adres"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Belarus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Ağ geçidi adresi 1.2.3.4 biçiminde olmalıdır"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Ağ geçidi"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Ara birim"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Hiç bir Internet bağlantısı yapılandırılmadı"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Bu bağdaştırıcı henüz yapılandırılmamış.\n"
+"Mageia Denetim Merkezi' nden \"%s\" yardımcısını çalıştırın"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "İlk DNS Sunucu (isteğe bağlı)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "İlk DNS Sunucu (isteğe bağlı)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "İkinci DNS Sunucu(isteğe bağlı)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "İlk DNS Sunucu (isteğe bağlı)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Bağlantı Ayarları"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Yazıcı erişimi"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Bağlantı süresi: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Durum"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Bağlantınız test ediliyor..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP Paremetreleri"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4988,11 +5313,6 @@ msgstr "Etkileşimli Güvenlik Duvarı kullan"
 msgid "No device found"
 msgstr "Hiçbir aygıt bulunamadı"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Aygıt: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5226,6 +5546,103 @@ msgstr "Yeni bir sürücü kur"
 msgid "Select a device:"
 msgstr "Bir aygıt seç:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Hizmet saldırısı"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Etkileşimli Güvenlik Duvarı otomatik kipi"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Bu bağlantıyı nasıl yönetmek istersiniz?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Ağ ara birimi"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Protokol"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP adresi: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Hizmet saldırısı"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Etkileşimli Güvenlik Duvarı"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Kablosuz bağlantı"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Bu bağlantıyı nasıl yönetmek istersiniz?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5269,20 +5686,6 @@ msgstr "Tümleşik ISDN kartı"
 msgid "Protocol for the rest of the world"
 msgstr "Dünyanın diğer kısımları için protokol"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Avrupa protokolü (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Dünyanın diğer kısımları için protokol \n"
-" D-Kanalı yok (kiralık hat)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5333,11 +5736,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Bağlantı denetimi"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Bağlantınız test ediliyor..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5358,11 +5756,6 @@ msgstr "Kişisel telefon numaranız"
 msgid "Provider name (ex provider.net)"
 msgstr "Hizmet sağlayıcı adı (örn.: sağlayıcı.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Hizmet sağlayıcının telefon numarası"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5373,41 +5766,6 @@ msgstr "Hizmet Sağlayıcı DNS adresi 1 (isteğe bağlı)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Hizmet Sağlayıcı DNS adresi 2 (isteğe bağlı)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Çevirme kipi"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Bağlantı hızı"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Bağlantı zaman aşımı (saniyede)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kartın IRQ değeri"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kartın DMA değeri"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kartın IO değeri"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kartın IO_0 değeri"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5574,16 +5932,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Alan adı"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "İlk DNS Sunucu (isteğe bağlı)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "İkinci DNS Sunucu(isteğe bağlı)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5890,11 +6238,6 @@ msgstr "Ayrıca DNS sunucusu IP adreslerini de girebilirsiniz."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS sunucu adresi 1.2.3.4 biçimide olmalıdır"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Ağ geçidi adresi 1.2.3.4 biçiminde olmalıdır"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/uk.po b/po/uk.po
index 0cf2c50..144d666 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-05-03 22:23+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -34,14 +34,16 @@ msgid "Interface"
 msgstr "Інтерфейс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP-адреса"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
@@ -77,23 +79,27 @@ msgid "Configure Local Area Network..."
 msgstr "Налаштувати місцеву мережу..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Довідка"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Застосувати"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Скасувати"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Гаразд"
@@ -103,7 +109,8 @@ msgstr "Гаразд"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -112,7 +119,7 @@ msgstr "Гаразд"
 msgid "Please wait"
 msgstr "Зачекайте, будь ласка"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Зачекайте, будь ласка... Йде застосування конфігурації"
@@ -148,6 +155,7 @@ msgstr "Плата %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Маска мережі"
@@ -163,6 +171,7 @@ msgid "Started on boot"
 msgstr "Стартувати при завантаженні"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Клієнт DHCP"
@@ -177,17 +186,19 @@ msgstr ""
 "Запустіть Помічник «%s» з ««Центр керування»» Mageia Linux"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Встановити новий мережевий інтерфейс (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Немає IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Маски немає"
@@ -258,12 +269,12 @@ msgstr ""
 "\n"
 "Що ви бажаєте зробити?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Увімкнути"
@@ -279,8 +290,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "Будь ласка, виберіть мережевий інтерфейс, напряму з’єднаний з Інтернетом."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Мережевий пристрій"
@@ -356,7 +367,11 @@ msgstr "Внутрішня назва домену"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -653,13 +668,14 @@ msgstr "Дозволені адреси"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Діалоговий захисний шлюз"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Неможливо зв'язатися з фоновою службою"
@@ -669,12 +685,12 @@ msgstr "Неможливо зв'язатися з фоновою службою"
 msgid "Log"
 msgstr "Журнал"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Дозволити"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Блокувати"
@@ -701,12 +717,12 @@ msgstr "Блоковані служби"
 msgid "Clear logs"
 msgstr "Очистити журнали"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "«Чорний» список"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "«Білий» список"
@@ -856,7 +872,7 @@ msgstr "Модуль"
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Опис"
@@ -904,9 +920,9 @@ msgstr ""
 "звичний спосіб. Всі ваші мережеві параметри тепер зберігатимуться у цьому "
 "профілі."
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Попередження"
@@ -2486,12 +2502,12 @@ msgstr ""
 "Попередження, виявлено інше з'єднання з Інтернетом, можливо, воно "
 "використовує Вашу мережу"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Під'єднано"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Не з'єднано"
@@ -2556,7 +2572,7 @@ msgstr "Увімкнути облік потоку даних"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "Дозволити керування інтерфейсом за допомогою Network Manager"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Метрика"
@@ -2598,19 +2614,22 @@ msgstr "Кабельний модем"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Використовувати BPALogin (потрібний для Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Розпізнавання"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Рахунок користувача (ім'я користувача)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Пароль рахунка"
@@ -2738,13 +2757,15 @@ msgstr ""
 "треба вводити як IP-адресу в точково-десятковому позначенні\n"
 "(наприклад, 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Шлюз"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Отримати сервери DNS з DHCP"
@@ -2771,21 +2792,25 @@ msgstr ""
 "Типово пошуковий домен буде встановлено з повністю заданої назви клієнта"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Затримка DHCP (в секундах)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Отримати сервери YP з DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Отримати сервери NTPD з DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Назва машини DHCP"
@@ -2796,11 +2821,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "Не повертатися до Zeroconf (мережі 169.254.0.0)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP адреса має бути у форматі 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Маска мережі має бути у форматі 255.255.224.0"
@@ -2823,6 +2850,7 @@ msgstr ""
 "стартували при завантаженні"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Визначити назву машини з адреси DHCP (або згенерувати унікальну)"
@@ -2851,6 +2879,7 @@ msgstr ""
 "використано назву 'localhost.localdomain'."
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Увімкнення мережі «вгарячу»"
@@ -2919,27 +2948,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "Аналоговий телефонний модем (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "На основі скрипту"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "На основі термінала"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4098,12 +4132,12 @@ msgstr "Попередньо поширений ключ WPA/WPA2"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Драйвер Windows"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -4112,80 +4146,83 @@ msgstr ""
 "Вашу картку бездротового зв’язку було вимкнено, будь ласка, спочатку "
 "увімкніть її за допомогою перемикача (перемикач RF kill)."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Параметри бездротового з'єднання"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Режим роботи"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Зроблено"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Помічник"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Повторювач"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Вторинний"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Мережне ім'я (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Режим шифрування"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Ключ шифрування"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "Ховати пароль"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 "Примусово використовувати цей ключ у вигляді рядка ASCII (наприклад, для "
 "Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "Обліковий запис/Користувач EAP"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4196,12 +4233,12 @@ msgstr ""
 "Якщо потрібно вказати домен, спробуйте синтаксис\n"
 "  ДОМЕН\\користувач"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "Пароль EAP"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4236,12 +4273,12 @@ msgstr ""
 "пароля, вказані тут,\n"
 "може бути повністю проігноровано."
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "Клієнтський сертифікат EAP"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4255,32 +4292,37 @@ msgstr ""
 " Зауваження: інші параметри такого розпізнавання можна знайти\n"
 "на сторінці додаткових параметрів."
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID мережі"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Частота роботи"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Поріг чутливості"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Швидкість (в б/с)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4301,17 +4343,19 @@ msgstr ""
 "заборонить цю схему. Ви також можете встановити цей параметр\n"
 "на авто, фіксований, або вимкнено."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Фрагментація"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "додаткові аргументи команди lwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4328,12 +4372,13 @@ msgstr ""
 "Див. сторінку посібника iwconfig(8) для подальшої інформації."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "додаткові аргументи команди lwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4353,12 +4398,13 @@ msgstr ""
 "\n"
 "Див. сторінку посібника iwpspy(8) для подальшої інформації."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "додаткові аргументи команди lwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4388,28 +4434,28 @@ msgstr ""
 "\n"
 "Див. сторінку посібника iwpriv(8) для подальшої інформації."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "Протокол EAP"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Автовизначення"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
@@ -4418,67 +4464,67 @@ msgstr ""
 "Рекомендуємо «Автовизначення», оскільки у такому режимі спочатку\n"
 "буде спроба WPA версії 2, а потім WPA версії 1"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "Режим EAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4487,12 +4533,12 @@ msgstr ""
 "список прийнятних протоколів керування ключами розпізнавання.\n"
 "можливі значення: WPA-EAP, IEEE8021X, NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "Зовнішній профіль EAP"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4503,12 +4549,12 @@ msgstr ""
 "шифрований профіль з типами EAP, які підтримують тунелювання\n"
 "іншого профілю, наприклад, TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4521,12 +4567,12 @@ msgstr ""
 "auth=MSCHAPV2 для PEAP або\n"
 "autheap=MSCHAPV2 autheap=MD5 для TTLS"
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "Сертифікат CA EAP"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4541,12 +4587,12 @@ msgstr ""
 "За можливості, сертифікат надійної служби слід завжди налаштовувати,\n"
 "якщо Ви користуєтеся TLS, TTLS або PEAP."
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "Відповідність призначення сертифікатів EAP"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4561,12 +4607,12 @@ msgstr ""
 "міститься вказаних рядок призначення. Рядок призначення має такий формат:\n"
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "Додаткові директиви"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4598,12 +4644,12 @@ msgstr ""
 "\tдля примусового встановлення інших значень\n"
 "\tпорівняно з параметрами графічної оболонки."
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "Потрібен ключ шифрування."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
@@ -4612,7 +4658,7 @@ msgstr ""
 "У попередньо поширеному ключі має бути від 8 до 63 символів ASCII, або 64 "
 "шістнадцяткових символів."
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
@@ -4621,7 +4667,7 @@ msgstr ""
 "У ключі WEP має бути не більше %d символів ASCII або %d шістнадцяткових "
 "символів."
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4630,7 +4676,7 @@ msgstr ""
 "Freq повинен мати суфікс k, M або G (наприклад, \"2.46G\" для частоти 2.46 "
 "GHz), або додайте необхідну кількість '0' (нулів)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4639,17 +4685,17 @@ msgstr ""
 "Rate повинен мати суфікс k, M або G (наприклад, \"11M\" для 11M), або "
 "додайте потрібну кількість '0' (нулів)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "Дозволити роумінг точки доступу"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Виконано прив’язку до бездротової мережі «%s» на інтерфейсі %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Втрачено прив’язку до бездротової мережі на інтерфейсі %s"
@@ -4797,6 +4843,285 @@ msgstr "З'єднатись"
 msgid "Hostname changed to \"%s\""
 msgstr "Назву машини змінено на «%s»"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "Інтерфейс мережі"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Виберіть інтерфейс мережі для налаштування:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Проблема при перезапуску мережі:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Вітаємо, налаштування мережі завершено."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "Керування з’єднаннями VPN"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Пристрій: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "Налаштування VPN"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "Сервер DNS 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "Домен для пошуку"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "Автоматично"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "Стартувати при завантаженні"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Режим зв'язку через модем"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Швидкість з'єднання"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Затримка перед закриттям зв'язку (сек)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Номер телефону провайдера"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "З'єднання по модему"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Виберіть файл"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Кувейт"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "Модем"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Перепин картки"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Пам'ять картки (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "В/В картки"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "В/В_0 картки"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Європейський протокол (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Протокол для всього іншого світу \n"
+" без D-каналу (виділених ліній)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "Модуль"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "Справжня адреса"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Білорусь"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Адреса шлюзу має бути у форматі 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "Шлюз"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "Інтерфейс"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "Немає сконфігурованого з'єднання з Інтернетом"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"З'єднання з Інтернетом ще не було сконфігуровано.\n"
+"Запустіть Помічника «%s» у Центрі Керування Mageia Linux"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "Перший сервер DNS (необов'язково)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Перший сервер DNS (необов'язково)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Другий сервер DNS (необов'язково)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "Перший сервер DNS (необов'язково)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "Конфігурація з'єднання"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "Доступ до друкарки"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "Час з'єднання: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "Стан"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Випробування з'єднання..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "Параметри IP"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -5006,11 +5331,6 @@ msgstr "Використовувати діалоговий захисний ш�
 msgid "No device found"
 msgstr "Пристроїв не знайдено"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Пристрій: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5245,6 +5565,103 @@ msgstr "Встановити новий драйвер"
 msgid "Select a device:"
 msgstr "Оберіть пристрій:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Атака на службу"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Автоматичний режим діалогового захисного шлюзу"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Як Ви хочете виконувати це з'єднання?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "Інтерфейс мережі"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "Протокол"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "Адреса IP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "Атака на службу"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Діалоговий захисний шлюз"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Бездротове з'єднання"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Як Ви хочете виконувати це з'єднання?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5288,20 +5705,6 @@ msgstr "Внутрішня плата ISDN"
 msgid "Protocol for the rest of the world"
 msgstr "Протокол для всього іншого світу"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Європейський протокол (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Протокол для всього іншого світу \n"
-" без D-каналу (виділених ліній)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5352,11 +5755,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Контроль за з’єднанням"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Випробування з'єднання..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5377,11 +5775,6 @@ msgstr "Ваш особистий номер телефону"
 msgid "Provider name (ex provider.net)"
 msgstr "Назва провайдера (тобто provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Номер телефону провайдера"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5392,41 +5785,6 @@ msgstr "Провайдер DNS 1 (необов'язково)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Провайдер DNS 2 (необов'язково)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Режим зв'язку через модем"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Швидкість з'єднання"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Затримка перед закриттям зв'язку (сек)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Перепин картки"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Пам'ять картки (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "В/В картки"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "В/В_0 картки"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5593,16 +5951,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Назва домену"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Перший сервер DNS (необов'язково)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Другий сервер DNS (необов'язково)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5911,11 +6259,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Адреса DNS-сервера повинна бути у форматі 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Адреса шлюзу має бути у форматі 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/uz.po b/po/uz.po
index 96baa1f..1160085 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uz@cyrillic\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2010-01-12 19:12+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <mavnur@gmail.com>\n"
@@ -29,14 +29,16 @@ msgid "Interface"
 msgstr "Interfeys"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP raqami"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protokol"
@@ -72,23 +74,27 @@ msgid "Configure Local Area Network..."
 msgstr "Lokal tarmoqni sozlash..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Yordam"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Qoʻllash"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Bekor qilish"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ok"
@@ -98,7 +104,8 @@ msgstr "Ok"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -107,7 +114,7 @@ msgstr "Ok"
 msgid "Please wait"
 msgstr "Iltimos kutib turing"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Iltimos kutib turing... Moslamalar qoʻllanilmoqda"
@@ -143,6 +150,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Tarmoq maskasi"
@@ -158,6 +166,7 @@ msgid "Started on boot"
 msgstr "Tizim yuklanganda ishga tushirilgan"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klienti"
@@ -172,17 +181,19 @@ msgstr ""
 "Mageia boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Yangi tarmoq interfeysini oʻrnatish va moslash (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IP raqami koʻrsatilmagan"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Maskasiz"
@@ -253,12 +264,12 @@ msgstr ""
 "\n"
 "Nima qilmoqchisiz?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Oʻchirish"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Yoqish"
@@ -274,8 +285,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "Iltimos Internetga toʻgʻridan-toʻgʻri ulangan tarmoq interfeysini koʻrsating."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Tarmoq uskunasi"
@@ -350,7 +361,11 @@ msgstr "Ichki domen nomi"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -643,13 +658,14 @@ msgstr "Ruxsat etilgan manzillar"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Interaktiv fayervol"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Demon bilan aloqa oʻrnatib boʻlmadi"
@@ -659,12 +675,12 @@ msgstr "Demon bilan aloqa oʻrnatib boʻlmadi"
 msgid "Log"
 msgstr ""
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Ruxsat berish"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -691,12 +707,12 @@ msgstr "Man etilgan xizmatlar"
 msgid "Clear logs"
 msgstr "Loglarni tozalash"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -844,7 +860,7 @@ msgstr "Modem"
 msgid "Enabled"
 msgstr "Yoqish"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Taʼrifi"
@@ -886,9 +902,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Diqqat"
@@ -2356,12 +2372,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Ulangan"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Ulanmagan"
@@ -2426,7 +2442,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrik"
@@ -2466,19 +2482,22 @@ msgstr "Kabel modem"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Tasdiqlash"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Foydalanuvchi"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Maxfiy soʻz"
@@ -2602,13 +2621,15 @@ msgstr ""
 "Yozuvning har qaysi nuqta bilan ajratilgan oʻnlik son shaklida\n"
 "IP raqam boʻlishi kerak (m-n 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Geytvey"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS serverini DHCP'dan aniqlash"
@@ -2634,21 +2655,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP taymauti (soniyada)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP serverini DHCP'dan aniqlash"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD serverni DHCP'dan aniqlash"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP xostning nomi"
@@ -2659,11 +2684,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP raqami quyidagi formatda boʻlishi shart: 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Tarmoq maskasi quyidagi koʻrinishda boʻlishi shart: 255.255.224.0"
@@ -2682,6 +2709,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Kompyuterning nomini DHCP'dan aniqlash"
@@ -2703,6 +2731,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Tarmoq xotplaging"
@@ -2771,27 +2800,32 @@ msgstr "Analog telefon modemi"
 msgid "Analog telephone modem (POTS)"
 msgstr "Analog telefon modemi"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Skriptda asoslangan"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalda asoslangan"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3950,90 +3984,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Simsiz tarmoq moslamalari"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repiter"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Ikkilamchi"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Avto"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Tarmoqning nomi (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Kodlash kaliti"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Maxfiy soʻz"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP foydalanuvchi/maxfiy soʻz"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4041,12 +4078,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP maxfiy soʻz"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4065,12 +4102,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4079,32 +4116,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4118,17 +4160,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4139,12 +4183,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4156,12 +4201,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4179,107 +4225,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP protokol"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Avto-aniqlash"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP usuli"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4287,12 +4333,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4301,12 +4347,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA sertifikat"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4316,12 +4362,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4331,12 +4377,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4354,26 +4400,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4382,24 +4428,24 @@ msgstr ""
 "Chastota \"M\" yoki \"G\" bilan tugashi kerak (masalan, 2.46 GHz uchun\n"
 "\"2.46G\"), yoki yetarlicha \"0\" (nol) qoʻshing."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4541,6 +4587,285 @@ msgstr "Ulash"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Tizimda tarmoq adapteri aniqlanmadi. Iltimos asbob-uskunani moslovchi "
+"vositani ishga tushiring."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Tarmoq interfeysini olib tashlash"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Moslash uchun tarmoq interfeysini tanlang:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"\"%s\" tarmoq interfeysini olib tashlashda xato roʻy berdi:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Tabriklaymiz. \"%s\" tarmoq interfeysi muvaffaqiyatli olib tashlandi."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Aloqalarni boshqarish"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Uskuna: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP moslamasi"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS serverlari"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Qidirish domeni"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "yoʻq"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "statik"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Tizim yuklanayotganda ishga tushirish"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Aloqaning tezligi"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Aloqa taymauti (soniyada)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Provayderning telefon raqami"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Modem uchun taymaut"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Faylni tanlash"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Kuvayt"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Modem tovushi"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Kartaning IRQ'si"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kartaning xotirasi (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Kartaning IO'si"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Kartaning IO_0'si"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Oyropa protokoli (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Ishlab chiqaruvchi"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Maʼlumot tashuvchining sinfi"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Modulning nomi"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Mac raqami"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Belorus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Geytvey manzili quyidagi shaklda boʻlishi shart: 1.2.3.5"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Geytvey:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Interfeys:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Internetga ulanishni moslash"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Internet bilan aloqa moslanmagan.\n"
+"Mageia boshqaruv markazidan \"%s\" yordamchini ishga tushiring"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Xostning nomi (tanlab boʻladi)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Birinchi DNS serveri (tanlab boʻladi)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Ikkinchi DNS serveri (tanlab boʻladi)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Uchinchi DNS serveri (tanlab boʻladi)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Internetga ulanishni moslash"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Internetga ulanish"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Ulanishning turi: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Holati:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Aloqa sinab koʻrilmoqda..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Moslamalar"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4744,11 +5069,6 @@ msgstr "Interaktiv fayervoldan foydalanish"
 msgid "No device found"
 msgstr "Hech qanday uskuna topilmadi"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Uskuna: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4971,6 +5291,103 @@ msgstr "Yangi drayverni oʻrnatish"
 msgid "Select a device:"
 msgstr "Uskunani tanlang:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Interaktiv fayervol"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Ushbu hujumchini nima qilishni istaysiz?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Hujum tafsilotlari"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Hujum vaqti: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Tarmoq interfeysi: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Hujumning turi: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokol: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Hujumchining IP raqami: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Hujumchining xosti: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Hujum qilingan xizmat: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Hujum qilingan port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Hujum qilingan port: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Eʼtibor bermash"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Interaktiv fayervol"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Simsiz ulanish"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Ushbu xizmatni ochishni istaysizmi?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Ushbu javobni eslab qolish"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5014,18 +5431,6 @@ msgstr "Ichki ISDN karta"
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Oyropa protokoli (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5076,11 +5481,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Aloqa boshqaruvi"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Aloqa sinab koʻrilmoqda..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5101,11 +5501,6 @@ msgstr "Shaxsiy telefon raqamingiz"
 msgid "Provider name (ex provider.net)"
 msgstr "Provayderning nomi (m-n provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Provayderning telefon raqami"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5116,41 +5511,6 @@ msgstr "Provayderning DNS 1 (tanlasa boʻladi)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Provayderning DNS 2 (tanlasa boʻladi)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Aloqaning tezligi"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Aloqa taymauti (soniyada)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Kartaning IRQ'si"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Kartaning xotirasi (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Kartaning IO'si"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Kartaning IO_0'si"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5315,16 +5675,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Domenning nomi"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Birinchi DNS serveri (tanlab boʻladi)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Ikkinchi DNS serveri (tanlab boʻladi)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5625,11 +5975,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS serverning manzili quyidagi formatda boʻlishi shart: 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Geytvey manzili quyidagi shaklda boʻlishi shart: 1.2.3.5"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6059,16 +6404,6 @@ msgstr ""
 #~ "\n"
 #~ "Men shu adapter bilan lokal tarmogʻingizni oʻrnataman."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Tizimda tarmoq adapteri aniqlanmadi. Iltimos asbob-uskunani moslovchi "
-#~ "vositani ishga tushiring."
-
-#~ msgid "Connection type: "
-#~ msgstr "Ulanishning turi: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s'dan allaqachon foydalanilmoqda\n"
 
@@ -6109,9 +6444,6 @@ msgstr ""
 #~ msgid "Flag"
 #~ msgstr "Bayroq"
 
-#~ msgid "none"
-#~ msgstr "yoʻq"
-
 #~ msgid "Level"
 #~ msgstr "Daraja"
 
@@ -6120,135 +6452,12 @@ msgstr ""
 #~ "Oʻzgarishlar toʻliq qoʻllanilishi uchun tizimga boshqadan kirishingiz "
 #~ "kerak"
 
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Ushbu hujumchini nima qilishni istaysiz?"
-
-#~ msgid "Attack details"
-#~ msgstr "Hujum tafsilotlari"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Hujum vaqti: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Tarmoq interfeysi: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Hujumning turi: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protokol: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Hujumchining IP raqami: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Hujumchining xosti: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Hujum qilingan xizmat: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Hujum qilingan port: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Eʼtibor bermash"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Ushbu xizmatni ochishni istaysizmi?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Ushbu javobni eslab qolish"
-
-#~ msgid "Gateway:"
-#~ msgstr "Geytvey:"
-
-#~ msgid "Interface:"
-#~ msgstr "Interfeys:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Aloqalarni boshqarish"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP moslamasi"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS serverlari"
-
-#~ msgid "Search Domain"
-#~ msgstr "Qidirish domeni"
-
-#~ msgid "static"
-#~ msgstr "statik"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Tizim yuklanayotganda ishga tushirish"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Modem uchun taymaut"
-
-#~ msgid "Modem sound"
-#~ msgstr "Modem tovushi"
-
-#~ msgid "Vendor"
-#~ msgstr "Ishlab chiqaruvchi"
-
-#~ msgid "Media class"
-#~ msgstr "Maʼlumot tashuvchining sinfi"
-
-#~ msgid "Module name"
-#~ msgstr "Modulning nomi"
-
-#~ msgid "Mac Address"
-#~ msgstr "Mac raqami"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Tarmoq interfeysini olib tashlash"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "\"%s\" tarmoq interfeysini olib tashlashda xato roʻy berdi:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr ""
-#~ "Tabriklaymiz. \"%s\" tarmoq interfeysi muvaffaqiyatli olib tashlandi."
-
 #~ msgid "Disconnect..."
 #~ msgstr "Uzish..."
 
 #~ msgid "Connect..."
 #~ msgstr "Ulanish..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Internetga ulanishni moslash"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Xostning nomi (tanlab boʻladi)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Uchinchi DNS serveri (tanlab boʻladi)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Internetga ulanishni moslash"
-
-#~ msgid "Internet access"
-#~ msgstr "Internetga ulanish"
-
-#~ msgid "Status:"
-#~ msgstr "Holati:"
-
-#~ msgid "Parameters"
-#~ msgstr "Moslamalar"
-
 #~ msgid "Attacker"
 #~ msgstr "Hujumchi"
 
diff --git a/po/uz@cyrillic.po b/po/uz@cyrillic.po
index bd23363..5d56ff1 100644
--- a/po/uz@cyrillic.po
+++ b/po/uz@cyrillic.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: uz@cyrillic\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2010-01-12 19:12+0500\n"
 "Last-Translator: Nurali Abdurahmonov <mavnur@gmail.com>\n"
 "Language-Team: American English <mavnur@gmail.com>\n"
@@ -29,14 +29,16 @@ msgid "Interface"
 msgstr "Интерфейс"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP рақами"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Протокол"
@@ -72,23 +74,27 @@ msgid "Configure Local Area Network..."
 msgstr "Локал тармоқни созлаш..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Ёрдам"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Қўллаш"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "Ок"
@@ -98,7 +104,8 @@ msgstr "Ок"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -107,7 +114,7 @@ msgstr "Ок"
 msgid "Please wait"
 msgstr "Илтимос кутиб туринг"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Илтимос кутиб туринг... Мосламалар қўлланилмоқда"
@@ -143,6 +150,7 @@ msgstr "Адаптер %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Тармоқ маскаси"
@@ -158,6 +166,7 @@ msgid "Started on boot"
 msgstr "Тизим юкланганда ишга туширилган"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP клиенти"
@@ -172,17 +181,19 @@ msgstr ""
 "Mageia бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Янги тармоқ интерфейсини ўрнатиш ва мослаш (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "IP рақами кўрсатилмаган"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Маскасиз"
@@ -253,12 +264,12 @@ msgstr ""
 "\n"
 "Нима қилмоқчисиз?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Ўчириш"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Ёқиш"
@@ -274,8 +285,8 @@ msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 "Илтимос Интернетга тўғридан-тўғри уланган тармоқ интерфейсини кўрсатинг."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Тармоқ ускунаси"
@@ -350,7 +361,11 @@ msgstr "Ички домен номи"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -642,13 +657,14 @@ msgstr "Рухсат этилган манзиллар"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Интерактив файервол"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Демон билан алоқа ўрнатиб бўлмади"
@@ -658,12 +674,12 @@ msgstr "Демон билан алоқа ўрнатиб бўлмади"
 msgid "Log"
 msgstr ""
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Рухсат бериш"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -690,12 +706,12 @@ msgstr "Ман этилган хизматлар"
 msgid "Clear logs"
 msgstr "Логларни тозалаш"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr ""
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr ""
@@ -843,7 +859,7 @@ msgstr "Модем"
 msgid "Enabled"
 msgstr "Ёқиш"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Таърифи"
@@ -885,9 +901,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Диққат"
@@ -2355,12 +2371,12 @@ msgid ""
 "network"
 msgstr ""
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Уланган"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Уланмаган"
@@ -2425,7 +2441,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Метрик"
@@ -2465,19 +2481,22 @@ msgstr "Кабел модем"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr ""
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Тасдиқлаш"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Фойдаланувчи"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Махфий сўз"
@@ -2601,13 +2620,15 @@ msgstr ""
 "Ёзувнинг ҳар қайси нуқта билан ажратилган ўнлик сон шаклида\n"
 "IP рақам бўлиши керак (м-н 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Гейтвэй"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "DNS серверини DHCP'дан аниқлаш"
@@ -2633,21 +2654,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP таймаути (сонияда)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "YP серверини DHCP'дан аниқлаш"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "NTPD серверни DHCP'дан аниқлаш"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP хостнинг номи"
@@ -2658,11 +2683,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP рақами қуйидаги форматда бўлиши шарт: 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Тармоқ маскаси қуйидаги кўринишда бўлиши шарт: 255.255.224.0"
@@ -2681,6 +2708,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Компьютернинг номини DHCP'дан аниқлаш"
@@ -2702,6 +2730,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Тармоқ хотплагинг"
@@ -2770,27 +2799,32 @@ msgstr "Аналог телефон модеми"
 msgid "Analog telephone modem (POTS)"
 msgstr "Аналог телефон модеми"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Скриптда асосланган"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Терминалда асосланган"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3949,90 +3983,93 @@ msgstr ""
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Симсиз тармоқ мосламалари"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Managed"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Репитер"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Иккиламчи"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Авто"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Тармоқнинг номи (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Кодлаш калити"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Махфий сўз"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP фойдаланувчи/махфий сўз"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4040,12 +4077,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP махфий сўз"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4064,12 +4101,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4078,32 +4115,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4117,17 +4159,19 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4138,12 +4182,13 @@ msgid ""
 msgstr ""
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4155,12 +4200,13 @@ msgid ""
 "See iwpspy(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4178,107 +4224,107 @@ msgid ""
 "See iwpriv(8) man page for further information."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP протокол"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "Авто-аниқлаш"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP усули"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4286,12 +4332,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4300,12 +4346,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA сертификат"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4315,12 +4361,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4330,12 +4376,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4353,26 +4399,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4381,24 +4427,24 @@ msgstr ""
 "Частота \"M\" ёки \"G\" билан тугаши керак (масалан, 2.46 GHz учун\n"
 "\"2.46G\"), ёки етарлича \"0\" (нол) қўшинг."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4540,6 +4586,285 @@ msgstr "Улаш"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Тизимда тармоқ адаптери аниқланмади. Илтимос асбоб-ускунани мословчи "
+"воситани ишга туширинг."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Тармоқ интерфейсини олиб ташлаш"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Мослаш учун тармоқ интерфейсини танланг:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"\"%s\" тармоқ интерфейсини олиб ташлашда хато рўй берди:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Табриклаймиз. \"%s\" тармоқ интерфейси муваффақиятли олиб ташланди."
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Алоқаларни бошқариш"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Ускуна: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "IP мосламаси"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "DNS серверлари"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Қидириш домени"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "йўқ"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "статик"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Тизим юкланаётганда ишга тушириш"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Алоқанинг тезлиги"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Алоқа таймаути (сонияда)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Провайдернинг телефон рақами"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Модем учун таймаут"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "Файлни танлаш"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "Кувайт"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Модем товуши"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Картанинг IRQ'си"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Картанинг хотираси (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Картанинг IO'си"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Картанинг IO_0'си"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Ойропа протоколи (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Ишлаб чиқарувчи"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Маълумот ташувчининг синфи"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Модулнинг номи"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Mac рақами"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "Белорус"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Гейтвей манзили қуйидаги шаклда бўлиши шарт: 1.2.3.5"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Гейтвэй:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Интерфейс:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Интернетга уланишни мослаш"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Интернет билан алоқа мосланмаган.\n"
+"Mageia бошқарув марказидан \"%s\" ёрдамчини ишга туширинг"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Хостнинг номи (танлаб бўлади)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Биринчи DNS сервери (танлаб бўлади)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Иккинчи DNS сервери (танлаб бўлади)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Учинчи DNS сервери (танлаб бўлади)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Интернетга уланишни мослаш"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Интернетга уланиш"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Уланишнинг тури: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Ҳолати:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Алоқа синаб кўрилмоқда..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Мосламалар"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4743,11 +5068,6 @@ msgstr "Интерактив файерволдан фойдаланиш"
 msgid "No device found"
 msgstr "Ҳеч қандай ускуна топилмади"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Ускуна: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -4970,6 +5290,103 @@ msgstr "Янги драйверни ўрнатиш"
 msgid "Select a device:"
 msgstr "Ускунани танланг:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, c-format
+msgid "Process attack"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Интерактив файервол"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Ушбу ҳужумчини нима қилишни истайсиз?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Ҳужум тафсилотлари"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Ҳужум вақти: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Тармоқ интерфейси: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Ҳужумнинг тури: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Протокол: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Ҳужумчининг IP рақами: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Ҳужумчининг хости: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Ҳужум қилинган хизмат: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Ҳужум қилинган порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, fuzzy, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Ҳужум қилинган порт: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Эътибор бермаш"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Интерактив файервол"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Симсиз уланиш"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Ушбу хизматни очишни истайсизми?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Ушбу жавобни эслаб қолиш"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5013,18 +5430,6 @@ msgstr "Ички ISDN карта"
 msgid "Protocol for the rest of the world"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Ойропа протоколи (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5075,11 +5480,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Алоқа бошқаруви"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Алоқа синаб кўрилмоқда..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5100,11 +5500,6 @@ msgstr "Шахсий телефон рақамингиз"
 msgid "Provider name (ex provider.net)"
 msgstr "Провайдернинг номи (м-н provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Провайдернинг телефон рақами"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5115,41 +5510,6 @@ msgstr "Провайдернинг DNS 1 (танласа бўлади)"
 msgid "Provider DNS 2 (optional)"
 msgstr "Провайдернинг DNS 2 (танласа бўлади)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr ""
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Алоқанинг тезлиги"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Алоқа таймаути (сонияда)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Картанинг IRQ'си"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Картанинг хотираси (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Картанинг IO'си"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Картанинг IO_0'си"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5314,16 +5674,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Доменнинг номи"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Биринчи DNS сервери (танлаб бўлади)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Иккинчи DNS сервери (танлаб бўлади)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5621,11 +5971,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS сервернинг манзили қуйидаги форматда бўлиши шарт: 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Гейтвей манзили қуйидаги шаклда бўлиши шарт: 1.2.3.5"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6054,16 +6399,6 @@ msgstr ""
 #~ "\n"
 #~ "Мен шу адаптер билан локал тармоғингизни ўрнатаман."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Тизимда тармоқ адаптери аниқланмади. Илтимос асбоб-ускунани мословчи "
-#~ "воситани ишга туширинг."
-
-#~ msgid "Connection type: "
-#~ msgstr "Уланишнинг тури: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s'дан аллақачон фойдаланилмоқда\n"
 
@@ -6104,143 +6439,18 @@ msgstr ""
 #~ msgid "Flag"
 #~ msgstr "Байроқ"
 
-#~ msgid "none"
-#~ msgstr "йўқ"
-
 #~ msgid "Level"
 #~ msgstr "Даража"
 
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "Ўзгаришлар тўлиқ қўлланилиши учун тизимга бошқадан киришингиз керак"
 
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Ушбу ҳужумчини нима қилишни истайсиз?"
-
-#~ msgid "Attack details"
-#~ msgstr "Ҳужум тафсилотлари"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Ҳужум вақти: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Тармоқ интерфейси: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Ҳужумнинг тури: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Протокол: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Ҳужумчининг IP рақами: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Ҳужумчининг хости: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Ҳужум қилинган хизмат: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Ҳужум қилинган порт: %s"
-
-#~ msgid "Ignore"
-#~ msgstr "Эътибор бермаш"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Ушбу хизматни очишни истайсизми?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Ушбу жавобни эслаб қолиш"
-
-#~ msgid "Gateway:"
-#~ msgstr "Гейтвэй:"
-
-#~ msgid "Interface:"
-#~ msgstr "Интерфейс:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Алоқаларни бошқариш"
-
-#~ msgid "IP configuration"
-#~ msgstr "IP мосламаси"
-
-#~ msgid "DNS servers"
-#~ msgstr "DNS серверлари"
-
-#~ msgid "Search Domain"
-#~ msgstr "Қидириш домени"
-
-#~ msgid "static"
-#~ msgstr "статик"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Тизим юкланаётганда ишга тушириш"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Модем учун таймаут"
-
-#~ msgid "Modem sound"
-#~ msgstr "Модем товуши"
-
-#~ msgid "Vendor"
-#~ msgstr "Ишлаб чиқарувчи"
-
-#~ msgid "Media class"
-#~ msgstr "Маълумот ташувчининг синфи"
-
-#~ msgid "Module name"
-#~ msgstr "Модулнинг номи"
-
-#~ msgid "Mac Address"
-#~ msgstr "Mac рақами"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Тармоқ интерфейсини олиб ташлаш"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "\"%s\" тармоқ интерфейсини олиб ташлашда хато рўй берди:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Табриклаймиз. \"%s\" тармоқ интерфейси муваффақиятли олиб ташланди."
-
 #~ msgid "Disconnect..."
 #~ msgstr "Узиш..."
 
 #~ msgid "Connect..."
 #~ msgstr "Уланиш..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Интернетга уланишни мослаш"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Хостнинг номи (танлаб бўлади)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Учинчи DNS сервери (танлаб бўлади)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Интернетга уланишни мослаш"
-
-#~ msgid "Internet access"
-#~ msgstr "Интернетга уланиш"
-
-#~ msgid "Status:"
-#~ msgstr "Ҳолати:"
-
-#~ msgid "Parameters"
-#~ msgstr "Мосламалар"
-
 #~ msgid "Attacker"
 #~ msgstr "Ҳужумчи"
 
diff --git a/po/vi.po b/po/vi.po
index ce1993d..35bdd91 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: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -27,14 +27,16 @@ msgid "Interface"
 msgstr "Giao diện"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Địa chỉ IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Giao thức"
@@ -70,23 +72,27 @@ msgid "Configure Local Area Network..."
 msgstr "Cấu hình mạng cục bộ..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Trợ giúp"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "áp dụng"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Bỏ qua"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "OK"
@@ -96,7 +102,8 @@ msgstr "OK"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -105,7 +112,7 @@ msgstr "OK"
 msgid "Please wait"
 msgstr "Hãy đợi"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Hãy chờ...đang áp dụng cấu hình"
@@ -141,6 +148,7 @@ msgstr "Adapter %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Mặt nạ mạng"
@@ -156,6 +164,7 @@ msgid "Started on boot"
 msgstr "Được chạy lúc khởi động "
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Máy khách DHCP"
@@ -170,17 +179,19 @@ msgstr ""
 "Hãy chạy \"Bổ sung giao diện\" trong Trung Tâm Điều Khiển Mageialinux"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Thiết lập giao diện mạng mới (LAN, ISDN, ADSL, ...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Không có IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Không có Mask"
@@ -250,12 +261,12 @@ msgstr ""
 "\n"
 "Bạn muốn làm gì?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Tắt"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Bật"
@@ -270,8 +281,8 @@ msgstr "Cấu hình lại"
 msgid "Please select the network interface directly connected to the internet."
 msgstr ""
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Thiết bị mạng"
@@ -337,7 +348,11 @@ msgstr "Tên miền nội bộ"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -630,13 +645,14 @@ msgstr "Cho phép mọi địa chỉ"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Tường lửa"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Không thể kết nối được với máy chủ"
@@ -646,12 +662,12 @@ msgstr "Không thể kết nối được với máy chủ"
 msgid "Log"
 msgstr "Bản ghi"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, fuzzy, c-format
 msgid "Allow"
 msgstr "Toàn bộ"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr ""
@@ -678,12 +694,12 @@ msgstr "Sao lưu các tập tin người dùng"
 msgid "Clear logs"
 msgstr "Xóa hết trong bản ghi"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Danh sách cấm"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Danh sách cho phép"
@@ -831,7 +847,7 @@ msgstr "Phương thức"
 msgid "Enabled"
 msgstr "Bật"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Mô tả"
@@ -873,9 +889,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Cảnh báo"
@@ -2400,12 +2416,12 @@ msgstr ""
 "Cảnh báo, phát hiện thấy một kết nối Internet khác, có thể là đang dùng mạng "
 "của bạn"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Đã kết nối"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Chưa kết nối"
@@ -2470,7 +2486,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Hệ mét"
@@ -2510,19 +2526,22 @@ msgstr "Card loại: "
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Dùng BPALogin (cần cho Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Xác nhận"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Account đăng nhập (tên người dùng)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Mật khẩu tài khoản"
@@ -2647,13 +2666,15 @@ msgstr ""
 "Mỗi một mục cần được điền vào một địa chỉ IP là ký hiệu thập\n"
 "phân và dấu chấm đầy đủ (VD: 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Cổng kết nối"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Nhận các DNS server từ DHCP"
@@ -2680,21 +2701,25 @@ msgstr ""
 "Theo mặc định, tên miền dò tìm sẽ đặt theo máy chủ có tên đầy đủ hợp lệ"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Hết thời gian kết nối DHCP (theo giây):"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Nhận các YP server từ DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Nhận các NTPD server từ DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "Tên chủ DHCP"
@@ -2705,11 +2730,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Địa chỉ IP phải có dạng 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Địa chỉ netmask nên có định dạng là 255.255.224.0"
@@ -2728,6 +2755,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Chỉ định tên chủ (hostname) từ địa chỉ DHCP"
@@ -2749,6 +2777,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Hotplugging cho mạng"
@@ -2817,27 +2846,32 @@ msgstr ""
 msgid "Analog telephone modem (POTS)"
 msgstr ""
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Script-based"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal-based"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3996,90 +4030,93 @@ msgstr "WPA Pre-Shared Key"
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, fuzzy, c-format
 msgid "Wireless settings"
 msgstr "Kết nối không dây"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Operating Mode"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Được quản lý"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Master"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeater"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Thứ cấp"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Tự động"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Tên mạng (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Phương thức mã hóa"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Khóa mã hóa"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Mật khẩu"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "Account đăng nhập (tên người dùng)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4087,12 +4124,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Mật khẩu"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4111,12 +4148,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "Tên chứng thực"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4125,32 +4162,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "ID mạng"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Tần số hoạt động"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Ngưỡng nhạy cảm"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitrate (in b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4174,17 +4216,19 @@ msgstr ""
 "số\n"
 "này là auto, fixed hoặc off."
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Phân mảnh"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Tham số bổ sung cho lệnh iwconfig"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4200,12 +4244,13 @@ msgstr ""
 "Xem thêm trang hướng dẫn của iwconfig để biết thêm chi tiết."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Tham số bổ sung cho lệnh iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4223,12 +4268,13 @@ msgstr ""
 "chất lượng kết nối, độ mạnh tín hiệu, độ nhiễu.\n"
 "/n"
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Tham số bổ sung cho lệnh iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4254,107 +4300,107 @@ 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:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Giao thức"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Dò tìm Tự động"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Phương thức"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4362,12 +4408,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4376,12 +4422,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Kiểu chứng thực"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4391,12 +4437,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4406,12 +4452,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4429,26 +4475,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4457,7 +4503,7 @@ msgstr ""
 "Tần số nên có tiếp vị ngữ k, M hay G (ví dụ: \"2.46G\" là cho tần số 2.46 "
 "GHz), hay thêm đủ '0' (các số không)."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4466,17 +4512,17 @@ msgstr ""
 "Rate nên có tiếp vị ngữ k, M hay G (ví dụ: \"11M\" cho 11M), hoặc thêm đủ "
 "'0' (các số không)."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr ""
@@ -4621,6 +4667,287 @@ msgstr "Kết nối"
 msgid "Hostname changed to \"%s\""
 msgstr ""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Không có adapter mạng ethernet được tìm thấy trong hệ thống. Hãy chạy công "
+"cụ cấu hình phần cứng."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Bỏ giao diện mạng"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Chọn giao diện mạng để cấu hình:"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Lỗi xảy ra khi xóa giao diện mạng \"%s\":\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Chúc mừng, giao diện mạng \"%s\" đã được xóa"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Quản lý kết nối"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Thiết bị:"
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Cấu hình IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Máy chủ DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Tìm kiếm miền"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "không có"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "tĩnh"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "Chạy lúc khởi động "
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Chế độ quay số"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Tốc độ kết nối"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Hết thời gian kết nối (theo giây):"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Số điện thoại của nhà cung cấp"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Flow control"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Dòng kết thúc"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Thời hạn modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Use lock file"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Chờ dialup tone trước khi quay số"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "thời gian chờ bận"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Âm thanh modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "Card IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Card mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "Card IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "Card IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Giao thức châu Âu (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Giao thức cho phần còn lại của thế giới \n"
+" không có D-Channel (kênh thuê riêng)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Nhà SX"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Loại Phương tiện"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "Tên module"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Địa chỉ Mac"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Vị trí trên Bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Địa chỉ Gateway nên có dạng 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Cổng kết nối:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Giao diện :"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Cấu hình kết nối Internet"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Bạn chưa cấu hình kết nối internet.\n"
+"Hãy chạy \"%s\" từ Trung Tâm Điều Khiển Mageialinux"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "Tên chủ (host) (tùy ý)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Máy chủ DNS thứ nhất"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Máy chủ DNS thứ hai"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Máy chủ DNS thứ ba (chọn thêm)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Cấu Hình Kết Nối Internet"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Truy cập Internet"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Kiểu kết nối:"
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Tình trạng:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Đang kiểm tra kết nối..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Các thông số"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4827,11 +5154,6 @@ msgstr "Sử dụng tường lửa"
 msgid "No device found"
 msgstr "Không tìm thấy thiết bị"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Thiết bị:"
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5056,6 +5378,103 @@ msgstr "Cài đặt driver mới"
 msgid "Select a device:"
 msgstr "Chọn thiết bị:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Dịch vụ bị tấn công"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Tường lửa hoạt động: phát hiện có đột nhập"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Bạn muốn bỏ kẻ tấn công vào danh sách đen không?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Thông tin tấn công"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Thời gian tấn công: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Giao diện mạng: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Kiểu tấn công: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Giao thức: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP address của kẻ tấn công: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Hostname của kẻ tấn công: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Dịch vụ bị tấn công: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Cổng bị tấn công: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Kiểu tấn công ICMP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Luôn trong danh sách đen (không phải hỏi lại)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Bỏ qua"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Tường lửa hoạt động: phát hiện có đột nhập"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Kết nối không dây"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "Bạn muốn cấu hình không?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, fuzzy, c-format
+msgid "Remember this answer"
+msgstr "Ghi nhớ mật khẩu này"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5099,20 +5518,6 @@ msgstr "Card ISDN lắp trong"
 msgid "Protocol for the rest of the world"
 msgstr "Giao thức cho phần còn lại của thế giới"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Giao thức châu Âu (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Giao thức cho phần còn lại của thế giới \n"
-" không có D-Channel (kênh thuê riêng)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5161,11 +5566,6 @@ msgstr ""
 msgid "Connection control"
 msgstr ""
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Đang kiểm tra kết nối..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5186,11 +5586,6 @@ msgstr "Số điện thoại cá nhân của bạn"
 msgid "Provider name (ex provider.net)"
 msgstr "Tên nhà cung cấp (VD: provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Số điện thoại của nhà cung cấp"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5201,41 +5596,6 @@ msgstr "DNS 1 của nhà cung cấp (không bắt buộc)"
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 của nhà cung cấp (không bắt buộc)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Chế độ quay số"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Tốc độ kết nối"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Hết thời gian kết nối (theo giây):"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "Card IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Card mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "Card IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "Card IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5400,16 +5760,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "Tên miền"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Máy chủ DNS thứ nhất"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Máy chủ DNS thứ hai"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5721,11 +6071,6 @@ msgstr ""
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Địa chỉ máy chủ DNS nên có dạng 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Địa chỉ Gateway nên có dạng 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6172,16 +6517,6 @@ msgstr ""
 #~ "\n"
 #~ "Chuẩn bị thiết lập mạng cục bộ của bạn với adapter đó."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Không có adapter mạng ethernet được tìm thấy trong hệ thống. Hãy chạy "
-#~ "công cụ cấu hình phần cứng."
-
-#~ msgid "Connection type: "
-#~ msgstr "Kiểu kết nối:"
-
 #~ msgid "%s already in use\n"
 #~ msgstr "Đang dùng %s rồi\n"
 
@@ -7168,9 +7503,6 @@ msgstr ""
 #~ msgid "discard"
 #~ msgstr "bỏ"
 
-#~ msgid "none"
-#~ msgstr "không có"
-
 #~ msgid "tunnel"
 #~ msgstr "tunnel"
 
@@ -7198,178 +7530,12 @@ msgstr ""
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "Bạn cần đăng xuất rồi đăng nhập trở lại để các thay đổi có tác dụng"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Dịch vụ bị tấn công"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Tường lửa hoạt động: phát hiện có đột nhập"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Bạn muốn bỏ kẻ tấn công vào danh sách đen không?"
-
-#~ msgid "Attack details"
-#~ msgstr "Thông tin tấn công"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Thời gian tấn công: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Giao diện mạng: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Kiểu tấn công: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Giao thức: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "IP address của kẻ tấn công: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "Hostname của kẻ tấn công: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Dịch vụ bị tấn công: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Cổng bị tấn công: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Kiểu tấn công ICMP: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Luôn trong danh sách đen (không phải hỏi lại)"
-
-#~ msgid "Ignore"
-#~ msgstr "Bỏ qua"
-
-#, fuzzy
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Tường lửa hoạt động: phát hiện có đột nhập"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Kết nối không dây"
-
-#, fuzzy
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Bạn muốn cấu hình không?"
-
-#, fuzzy
-#~ msgid "Remember this answer"
-#~ msgstr "Ghi nhớ mật khẩu này"
-
-#~ msgid "Gateway:"
-#~ msgstr "Cổng kết nối:"
-
-#~ msgid "Interface:"
-#~ msgstr "Giao diện :"
-
-#~ msgid "Manage connections"
-#~ msgstr "Quản lý kết nối"
-
-#~ msgid "IP configuration"
-#~ msgstr "Cấu hình IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Máy chủ DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "Tìm kiếm miền"
-
-#~ msgid "static"
-#~ msgstr "tĩnh"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "Chạy lúc khởi động "
-
-#~ msgid "Flow control"
-#~ msgstr "Flow control"
-
-#~ msgid "Line termination"
-#~ msgstr "Dòng kết thúc"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Thời hạn modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Use lock file"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Chờ dialup tone trước khi quay số"
-
-#~ msgid "Busy wait"
-#~ msgstr "thời gian chờ bận"
-
-#~ msgid "Modem sound"
-#~ msgstr "Âm thanh modem"
-
-#~ msgid "Vendor"
-#~ msgstr "Nhà SX"
-
-#~ msgid "Media class"
-#~ msgstr "Loại Phương tiện"
-
-#~ msgid "Module name"
-#~ msgstr "Tên module"
-
-#~ msgid "Mac Address"
-#~ msgstr "Địa chỉ Mac"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Vị trí trên Bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Bỏ giao diện mạng"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Lỗi xảy ra khi xóa giao diện mạng \"%s\":\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Chúc mừng, giao diện mạng \"%s\" đã được xóa"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Ngắt kết nối..."
 
 #~ msgid "Connect..."
 #~ msgstr "Kết nối..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Cấu hình kết nối Internet"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "Tên chủ (host) (tùy ý)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Máy chủ DNS thứ ba (chọn thêm)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Cấu Hình Kết Nối Internet"
-
-#~ msgid "Internet access"
-#~ msgstr "Truy cập Internet"
-
-#~ msgid "Status:"
-#~ msgstr "Tình trạng:"
-
-#~ msgid "Parameters"
-#~ msgstr "Các thông số"
-
 #~ msgid "Attacker"
 #~ msgstr "Thông tin tấn công"
 
diff --git a/po/wa.po b/po/wa.po
index 6f49178..1c44295 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+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"
@@ -30,14 +30,16 @@ msgid "Interface"
 msgstr "Eterface"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "Adresse IP"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "Protocole"
@@ -73,23 +75,27 @@ msgid "Configure Local Area Network..."
 msgstr "Apontyî li rantoele locåle..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "Aidance"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "Mete en ouve"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "Rinoncî"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "'l est bon"
@@ -99,7 +105,8 @@ msgstr "'l est bon"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -108,7 +115,7 @@ msgstr "'l est bon"
 msgid "Please wait"
 msgstr "Tårdjîz on pô, s' i vs plait"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Tårdjîz s' i vs plait, dji mete en alaedje l' apontiaedje"
@@ -144,6 +151,7 @@ msgstr "Adaptoe %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "Maske rantoele"
@@ -159,6 +167,7 @@ msgid "Started on boot"
 msgstr "En alaedje a l' enondaedje"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "Cliyint DHCP"
@@ -173,17 +182,19 @@ msgstr ""
 "Enondez li macrea «Radjouter ene eterface» a pårti do cinte di contrôle."
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "Apontyî ene novele eterface rantoele (locåle, RDIS, ADSL,...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "Nole adresse IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "Nou masse rantoele"
@@ -255,12 +266,12 @@ msgstr ""
 "\n"
 "Cwè voloz vs fé?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "Essocter"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "Mete en alaedje"
@@ -275,8 +286,8 @@ msgstr "Rapontyî"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "Tchoezixhoz l' eterface rantoele raloyeye al Daegntoele."
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "Éndjin rantoele"
@@ -343,7 +354,11 @@ msgstr "Li no d' dominne eployî divintrinnmint"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -639,13 +654,14 @@ msgstr "Permetowès adresses"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "Côpe feu eteractif"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "Dji n' a savou m' raloyî å demon"
@@ -655,12 +671,12 @@ msgstr "Dji n' a savou m' raloyî å demon"
 msgid "Log"
 msgstr "Djournå"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "Permete"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "Bloker"
@@ -687,12 +703,12 @@ msgstr "Siervices blokés"
 msgid "Clear logs"
 msgstr "Netyî les djournås"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "Noere djivêye"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "Blanke djivêye"
@@ -840,7 +856,7 @@ msgstr "Môde"
 msgid "Enabled"
 msgstr "Mete en alaedje"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "Discrijhaedje"
@@ -882,9 +898,9 @@ msgid ""
 "profile."
 msgstr ""
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "Adviertixhmint"
@@ -2383,12 +2399,12 @@ msgstr ""
 "Asteme, èn ôte raloyaedje al daegntoele a stî detecté, motoit eployant vosse "
 "rantoele locåle"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "Raloyî"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "Nén raloyî"
@@ -2453,7 +2469,7 @@ msgstr ""
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "Metrike"
@@ -2493,19 +2509,22 @@ msgstr "Modem pa cåbe"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "Eployî BPALogin (end a mezåjhe po Telstra)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "Otintifiaedje"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "No d' elodjaedje do conte (no d' uzeu)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "Sicret do conte"
@@ -2633,13 +2652,15 @@ msgstr ""
 "Totafwait doet esse sicrît come ene adresse IP, avou des\n"
 "ponts inte les limeros (metans: 1.2.3.4)."
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "Pasrele"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "Aveur les sierveus DNS avou l' DHCP"
@@ -2665,21 +2686,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "Li prémetou dominne di cweraedje est pris do no do lodjoe"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "Tårdjaedje (e seg) pol DHCP"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "Aveur les sierveus YP avou l' DHCP"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "Aveur les sierveus NTPD avou l' DHCP"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "No di lodjoe po DHCP"
@@ -2690,11 +2715,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "L' adresse IP doet esse del cogne 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "Li maske rantoele doet esse del cogne 255.255.224.0"
@@ -2713,6 +2740,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, fuzzy, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "Assiner li no d' lodjoe a pårti di l' adresse DHCP"
@@ -2734,6 +2762,7 @@ msgid ""
 msgstr ""
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Tchôcaedje a tchôd del rantoele"
@@ -2804,27 +2833,32 @@ msgstr "POTS (fyis do telefone)"
 msgid "Analog telephone modem (POTS)"
 msgstr "Modem so fyis do telefone analodjike"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Pa scripe"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Pa terminå"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -3983,12 +4017,12 @@ msgstr "Clé WPA pré-pårtaedjeye"
 msgid "WPA/WPA2 Enterprise"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
@@ -3997,78 +4031,81 @@ msgstr ""
 "Li cåte sins fyis da vosse est dismetowe, i vs el fåt d' aprume tchôkî sol "
 "boton po l' esprinde."
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "Apontiaedjes del rantoele sins fyis"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Môde d' operåcion"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "Manaedjî"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "Mwaisse"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "Repeteu"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "Segondaire"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "Otomatike"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "No del rantoele (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "Môde ecriptaedje"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Clé d' ecriptaedje"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, fuzzy, c-format
 msgid "Hide password"
 msgstr "Sicret"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, fuzzy, c-format
 msgid "EAP Login/Username"
 msgstr "No d' elodjaedje do conte (no d' uzeu)"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4076,12 +4113,12 @@ msgid ""
 "  DOMAIN\\username"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, fuzzy, c-format
 msgid "EAP Password"
 msgstr "Sicret"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4100,12 +4137,12 @@ msgid ""
 "the username and password values specified here."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, fuzzy, c-format
 msgid "EAP client certificate"
 msgstr "No d' l' acertineure"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4114,32 +4151,37 @@ msgid ""
 " Note: other related settings are shown on the Advanced page."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Idintifiant Rantoele"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Frekince d' operance"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4153,18 +4195,20 @@ msgid ""
 "or off."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Fragmintåcion"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Årgumints di rawete po iwconfig"
 
 # RATOURNAEDJE: ap, channel, commit, enc, power, retry, sens, txpower
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4180,12 +4224,13 @@ msgstr ""
 "Loukîz li pådje di man iwconfig(8) po pus di racsegnes."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Årgumints di rawete pol comande iwspy"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4202,12 +4247,13 @@ msgstr ""
 "\n"
 "Loukîz l' pådje di man iwpspy(8) po pus di racsegnes."
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Årgumints di rawete pol comande iwpriv"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4236,107 +4282,107 @@ msgstr ""
 "\n"
 "Lijhoz l' pådje di manuel iwpriv(8) po pus di racsegnes."
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, fuzzy, c-format
 msgid "EAP Protocol"
 msgstr "Protocole"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "Auto Detect"
 msgstr "Deteccion otomatike"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, fuzzy, c-format
 msgid "WPA"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, 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:560
+#: ../lib/network/connection/wireless.pm:570
 #, fuzzy, c-format
 msgid "EAP Mode"
 msgstr "Môde"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "PEAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, fuzzy, c-format
 msgid "MSCHAPV2"
 msgstr "CHAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4344,12 +4390,12 @@ msgid ""
 "tunnelled identity, e.g., TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4358,12 +4404,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, fuzzy, c-format
 msgid "EAP CA certificate"
 msgstr "Acertineure"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4373,12 +4419,12 @@ msgid ""
 "when using TLS or TTLS or PEAP."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4388,12 +4434,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4411,26 +4457,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "I gn a mezåjhe d' ene clé d' ecriptaedje."
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4439,7 +4485,7 @@ msgstr ""
 "Li frekince doet aveur ene cawete «k», «M» ou «G» (par egzimpe, «2.46G» po "
 "ene frekince di 2.46 GHz), oudonbén radjoutez des zeros assez."
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4448,17 +4494,17 @@ msgstr ""
 "Li frekince doet aveur ene cawete «k», «M» ou «G» (par egzimpe, «2.46G» po "
 "ene frekince di 2.46 GHz), oudonbén radjoutez des zeros assez."
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "Aloyî avou l' rantoele sins fyis «%s» so l' eterface %s"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "Aloyaedje avou l' rantoele sins fyis pierdou so l' eterface %s"
@@ -4604,6 +4650,287 @@ msgstr "Si raloyî"
 msgid "Hostname changed to \"%s\""
 msgstr "Li no do lodjoe a stî candjî a «%s»"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Nole cåte rantoele a stî detectêye so vosse sistinme.\n"
+"Eployîz l' usteye d' apontiaedje di l' éndjolreye s' i vs plait."
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, c-format
+msgid "Remove a network interface"
+msgstr "Oister ene eterface rantoele"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "Tchoezixhoz l' eterface rantoele a-z apontyî"
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"Åk n' a nén stî tot disfaçant l' eterface rantoele «%s»:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "Proficiate, l' eterface rantoele «%s» a stî disfacêye comifåt"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, c-format
+msgid "Manage connections"
+msgstr "Manaedjî les raloyaedjes"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "Éndjin: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, c-format
+msgid "IP configuration"
+msgstr "Apontiaedje IP"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, c-format
+msgid "DNS servers"
+msgstr "Sierveus DNS"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, c-format
+msgid "Search Domain"
+msgstr "Dominne di cweraedje"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr "nouk"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "static"
+msgstr "sitatike"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr "DHCP"
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, c-format
+msgid "Start at boot"
+msgstr "En alaedje a l' enondaedje"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "Môde di houcaedje"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "Roedeu do raloyaedje"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Tårdjaedje (e seg) pol raloyaedje"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "Limero di telefone di l' ahesseu"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, c-format
+msgid "Flow control"
+msgstr "Control di floûs"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr "Fén d' roye"
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, c-format
+msgid "Modem timeout"
+msgstr "Tårdjaedje do modem"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, c-format
+msgid "Use lock file"
+msgstr "Eployî on fitchî-sera"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr "Ratinde li tonalité dvant d' fé l' limero"
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, c-format
+msgid "Busy wait"
+msgstr "Ocuper, ratinde"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, c-format
+msgid "Modem sound"
+msgstr "Son do modem"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "IRQ del cåte"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Canå DMA del cåte"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "I/R del cåte"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "I/R del cåte (0)"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Protocole po l' Urope (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protocole po les ôtes payis \n"
+" nou canå D (lenes di fyis louwés)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr "Vindeu"
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr "Classe di media"
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, c-format
+msgid "Module name"
+msgstr "No do module"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, c-format
+msgid "Mac Address"
+msgstr "Adresse éndjolreye (MAC)"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, c-format
+msgid "Bus"
+msgstr "Bus"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr "Eplaeçmint sol bus"
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "L' adresse IP del pasrele doet esse del cogne 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Gateway:"
+msgstr "Pasrele:"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, c-format
+msgid "Interface:"
+msgstr "Eterface:"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Apontiaedje do raloyaedje al rantoele daegnrece"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"Vos n' avoz nou raloyaedje al daegntoele d' apontyî.\n"
+"Enondez li macrea «%s» a pårti do cinte di contrôle."
+
+#: ../lib/network/drakconnect/global.pm:50
+#, c-format
+msgid "Host name (optional)"
+msgstr "No do lodjoe (opcionel)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Prumî sierveu DNS (opcionel)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Deujhinme sierveu DNS (opcionel)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, c-format
+msgid "Third DNS server (optional)"
+msgstr "Troejhinme sierveu DNS (opcionel)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Apontiaedje do raloyaedje al rantoele daegnrece"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, c-format
+msgid "Internet access"
+msgstr "Accès al rantoele daegnrece"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, c-format
+msgid "Connection type: "
+msgstr "Sôre di raloyaedje: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, c-format
+msgid "Status:"
+msgstr "Sitatut:"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "Dji saye vosse raloyaedje..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, c-format
+msgid "Parameters"
+msgstr "Parametes"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4810,11 +5137,6 @@ msgstr "Eployî l' côpe feu eteractif"
 msgid "No device found"
 msgstr "Nol éndjin di trové"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "Éndjin: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5048,6 +5370,103 @@ msgstr "Astaler on novea mineu"
 msgid "Select a device:"
 msgstr "Tchoezixhoz èn éndjin:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "Atake di siervice"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "Côpe-feu eteractif: detectaedje d' on hacneu"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "Cwè vloz vs fé avou ci hacneu la?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr "Detays di l' atake"
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr "Date ey eure di l' atake: %s"
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, c-format
+msgid "Network interface: %s"
+msgstr "Eterface rantoele: %s"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr "Sôre d' atake: %s"
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protocole: %s"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Adresse IP do hacneu: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "No d' lodjoe do hacneu: %s"
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Siervice k' a stî ataké: %s"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Pôrt k' a stî ataké: %s"
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "Sôre di l' atake ICMP: %s"
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Tofer mete en ene noere djivêye (èn pus dmander)"
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr "Passer houte"
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, c-format
+msgid "Interactive Firewall: new service"
+msgstr "Côpe-feu eteractif: novea siervice"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "Raloyaedje sins fyis"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, c-format
+msgid "Do you want to open this service?"
+msgstr "Voloz vs drovi ç' siervice la?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr "Si rmimbrer di cisse response ci"
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5091,20 +5510,6 @@ msgstr "Cåte RDIS divintrinne"
 msgid "Protocol for the rest of the world"
 msgstr "Protocole po les ôtes payis"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Protocole po l' Urope (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protocole po les ôtes payis \n"
-" nou canå D (lenes di fyis louwés)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5155,11 +5560,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "Controle di raloyaedje"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "Dji saye vosse raloyaedje..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5180,11 +5580,6 @@ msgstr "Li limero di telefone da vosse"
 msgid "Provider name (ex provider.net)"
 msgstr "No do ahesseu (eg: walonet.be)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "Limero di telefone di l' ahesseu"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5195,41 +5590,6 @@ msgstr "1î DNS do ahesseu (opcionel)"
 msgid "Provider DNS 2 (optional)"
 msgstr "2inme DNS do ahesseu (opcionel)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "Môde di houcaedje"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "Roedeu do raloyaedje"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "Tårdjaedje (e seg) pol raloyaedje"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "IRQ del cåte"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "Canå DMA del cåte"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "I/R del cåte"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "I/R del cåte (0)"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5396,16 +5756,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "No d' dominne"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "Prumî sierveu DNS (opcionel)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "Deujhinme sierveu DNS (opcionel)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5715,11 +6065,6 @@ msgstr "Et po fini, vos ploz eto dner les adresses IP di vosse sierveu DNS."
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "L' adresse IP do sierveu DNS doet esse del cogne 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "L' adresse IP del pasrele doet esse del cogne 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
@@ -6190,16 +6535,6 @@ msgstr "Eployî pôrt UDP specifike"
 #~ "\n"
 #~ "Dji va-st apontyî vosse rantoele locåle avou cisse cåte la."
 
-#~ msgid ""
-#~ "No ethernet network adapter has been detected on your system. Please run "
-#~ "the hardware configuration tool."
-#~ msgstr ""
-#~ "Nole cåte rantoele a stî detectêye so vosse sistinme.\n"
-#~ "Eployîz l' usteye d' apontiaedje di l' éndjolreye s' i vs plait."
-
-#~ msgid "Connection type: "
-#~ msgstr "Sôre di raloyaedje: "
-
 #~ msgid "%s already in use\n"
 #~ msgstr "%s est ddja en alaedje\n"
 
@@ -6359,9 +6694,6 @@ msgstr "Eployî pôrt UDP specifike"
 #~ msgid "Flag"
 #~ msgstr "Drapea"
 
-#~ msgid "none"
-#~ msgstr "nouk"
-
 #~ msgid "tunnel"
 #~ msgstr "tunel"
 
@@ -6386,178 +6718,15 @@ msgstr "Eployî pôrt UDP specifike"
 #~ msgid "You need to log out and back in again for changes to take effect"
 #~ msgstr "Vos vs divoz dislodjî eyet relodjî po les candjmints esse efectifs"
 
-#, fuzzy
-#~ msgid "Process attack"
-#~ msgstr "Atake di siervice"
-
-#~ msgid "Interactive Firewall: intrusion detected"
-#~ msgstr "Côpe-feu eteractif: detectaedje d' on hacneu"
-
-#~ msgid "What do you want to do with this attacker?"
-#~ msgstr "Cwè vloz vs fé avou ci hacneu la?"
-
-#~ msgid "Attack details"
-#~ msgstr "Detays di l' atake"
-
-#~ msgid "Attack time: %s"
-#~ msgstr "Date ey eure di l' atake: %s"
-
-#~ msgid "Network interface: %s"
-#~ msgstr "Eterface rantoele: %s"
-
-#~ msgid "Attack type: %s"
-#~ msgstr "Sôre d' atake: %s"
-
-#~ msgid "Protocol: %s"
-#~ msgstr "Protocole: %s"
-
-#~ msgid "Attacker IP address: %s"
-#~ msgstr "Adresse IP do hacneu: %s"
-
-#~ msgid "Attacker hostname: %s"
-#~ msgstr "No d' lodjoe do hacneu: %s"
-
-#~ msgid "Service attacked: %s"
-#~ msgstr "Siervice k' a stî ataké: %s"
-
-#~ msgid "Port attacked: %s"
-#~ msgstr "Pôrt k' a stî ataké: %s"
-
-#~ msgid "Type of ICMP attack: %s"
-#~ msgstr "Sôre di l' atake ICMP: %s"
-
-#~ msgid "Always blacklist (do not ask again)"
-#~ msgstr "Tofer mete en ene noere djivêye (èn pus dmander)"
-
-#~ msgid "Ignore"
-#~ msgstr "Passer houte"
-
-#~ msgid "Interactive Firewall: new service"
-#~ msgstr "Côpe-feu eteractif: novea siervice"
-
-#, fuzzy
-#~ msgid "Process connection"
-#~ msgstr "Raloyaedje sins fyis"
-
-#~ msgid "Do you want to open this service?"
-#~ msgstr "Voloz vs drovi ç' siervice la?"
-
-#~ msgid "Remember this answer"
-#~ msgstr "Si rmimbrer di cisse response ci"
-
 #~ msgid "Use Cisco-UDP encapsulation"
 #~ msgstr "Eployî ecapsulaedje Cisco-UDP"
 
-#~ msgid "Gateway:"
-#~ msgstr "Pasrele:"
-
-#~ msgid "Interface:"
-#~ msgstr "Eterface:"
-
-#~ msgid "Manage connections"
-#~ msgstr "Manaedjî les raloyaedjes"
-
-#~ msgid "IP configuration"
-#~ msgstr "Apontiaedje IP"
-
-#~ msgid "DNS servers"
-#~ msgstr "Sierveus DNS"
-
-#~ msgid "Search Domain"
-#~ msgstr "Dominne di cweraedje"
-
-#~ msgid "static"
-#~ msgstr "sitatike"
-
-#~ msgid "DHCP"
-#~ msgstr "DHCP"
-
-#~ msgid "Start at boot"
-#~ msgstr "En alaedje a l' enondaedje"
-
-#~ msgid "Flow control"
-#~ msgstr "Control di floûs"
-
-#~ msgid "Line termination"
-#~ msgstr "Fén d' roye"
-
-#~ msgid "Modem timeout"
-#~ msgstr "Tårdjaedje do modem"
-
-#~ msgid "Use lock file"
-#~ msgstr "Eployî on fitchî-sera"
-
-#~ msgid "Wait for dialup tone before dialing"
-#~ msgstr "Ratinde li tonalité dvant d' fé l' limero"
-
-#~ msgid "Busy wait"
-#~ msgstr "Ocuper, ratinde"
-
-#~ msgid "Modem sound"
-#~ msgstr "Son do modem"
-
-#~ msgid "Vendor"
-#~ msgstr "Vindeu"
-
-#~ msgid "Media class"
-#~ msgstr "Classe di media"
-
-#~ msgid "Module name"
-#~ msgstr "No do module"
-
-#~ msgid "Mac Address"
-#~ msgstr "Adresse éndjolreye (MAC)"
-
-#~ msgid "Bus"
-#~ msgstr "Bus"
-
-#~ msgid "Location on the bus"
-#~ msgstr "Eplaeçmint sol bus"
-
-#~ msgid "Remove a network interface"
-#~ msgstr "Oister ene eterface rantoele"
-
-#~ msgid ""
-#~ "An error occurred while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Åk n' a nén stî tot disfaçant l' eterface rantoele «%s»:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been successfully "
-#~ "deleted"
-#~ msgstr "Proficiate, l' eterface rantoele «%s» a stî disfacêye comifåt"
-
 #~ msgid "Disconnect..."
 #~ msgstr "Si disraloyî..."
 
 #~ msgid "Connect..."
 #~ msgstr "Si raloyî..."
 
-#~ msgid "Internet connection configuration"
-#~ msgstr "Apontiaedje do raloyaedje al rantoele daegnrece"
-
-#~ msgid "Host name (optional)"
-#~ msgstr "No do lodjoe (opcionel)"
-
-#~ msgid "Third DNS server (optional)"
-#~ msgstr "Troejhinme sierveu DNS (opcionel)"
-
-#~ msgid "Internet Connection Configuration"
-#~ msgstr "Apontiaedje do raloyaedje al rantoele daegnrece"
-
-#~ msgid "Internet access"
-#~ msgstr "Accès al rantoele daegnrece"
-
-#~ msgid "Status:"
-#~ msgstr "Sitatut:"
-
-#~ msgid "Parameters"
-#~ msgstr "Parametes"
-
 #~ msgid "Attacker"
 #~ msgstr "Hacneu"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2be2e9d..f5be17f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net 2007\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2009-04-09 13:03+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <mageia-i18n@mandrivalinux.org>\n"
@@ -21,14 +21,16 @@ msgid "Interface"
 msgstr "网卡"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP 地址"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "协议"
@@ -64,23 +66,27 @@ msgid "Configure Local Area Network..."
 msgstr "配置局域网..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "应用"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -90,7 +96,8 @@ msgstr "确定"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -99,7 +106,7 @@ msgstr "确定"
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "请稍候...正在应用配置"
@@ -135,6 +142,7 @@ msgstr "适配器 %s: %s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "子网掩码"
@@ -150,6 +158,7 @@ msgid "Started on boot"
 msgstr "开机时启动"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 客户端"
@@ -164,17 +173,19 @@ msgstr ""
 "请从 Mageia 控制中心运行“%s”助手"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "设置新的网络连接(局域网、ISDN、ADSL……)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "没有 IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "没有掩码"
@@ -242,12 +253,12 @@ msgstr ""
 "\n"
 "您要做什么?"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "禁用"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "启用"
@@ -262,8 +273,8 @@ msgstr "重新配置"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "请选择直接连接到 Internet 的网卡。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "网络设备"
@@ -337,7 +348,11 @@ msgstr "内部域名"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -630,13 +645,14 @@ msgstr "允许的地址"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "交互式防火墙"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "无法连接守护程序"
@@ -646,12 +662,12 @@ msgstr "无法连接守护程序"
 msgid "Log"
 msgstr "日志"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "允许"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "屏蔽"
@@ -678,12 +694,12 @@ msgstr "屏蔽的服务"
 msgid "Clear logs"
 msgstr "清除日志"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "黑名单"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "白名单"
@@ -831,7 +847,7 @@ msgstr "模块"
 msgid "Enabled"
 msgstr "启用"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "描述"
@@ -877,9 +893,9 @@ msgstr ""
 "您现在正在使用网络配置文件 %s。您可以按通常的方式配置您的系统，而您自现在开始"
 "所有与网络有关的设置都将保存在此配置文件中。"
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -2404,12 +2420,12 @@ msgid ""
 "network"
 msgstr "警告, 检测到了另外的 Internet 连接, 可能使用您的网络"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "已连接"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "未连接"
@@ -2474,7 +2490,7 @@ msgstr "启用流量统计"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr ""
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "度量衡"
@@ -2514,19 +2530,22 @@ msgstr "有线调制解调器"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "使用 BPALogin (Telstra 需要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "身份验证"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "账户登录(用户名)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "账户密码"
@@ -2651,13 +2670,15 @@ msgstr ""
 "下列项目要求以句点分隔十进制格式输入的 IP 地址。\n"
 "(例如, 1.2.3.4)"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "网关"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "从 DHCP 获取 DNS 服务器"
@@ -2683,21 +2704,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "默认情况下, 搜索域名将会根据完全限定的主机名进行设定"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP 超时(秒)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "从 DHCP 获取 YP 服务器"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "从 DHCP 获取 NTPD 服务器"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主机名"
@@ -2708,11 +2733,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "默认值不依据 Zeroconf (169.254.0.0 网络)"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 地址的格式应该是 1.2.3.4"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "子网掩码的格式应该是 255.255.224.0"
@@ -2733,6 +2760,7 @@ msgstr ""
 "其它服务，或者将这些服务配置为启动时不要启动"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "从 DHCP 地址指定主机名(或者生成唯一的主机名)"
@@ -2758,6 +2786,7 @@ msgstr ""
 "有网络连接中共享。如果留空的话，将会使用“localhost.localdomain”。"
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "网络热插拔"
@@ -2826,27 +2855,32 @@ msgstr "POTS"
 msgid "Analog telephone modem (POTS)"
 msgstr "模拟电话调制解调器(POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "基于脚本登录"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "基于终端"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4005,90 +4039,93 @@ msgstr "WPA/WPA2 预共享密钥"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 企业"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Window 驱动程序"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "您的无线网卡已经禁用，请先启用无线开关。"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "无线设置"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "操作模式"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "受控的"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "转发器"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "自动"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "网络名称(ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "加密密钥"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "隐藏密码"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "将此密钥强制使用为 ASCII 字符串(如 Livebox)"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP 登录/用户名"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4099,12 +4136,12 @@ msgstr ""
 "用以下格式\n"
 "  域\\用户名"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP 密码"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4136,12 +4173,12 @@ msgstr ""
 "模式。\n"
 "  TLS 模式完全基于证书，可能在此指定的用户名和密码无效。"
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP 客户证书"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4153,32 +4190,37 @@ msgstr ""
 "证书可视为用户名/密码组合的代替品。\n"
 " 注意: 其它相关设置显示于高级页面中。"
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "网络 ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "运行频率"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "灵敏度阀值"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "比特率(每秒比特数, b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4197,17 +4239,19 @@ msgstr ""
 "包\n"
 "的大小, 一个等于中止计划的值的大小。您也可以设置这个值为自动、固定或者关闭。"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "块"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwconfig 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4223,12 +4267,13 @@ msgstr ""
 "请参看 iwconfig(8) man page 中的更多信息。"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4246,12 +4291,13 @@ msgstr ""
 "\n"
 "请参看 iwpspy(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv 命令的额外参数"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4280,95 +4326,95 @@ msgstr ""
 "\n"
 "请参看 iwpriv(8) man page 中的更多信息。"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP 协议"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "自动检测"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
 "a fallback to WPA version 1"
 msgstr "推荐使用自动检测，因为它首先尝试 WPA 第2版，失败后再尝试 WPA 第1版"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP 模式"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP key_mgmt"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
@@ -4378,12 +4424,12 @@ msgstr ""
 "可能的值包括 WPA-EAP、\n"
 "IEEE8021X、无"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP 外部身份"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4393,12 +4439,12 @@ msgstr ""
 "EAP 的匿名身份字符串: 用于支持不同的隧道身份的 EAP 不\n"
 "加密身份类型，如 TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4407,12 +4453,12 @@ msgid ""
 "autheap=MSCHAPV2 autheap=MD5 for TTLS"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 证书"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4426,12 +4472,12 @@ msgstr ""
 "如果可能的话，当使用 TLS 或 TTLS 或 PEAP 时总是应该配置可信的\n"
 "CA 证书。"
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP 证书主题匹配"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4441,12 +4487,12 @@ msgid ""
 "/C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com"
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "额外指令"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4464,26 +4510,26 @@ msgid ""
 "\tspecial settings different from the U.I settings."
 msgstr ""
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要加密密钥。"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr "预共享密钥应该由 8 到 63 位 ASCII 字符或者 64 位十六进制字符组成。"
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr "WEP 密钥应该至少由 %d 位 ASCII 字符或 %d 位十六进制字符组成。"
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4492,24 +4538,24 @@ msgstr ""
 "频率应该有后缀 k, M 或 G(如“2.46G”代表 2.46 GHz 频率), 或者后带足够"
 "的“0”(零)。"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
 "enough '0' (zeroes)."
 msgstr "速度应该有后缀 k, M 或 G(如“11M”代表 11M), 或者后带足够的“0”(零)。"
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "允许访问点漫游"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "将无线网络“%s”关联到网卡 %s 上"
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "网卡 %s 丢失了到无线网络的关联"
@@ -4655,6 +4701,285 @@ msgstr "连接"
 msgid "Hostname changed to \"%s\""
 msgstr "主机名更改为“%s”"
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "网卡"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "选择要配置的网卡: "
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"重新启动网络时发生错误:\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "恭喜, 网络和 Internet 配置完成。"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "管理 VPN 连接"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "设备: "
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN 配置"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS 服务器 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "搜索网域"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "自动"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "开机时启动"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "拨号模式"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "连接速率"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "连接超时(秒)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "服务商电话号码"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "调制解调器连接"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "选择文件"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "科威特"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "调制解调器"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "网卡的 IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "网卡内存(DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "网卡 IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "网卡 IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "欧洲协议(EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"世界其它地区的协议\n"
+"没有 D-信道(专线)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "模块"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "真实地址"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "白俄罗斯"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "网关地址的格式应该是 1.2.3.4"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "网关"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "网卡"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "尚未配置 Internet 连接"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"您从未配置过 Internet 连接。\n"
+"请从 Mageia 控制中心运行“%s”助手"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "首选 DNS 服务器(可选)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "首选 DNS 服务器(可选)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "备选 DNS 服务器(可选)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "首选 DNS 服务器(可选)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "连接配置"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "打印机访问"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "连接时间: "
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "状态"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "正在测试您的连接..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP 参数"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4859,11 +5184,6 @@ msgstr "使用交互式防火墙"
 msgid "No device found"
 msgstr "没有发现设备"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "设备: "
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5094,6 +5414,103 @@ msgstr "安装新驱动程序"
 msgid "Select a device:"
 msgstr "选择设备:"
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "服务攻击"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "交互式防火墙自动模式"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "您想要如何拨打此连接?"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "网卡"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "协议"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP 地址: %s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "服务攻击"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "交互式防火墙"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "无线连接"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "您想要如何拨打此连接?"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5137,20 +5554,6 @@ msgstr "内置 ISDN 卡"
 msgid "Protocol for the rest of the world"
 msgstr "世界其它地区的协议"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "欧洲协议(EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"世界其它地区的协议\n"
-"没有 D-信道(专线)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5201,11 +5604,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "连接控制"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "正在测试您的连接..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5226,11 +5624,6 @@ msgstr "您自己的电话号码"
 msgid "Provider name (ex provider.net)"
 msgstr "服务商名称(如 provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "服务商电话号码"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5241,41 +5634,6 @@ msgstr "服务商 DNS 1(可选)"
 msgid "Provider DNS 2 (optional)"
 msgstr "服务商 DNS 2(可选)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "拨号模式"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "连接速率"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "连接超时(秒)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "网卡的 IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "网卡内存(DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "网卡 IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "网卡 IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5440,16 +5798,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "域名"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "首选 DNS 服务器(可选)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "备选 DNS 服务器(可选)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5744,11 +6092,6 @@ msgstr "最后, 您还应该至少输入您 DNS 服务器的 IP 地址。"
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 服务器的格式应该是 1.2.3.4"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "网关地址的格式应该是 1.2.3.4"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 936aacb..cfcb9d8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,14 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakx-net\n"
-"POT-Creation-Date: 2011-05-03 15:42+0200\n"
+"POT-Creation-Date: 2011-11-27 02:13+0100\n"
 "PO-Revision-Date: 2011-04-28 05:08+0000\n"
 "Last-Translator: Franklin Weng <franklin@goodhorse.idv.tw>\n"
 "Language-Team: Traditional Chinese <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
 #: ../bin/drakconnect-old:45
@@ -26,14 +26,16 @@ msgid "Interface"
 msgstr "介面"
 
 #: ../bin/drakconnect-old:64 ../bin/drakconnect-old:208 ../bin/drakhosts:187
-#: ../lib/network/connection/ethernet.pm:141 ../lib/network/netconnect.pm:633
+#: ../lib/network/connection/ethernet.pm:141
+#: ../lib/network/drakconnect/edit.pm:151 ../lib/network/netconnect.pm:633
 #: ../lib/network/vpn/openvpn.pm:223
 #, c-format
 msgid "IP address"
 msgstr "IP 位址"
 
 #: ../bin/drakconnect-old:64 ../bin/drakids:261
-#: ../lib/network/netconnect.pm:477
+#: ../lib/network/drakconnect/edit.pm:135
+#: ../lib/network/drakconnect/edit.pm:393 ../lib/network/netconnect.pm:477
 #, c-format
 msgid "Protocol"
 msgstr "通訊協定"
@@ -69,23 +71,27 @@ msgid "Configure Local Area Network..."
 msgstr "設定區域網路..."
 
 #: ../bin/drakconnect-old:106 ../bin/draknfs:192 ../bin/net_applet:217
+#: ../lib/network/drakconnect/edit.pm:71
 #, c-format
 msgid "Help"
 msgstr "說明"
 
 #: ../bin/drakconnect-old:108 ../bin/drakinvictus:140
+#: ../lib/network/drakconnect/edit.pm:72 ../lib/network/drakconnect/edit.pm:76
 #, c-format
 msgid "Apply"
 msgstr "套用"
 
 #: ../bin/drakconnect-old:110 ../bin/drakconnect-old:263
 #: ../bin/draknetprofile:159 ../bin/net_monitor:388
+#: ../lib/network/drakconnect/global.pm:88
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
 #: ../bin/drakconnect-old:111 ../bin/drakconnect-old:178
 #: ../bin/drakconnect-old:265 ../bin/draknetprofile:161 ../bin/net_monitor:389
+#: ../lib/network/drakconnect/global.pm:89
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -95,7 +101,8 @@ msgstr "確定"
 #: ../lib/network/connection_manager.pm:89
 #: ../lib/network/connection_manager.pm:206
 #: ../lib/network/connection_manager.pm:235
-#: ../lib/network/connection_manager.pm:353 ../lib/network/drakvpn.pm:49
+#: ../lib/network/connection_manager.pm:353
+#: ../lib/network/drakconnect/edit.pm:466 ../lib/network/drakvpn.pm:49
 #: ../lib/network/netcenter.pm:150 ../lib/network/netconnect.pm:186
 #: ../lib/network/netconnect.pm:208 ../lib/network/netconnect.pm:305
 #: ../lib/network/netconnect.pm:733 ../lib/network/thirdparty.pm:352
@@ -104,7 +111,7 @@ msgstr "確定"
 msgid "Please wait"
 msgstr "請稍候"
 
-#: ../bin/drakconnect-old:115
+#: ../bin/drakconnect-old:115 ../lib/network/drakconnect/edit.pm:468
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "請稍待... 正在套用設定"
@@ -140,6 +147,7 @@ msgstr "介面卡 %s：%s"
 
 #: ../bin/drakconnect-old:209 ../bin/drakgw:181
 #: ../lib/network/connection/ethernet.pm:148
+#: ../lib/network/drakconnect/edit.pm:156
 #, c-format
 msgid "Netmask"
 msgstr "網路遮罩"
@@ -155,6 +163,7 @@ msgid "Started on boot"
 msgstr "於開機時啟動"
 
 #: ../bin/drakconnect-old:212 ../lib/network/connection/ethernet.pm:159
+#: ../lib/network/drakconnect/edit.pm:199
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP 用戶端"
@@ -169,17 +178,19 @@ msgstr ""
 "請從 Mageia Linux 控制中心裡執行「%s」。"
 
 #: ../bin/drakconnect-old:247 ../bin/net_applet:105
+#: ../lib/network/drakconnect/global.pm:36
 #, c-format
 msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
 msgstr "設定一個新的網路介面 (區域網路、ISDN、ADSL、...)"
 
 #: ../bin/drakconnect-old:273 ../bin/drakconnect-old:305
-#: ../lib/network/drakconnect.pm:16
+#: ../lib/network/drakconnect.pm:16 ../lib/network/drakconnect/edit.pm:515
 #, c-format
 msgid "No IP"
 msgstr "沒有 IP"
 
 #: ../bin/drakconnect-old:306 ../lib/network/drakconnect.pm:17
+#: ../lib/network/drakconnect/edit.pm:516
 #, c-format
 msgid "No Mask"
 msgstr "沒有遮罩"
@@ -245,12 +256,12 @@ msgstr ""
 "\n"
 "您打算要做什麼呢？"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Disable"
 msgstr "不啟用"
 
-#: ../bin/drakgw:101
+#: ../bin/drakgw:101 ../lib/network/drakconnect/edit.pm:373
 #, c-format
 msgid "Enable"
 msgstr "啟動"
@@ -265,8 +276,8 @@ msgstr "重新設定"
 msgid "Please select the network interface directly connected to the internet."
 msgstr "請選取直接連結到網際網路的網路界面。"
 
-#: ../bin/drakgw:123 ../lib/network/netconnect.pm:379
-#: ../lib/network/netconnect.pm:414
+#: ../bin/drakgw:123 ../lib/network/drakconnect/delete.pm:26
+#: ../lib/network/netconnect.pm:379 ../lib/network/netconnect.pm:414
 #, c-format
 msgid "Net Device"
 msgstr "網路裝置"
@@ -340,7 +351,11 @@ msgstr "內部網域的名稱"
 #: ../lib/network/connection_manager.pm:177
 #: ../lib/network/connection_manager.pm:181
 #: ../lib/network/connection_manager.pm:223
-#: ../lib/network/connection_manager.pm:481 ../lib/network/drakvpn.pm:45
+#: ../lib/network/connection_manager.pm:481
+#: ../lib/network/drakconnect/delete.pm:12
+#: ../lib/network/drakconnect/edit.pm:506
+#: ../lib/network/drakconnect/edit.pm:510
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/drakvpn.pm:45
 #: ../lib/network/drakvpn.pm:52 ../lib/network/ndiswrapper.pm:30
 #: ../lib/network/ndiswrapper.pm:45 ../lib/network/ndiswrapper.pm:118
 #: ../lib/network/ndiswrapper.pm:124 ../lib/network/netconnect.pm:135
@@ -635,13 +650,14 @@ msgstr "允許的位址"
 #: ../bin/drakids:224 ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
 #: ../bin/net_applet:145 ../bin/net_applet:353
 #: ../lib/network/drakfirewall.pm:309 ../lib/network/drakfirewall.pm:313
+#: ../lib/network/net_applet/ifw.pm:61 ../lib/network/net_applet/ifw.pm:89
 #, c-format
 msgid "Interactive Firewall"
 msgstr "互動式防火牆"
 
 #: ../bin/drakids:71 ../bin/drakids:190 ../bin/drakids:199 ../bin/drakids:224
 #: ../bin/drakids:233 ../bin/drakids:243 ../bin/drakids:335
-#: ../bin/net_applet:353
+#: ../bin/net_applet:353 ../lib/network/net_applet/ifw.pm:61
 #, c-format
 msgid "Unable to contact daemon"
 msgstr "無法聯繫 daemon"
@@ -651,12 +667,12 @@ msgstr "無法聯繫 daemon"
 msgid "Log"
 msgstr "紀錄檔"
 
-#: ../bin/drakids:86 ../bin/drakids:105
+#: ../bin/drakids:86 ../bin/drakids:105 ../lib/network/net_applet/ifw.pm:219
 #, c-format
 msgid "Allow"
 msgstr "允許"
 
-#: ../bin/drakids:87 ../bin/drakids:96
+#: ../bin/drakids:87 ../bin/drakids:96 ../lib/network/net_applet/ifw.pm:220
 #, c-format
 msgid "Block"
 msgstr "封鎖"
@@ -683,12 +699,12 @@ msgstr "封鎖的服務"
 msgid "Clear logs"
 msgstr "清除紀錄檔"
 
-#: ../bin/drakids:115 ../bin/drakids:120
+#: ../bin/drakids:115 ../bin/drakids:120 ../lib/network/net_applet/ifw.pm:158
 #, c-format
 msgid "Blacklist"
 msgstr "黑名單"
 
-#: ../bin/drakids:116 ../bin/drakids:133
+#: ../bin/drakids:116 ../bin/drakids:133 ../lib/network/net_applet/ifw.pm:163
 #, c-format
 msgid "Whitelist"
 msgstr "白名單"
@@ -836,7 +852,7 @@ msgstr "模組"
 msgid "Enabled"
 msgstr "啟動"
 
-#: ../bin/draknetprofile:68
+#: ../bin/draknetprofile:68 ../lib/network/drakconnect/edit.pm:423
 #, c-format
 msgid "Description"
 msgstr "敘述"
@@ -882,9 +898,9 @@ msgstr ""
 "您正在使用網路設定檔 %s。您可以設定您的系統，並且從現在起所有您的網路設定都會"
 "寫入此設定檔。"
 
-#: ../bin/draknetprofile:183 ../lib/network/drakvpn.pm:70
-#: ../lib/network/drakvpn.pm:100 ../lib/network/ndiswrapper.pm:103
-#: ../lib/network/netconnect.pm:500
+#: ../bin/draknetprofile:183 ../lib/network/drakconnect/global.pm:34
+#: ../lib/network/drakvpn.pm:70 ../lib/network/drakvpn.pm:100
+#: ../lib/network/ndiswrapper.pm:103 ../lib/network/netconnect.pm:500
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -2405,12 +2421,12 @@ msgid ""
 "network"
 msgstr "警告，偵測到您系統上有其他的網路連線，也許正在使用您的網路服務"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Connected"
 msgstr "已連線"
 
-#: ../bin/net_monitor:516
+#: ../bin/net_monitor:516 ../lib/network/drakconnect/global.pm:18
 #, c-format
 msgid "Not connected"
 msgstr "尚未連線"
@@ -2475,7 +2491,7 @@ msgstr "開啟流量計費"
 msgid "Allow interface to be controlled by Network Manager"
 msgstr "允許此介面由 Network Manager 控制"
 
-#: ../lib/network/connection.pm:251
+#: ../lib/network/connection.pm:251 ../lib/network/drakconnect/edit.pm:292
 #, c-format
 msgid "Metric"
 msgstr "公制"
@@ -2515,19 +2531,22 @@ msgstr "Cable 數據機"
 msgid "Use BPALogin (needed for Telstra)"
 msgstr "使用 BPALogin (Telstra 需要)"
 
-#: ../lib/network/connection/cable.pm:45 ../lib/network/netconnect.pm:616
+#: ../lib/network/connection/cable.pm:45
+#: ../lib/network/drakconnect/edit.pm:312 ../lib/network/netconnect.pm:616
 #, c-format
 msgid "Authentication"
 msgstr "認證方式"
 
 #: ../lib/network/connection/cable.pm:47 ../lib/network/connection/ppp.pm:22
-#: ../lib/network/netconnect.pm:355 ../lib/network/vpn/openvpn.pm:395
+#: ../lib/network/drakconnect/edit.pm:322 ../lib/network/netconnect.pm:355
+#: ../lib/network/vpn/openvpn.pm:395
 #, c-format
 msgid "Account Login (user name)"
 msgstr "帳號登入 (使用者名稱)"
 
 #: ../lib/network/connection/cable.pm:49 ../lib/network/connection/ppp.pm:23
-#: ../lib/network/netconnect.pm:356 ../lib/network/vpn/openvpn.pm:396
+#: ../lib/network/drakconnect/edit.pm:323 ../lib/network/netconnect.pm:356
+#: ../lib/network/vpn/openvpn.pm:396
 #, c-format
 msgid "Account Password"
 msgstr "帳號的密碼"
@@ -2652,13 +2671,15 @@ msgstr ""
 "每個項目都應該用小數點間隔的 IP 位址來輸入\n"
 "(例如 1.2.3.4)。"
 
-#: ../lib/network/connection/ethernet.pm:149 ../lib/network/netconnect.pm:665
+#: ../lib/network/connection/ethernet.pm:149
+#: ../lib/network/drakconnect/edit.pm:162 ../lib/network/netconnect.pm:665
 #: ../lib/network/vpn/openvpn.pm:214 ../lib/network/vpn/vpnc.pm:39
 #, c-format
 msgid "Gateway"
 msgstr "閘道"
 
 #: ../lib/network/connection/ethernet.pm:152
+#: ../lib/network/drakconnect/edit.pm:212
 #, c-format
 msgid "Get DNS servers from DHCP"
 msgstr "由 DHCP 取得 DNS 主機"
@@ -2684,21 +2705,25 @@ msgid "By default search domain will be set from the fully-qualified host name"
 msgstr "預設搜尋網域會從完整的主機名稱中取得"
 
 #: ../lib/network/connection/ethernet.pm:160
+#: ../lib/network/drakconnect/edit.pm:209
 #, c-format
 msgid "DHCP timeout (in seconds)"
 msgstr "DHCP 連線逾時 (以秒為單位)"
 
 #: ../lib/network/connection/ethernet.pm:161
+#: ../lib/network/drakconnect/edit.pm:213
 #, c-format
 msgid "Get YP servers from DHCP"
 msgstr "由 DHCP 取得 YP 伺服器"
 
 #: ../lib/network/connection/ethernet.pm:162
+#: ../lib/network/drakconnect/edit.pm:214
 #, c-format
 msgid "Get NTPD servers from DHCP"
 msgstr "由 DHCP 取得 NTPD 伺服器"
 
 #: ../lib/network/connection/ethernet.pm:163
+#: ../lib/network/drakconnect/edit.pm:205
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP 主機名稱"
@@ -2709,11 +2734,13 @@ msgid "Do not fallback to Zeroconf (169.254.0.0 network)"
 msgstr "不要預設使用 Zeroconf（169.254.0.0 網路）"
 
 #: ../lib/network/connection/ethernet.pm:176
+#: ../lib/network/drakconnect/edit.pm:506
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP 位址應該是 1.2.3.4 這類的格式"
 
 #: ../lib/network/connection/ethernet.pm:181
+#: ../lib/network/drakconnect/edit.pm:510
 #, c-format
 msgid "Netmask should be in format 255.255.224.0"
 msgstr "網路遮罩應該是 255.255.224.0 這類的格式"
@@ -2734,6 +2761,7 @@ msgstr ""
 "它的裝置，或是設定不要在開機啟動。"
 
 #: ../lib/network/connection/ethernet.pm:222
+#: ../lib/network/drakconnect/edit.pm:203
 #, c-format
 msgid "Assign host name from DHCP server (or generate a unique one)"
 msgstr "由 DHCP 伺服器指派主機名稱"
@@ -2759,6 +2787,7 @@ msgstr ""
 "被使用。如果留白，預設會使用 \"localhost.localdomain\"。"
 
 #: ../lib/network/connection/ethernet.pm:244
+#: ../lib/network/drakconnect/edit.pm:270
 #, c-format
 msgid "Network Hotplugging"
 msgstr "網路熱插拔"
@@ -2827,27 +2856,32 @@ msgstr "傳統電話系統"
 msgid "Analog telephone modem (POTS)"
 msgstr "類比式電話數據機 (POTS)"
 
-#: ../lib/network/connection/ppp.pm:9 ../lib/network/netconnect.pm:78
+#: ../lib/network/connection/ppp.pm:9 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:78
 #, c-format
 msgid "Script-based"
 msgstr "Script-based"
 
-#: ../lib/network/connection/ppp.pm:10 ../lib/network/netconnect.pm:79
+#: ../lib/network/connection/ppp.pm:10 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:79
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: ../lib/network/connection/ppp.pm:11 ../lib/network/netconnect.pm:80
+#: ../lib/network/connection/ppp.pm:11 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:80
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminal-based"
 
-#: ../lib/network/connection/ppp.pm:12 ../lib/network/netconnect.pm:81
+#: ../lib/network/connection/ppp.pm:12 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:81
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../lib/network/connection/ppp.pm:13 ../lib/network/netconnect.pm:82
+#: ../lib/network/connection/ppp.pm:13 ../lib/network/drakconnect/edit.pm:329
+#: ../lib/network/netconnect.pm:82
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
@@ -4006,90 +4040,93 @@ msgstr "WPA/WPA2 Pre-Shared Key"
 msgid "WPA/WPA2 Enterprise"
 msgstr "WPA/WPA2 Enterprise"
 
-#: ../lib/network/connection/wireless.pm:281
+#: ../lib/network/connection/wireless.pm:291
 #, c-format
 msgid "Windows driver"
 msgstr "Windows 驅動程式"
 
-#: ../lib/network/connection/wireless.pm:369
+#: ../lib/network/connection/wireless.pm:379
 #, c-format
 msgid ""
 "Your wireless card is disabled, please enable the wireless switch (RF kill "
 "switch) first."
 msgstr "您的無線網路卡是停用的，請先啟用無線網路 switch (RF kill switch)。"
 
-#: ../lib/network/connection/wireless.pm:459
+#: ../lib/network/connection/wireless.pm:469
 #, c-format
 msgid "Wireless settings"
 msgstr "無線網路設定"
 
-#: ../lib/network/connection/wireless.pm:464
+#: ../lib/network/connection/wireless.pm:474
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "運作模式"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad-hoc"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Managed"
 msgstr "固定的"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Master"
 msgstr "主要的"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Repeater"
 msgstr "重複"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Secondary"
 msgstr "次要的"
 
-#: ../lib/network/connection/wireless.pm:465
+#: ../lib/network/connection/wireless.pm:475
 #, c-format
 msgid "Auto"
 msgstr "自動"
 
-#: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/connection/wireless.pm:478
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "網路名稱 (ESSID)"
 
-#: ../lib/network/connection/wireless.pm:470
+#: ../lib/network/connection/wireless.pm:480
 #, c-format
 msgid "Encryption mode"
 msgstr "加密模式"
 
-#: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/connection/wireless.pm:482
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "加密金鑰"
 
-#: ../lib/network/connection/wireless.pm:475
+#: ../lib/network/connection/wireless.pm:485
 #, c-format
 msgid "Hide password"
 msgstr "隱藏密碼"
 
-#: ../lib/network/connection/wireless.pm:477
+#: ../lib/network/connection/wireless.pm:487
 #, c-format
 msgid "Force using this key as ASCII string (e.g. for Livebox)"
 msgstr "將此金鑰強制視為 ASCII 字串使用（為了給 Livebox 使用）"
 
-#: ../lib/network/connection/wireless.pm:484
+#: ../lib/network/connection/wireless.pm:494
 #, c-format
 msgid "EAP Login/Username"
 msgstr "EAP 登入/使用者名稱"
 
-#: ../lib/network/connection/wireless.pm:486
+#: ../lib/network/connection/wireless.pm:496
 #, c-format
 msgid ""
 "The login or username. Format is plain text. If you\n"
@@ -4098,12 +4135,12 @@ msgid ""
 msgstr ""
 "登入帳號。格式為純文字。若您需要指定網域，則請試著用未測試的語法  網域\\帳號"
 
-#: ../lib/network/connection/wireless.pm:489
+#: ../lib/network/connection/wireless.pm:499
 #, c-format
 msgid "EAP Password"
 msgstr "EAP 密碼"
 
-#: ../lib/network/connection/wireless.pm:492
+#: ../lib/network/connection/wireless.pm:502
 #, c-format
 msgid ""
 " Password: A string.\n"
@@ -4134,12 +4171,12 @@ msgstr ""
 "MD5, MSCHAPV2, OTP 與 GTC 再 PEAP 與 TTLS 模式中會自動套用。\n"
 "  TLS 模式是完全以憑證為基礎，可能會忽略此處設定的使用者名稱與密碼。"
 
-#: ../lib/network/connection/wireless.pm:506
+#: ../lib/network/connection/wireless.pm:516
 #, c-format
 msgid "EAP client certificate"
 msgstr "EAP 用戶端認證"
 
-#: ../lib/network/connection/wireless.pm:508
+#: ../lib/network/connection/wireless.pm:518
 #, c-format
 msgid ""
 "The complete path and filename of client certificate. This is\n"
@@ -4151,32 +4188,37 @@ msgstr ""
 "它可以用於替代使用者名稱與密碼式的認證。\n"
 "注意：其他相關設定會在「進階」頁面中顯示。"
 
-#: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/connection/wireless.pm:522
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "網路 ID"
 
-#: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/connection/wireless.pm:523
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "工作頻率"
 
-#: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "敏感度臨界點"
 
-#: ../lib/network/connection/wireless.pm:515
+#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:241
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "連線速率 (b/s)"
 
-#: ../lib/network/connection/wireless.pm:516
+#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: ../lib/network/connection/wireless.pm:517
+#: ../lib/network/connection/wireless.pm:527
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -4196,17 +4238,19 @@ msgstr ""
 "此機制。\n"
 "您也可以將此參數設定為 auto，fixed 或 off。"
 
-#: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "區塊切分"
 
-#: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/connection/wireless.pm:535
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "iwfonfig 指令的其他參數"
 
-#: ../lib/network/connection/wireless.pm:526
+#: ../lib/network/connection/wireless.pm:536
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -4222,12 +4266,13 @@ msgstr ""
 "詳細資訊請參考 iwconfig(8) man page。"
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: ../lib/network/connection/wireless.pm:533
+#: ../lib/network/connection/wireless.pm:543
+#: ../lib/network/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "iwspy 指令的其他參數"
 
-#: ../lib/network/connection/wireless.pm:534
+#: ../lib/network/connection/wireless.pm:544
 #, c-format
 msgid ""
 "iwspy is used to set a list of addresses in a wireless network\n"
@@ -4245,12 +4290,13 @@ msgstr ""
 "\n"
 "詳細資訊請參考 iwspy(8) man page。"
 
-#: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/connection/wireless.pm:552
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "iwpriv 指令的其他參數"
 
-#: ../lib/network/connection/wireless.pm:544
+#: ../lib/network/connection/wireless.pm:554
 #, c-format
 msgid ""
 "iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -4277,107 +4323,107 @@ msgstr ""
 "\n"
 "詳細資訊請參考 iwpriv(8) man page。"
 
-#: ../lib/network/connection/wireless.pm:555
+#: ../lib/network/connection/wireless.pm:565
 #, c-format
 msgid "EAP Protocol"
 msgstr "EAP 通訊協定"
 
-#: ../lib/network/connection/wireless.pm:556
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:566
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "Auto Detect"
 msgstr "自動偵測"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA2"
 msgstr "WPA2"
 
-#: ../lib/network/connection/wireless.pm:556
+#: ../lib/network/connection/wireless.pm:566
 #, c-format
 msgid "WPA"
 msgstr "WPA"
 
-#: ../lib/network/connection/wireless.pm:558
+#: ../lib/network/connection/wireless.pm:568
 #, c-format
 msgid ""
 "Auto Detect is recommended as it first tries WPA version 2 with\n"
 "a fallback to WPA version 1"
 msgstr "建議使用自動偵測，會先嘗試使用 WPA v2，若不行則改用 WPA v1。"
 
-#: ../lib/network/connection/wireless.pm:560
+#: ../lib/network/connection/wireless.pm:570
 #, c-format
 msgid "EAP Mode"
 msgstr "EAP 模式"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP"
 msgstr "PEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS"
 msgstr "TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MSCHAPV2"
 msgstr "MSCHAPV2"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "MD5"
 msgstr "MD5"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "OTP"
 msgstr "OTP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "GTC"
 msgstr "GTC"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "PEAP TTLS"
 msgstr "PEAP TTLS"
 
-#: ../lib/network/connection/wireless.pm:561
+#: ../lib/network/connection/wireless.pm:571
 #, c-format
 msgid "TTLS TLS"
 msgstr "TTLS TLS"
 
-#: ../lib/network/connection/wireless.pm:563
+#: ../lib/network/connection/wireless.pm:573
 #, c-format
 msgid "EAP key_mgmt"
 msgstr "EAP 金鑰管理"
 
-#: ../lib/network/connection/wireless.pm:565
+#: ../lib/network/connection/wireless.pm:575
 #, c-format
 msgid ""
 "list of accepted authenticated key management protocols.\n"
 "possible values are WPA-EAP, IEEE8021X, NONE"
 msgstr "可接受的認證金鑰管理協定清單。可能的值為 WPA-EAP，IEEE8021X，與 NONE"
 
-#: ../lib/network/connection/wireless.pm:567
+#: ../lib/network/connection/wireless.pm:577
 #, c-format
 msgid "EAP outer identity"
 msgstr "EAP 外部身份"
 
-#: ../lib/network/connection/wireless.pm:569
+#: ../lib/network/connection/wireless.pm:579
 #, c-format
 msgid ""
 "Anonymous identity string for EAP: to be used as the\n"
@@ -4387,12 +4433,12 @@ msgstr ""
 "EAP 匿名身份字串：用於需要未加密的身份的 EAP 型態，支援不同的安全加密身份，"
 "如 TTLS"
 
-#: ../lib/network/connection/wireless.pm:572
+#: ../lib/network/connection/wireless.pm:582
 #, c-format
 msgid "EAP phase2"
 msgstr "EAP phase2"
 
-#: ../lib/network/connection/wireless.pm:574
+#: ../lib/network/connection/wireless.pm:584
 #, c-format
 msgid ""
 "Inner authentication with TLS tunnel parameters.\n"
@@ -4405,12 +4451,12 @@ msgstr ""
 "PEAP 可能為 \"auth=MSCHAPV2\"，或是\n"
 "TTLS 可能為 \"autheap=MSCHAPV2\" 或 \"autheap=MD5\""
 
-#: ../lib/network/connection/wireless.pm:578
+#: ../lib/network/connection/wireless.pm:588
 #, c-format
 msgid "EAP CA certificate"
 msgstr "EAP CA 憑證"
 
-#: ../lib/network/connection/wireless.pm:580
+#: ../lib/network/connection/wireless.pm:590
 #, c-format
 msgid ""
 "Full file path to CA certificate file (PEM/DER). This file\n"
@@ -4423,12 +4469,12 @@ msgstr ""
 "果 ca_cert 沒有包含在內，將不會檢查伺服器憑證。可以的話，在使用 TLS，TTLS 或 "
 "PEAP 的時候，都應該設定一組可信任的 CA 憑證。"
 
-#: ../lib/network/connection/wireless.pm:585
+#: ../lib/network/connection/wireless.pm:595
 #, c-format
 msgid "EAP certificate subject match"
 msgstr "EAP 憑證主體比對"
 
-#: ../lib/network/connection/wireless.pm:587
+#: ../lib/network/connection/wireless.pm:597
 #, c-format
 msgid ""
 " Substring to be matched against the subject of\n"
@@ -4441,12 +4487,12 @@ msgstr ""
 "器憑證主體包含此字串時才會被接受。字串的格式應為：\n"
 "/C=US/ST=CA/L=San Francisco/CN=TestAS/emailAddress=as@example.com"
 
-#: ../lib/network/connection/wireless.pm:592
+#: ../lib/network/connection/wireless.pm:602
 #, c-format
 msgid "Extra directives"
 msgstr "額外設定選項"
 
-#: ../lib/network/connection/wireless.pm:593
+#: ../lib/network/connection/wireless.pm:603
 #, c-format
 msgid ""
 "Here one can pass extra settings to wpa_supplicant\n"
@@ -4476,26 +4522,26 @@ msgstr ""
 "與 eap_workaround, pairwise, group\n"
 "其他的像是 key_mgmt, eap 可以用於強制指定與圖形介面不同的選項。"
 
-#: ../lib/network/connection/wireless.pm:613
+#: ../lib/network/connection/wireless.pm:623
 #, c-format
 msgid "An encryption key is required."
 msgstr "需要網路金鑰。"
 
-#: ../lib/network/connection/wireless.pm:620
+#: ../lib/network/connection/wireless.pm:630
 #, c-format
 msgid ""
 "The pre-shared key should have between 8 and 63 ASCII characters, or 64 "
 "hexadecimal characters."
 msgstr "預先分享金鑰應該要有 8 到 63 的 ASCII 字元，或是 64 個十六進位碼。"
 
-#: ../lib/network/connection/wireless.pm:626
+#: ../lib/network/connection/wireless.pm:636
 #, c-format
 msgid ""
 "The WEP key should have at most %d ASCII characters or %d hexadecimal "
 "characters."
 msgstr "WEP安全金鑰至多容許 %d 個ASCII字元或 %d 個十六進位字元"
 
-#: ../lib/network/connection/wireless.pm:633
+#: ../lib/network/connection/wireless.pm:643
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -4504,7 +4550,7 @@ msgstr ""
 "頻率後面應該加上 k、M 或 G 等單位 (例如：\"2.46G\" 代表頻率為 2.46 GHz)，或加"
 "上足夠的 '0' (零)。"
 
-#: ../lib/network/connection/wireless.pm:639
+#: ../lib/network/connection/wireless.pm:649
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -4513,17 +4559,17 @@ msgstr ""
 "速率後面應該加上 k、M 或 G 等單位 (例如：\"11M\" 代表頻率為 11M)，或加上足夠"
 "的 '0' (零)。"
 
-#: ../lib/network/connection/wireless.pm:651
+#: ../lib/network/connection/wireless.pm:661
 #, c-format
 msgid "Allow access point roaming"
 msgstr "允許無線網路基地台漫遊"
 
-#: ../lib/network/connection/wireless.pm:776
+#: ../lib/network/connection/wireless.pm:786
 #, c-format
 msgid "Associated to wireless network \"%s\" on interface %s"
 msgstr "已透過網路界面 %2$s 連結到無線網路 \"%1$s\""
 
-#: ../lib/network/connection/wireless.pm:777
+#: ../lib/network/connection/wireless.pm:787
 #, c-format
 msgid "Lost association to wireless network on interface %s"
 msgstr "已遺失網路界面 %s 到無線網路的連結"
@@ -4669,6 +4715,285 @@ msgstr "連線"
 msgid "Hostname changed to \"%s\""
 msgstr "主機名稱改變為 \"%s\""
 
+#: ../lib/network/drakconnect/delete.pm:12
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+
+#: ../lib/network/drakconnect/delete.pm:21
+#, fuzzy, c-format
+msgid "Remove a network interface"
+msgstr "網路介面"
+
+#: ../lib/network/drakconnect/delete.pm:25
+#, fuzzy, c-format
+msgid "Select the network interface to remove:"
+msgstr "選取要設定的網路介面："
+
+#: ../lib/network/drakconnect/delete.pm:58
+#, fuzzy, c-format
+msgid ""
+"An error occurred while deleting the \"%s\" network interface:\n"
+"\n"
+"%s"
+msgstr ""
+"重新啟動網路時發生了一個問題：\n"
+"\n"
+"%s"
+
+#: ../lib/network/drakconnect/delete.pm:59
+#, fuzzy, c-format
+msgid ""
+"Congratulations, the \"%s\" network interface has been successfully deleted"
+msgstr "恭喜，網路設定已經完成了。"
+
+#: ../lib/network/drakconnect/edit.pm:23
+#, fuzzy, c-format
+msgid "Manage connections"
+msgstr "管理 VPN 連線"
+
+#: ../lib/network/drakconnect/edit.pm:50 ../lib/network/drakroam.pm:85
+#, c-format
+msgid "Device: "
+msgstr "裝置："
+
+#: ../lib/network/drakconnect/edit.pm:132
+#, fuzzy, c-format
+msgid "IP configuration"
+msgstr "VPN 組態設定"
+
+#: ../lib/network/drakconnect/edit.pm:167
+#, fuzzy, c-format
+msgid "DNS servers"
+msgstr "DNS 伺服器 1"
+
+#: ../lib/network/drakconnect/edit.pm:173
+#, fuzzy, c-format
+msgid "Search Domain"
+msgstr "搜尋網域"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "none"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, fuzzy, c-format
+msgid "static"
+msgstr "自動"
+
+#: ../lib/network/drakconnect/edit.pm:181
+#, c-format
+msgid "DHCP"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:264
+#, fuzzy, c-format
+msgid "Start at boot"
+msgstr "於開機時啟動"
+
+#: ../lib/network/drakconnect/edit.pm:276 ../lib/network/netconnect.pm:352
+#, c-format
+msgid "Dialing mode"
+msgstr "撥接的模式"
+
+#: ../lib/network/drakconnect/edit.pm:281
+#: ../lib/network/drakconnect/edit.pm:348 ../lib/network/netconnect.pm:353
+#, c-format
+msgid "Connection speed"
+msgstr "連線速度"
+
+#: ../lib/network/drakconnect/edit.pm:286 ../lib/network/netconnect.pm:354
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "連線逾時 (以秒為單位)"
+
+#: ../lib/network/drakconnect/edit.pm:324 ../lib/network/netconnect.pm:349
+#, c-format
+msgid "Provider phone number"
+msgstr "提供者的電話號碼"
+
+#: ../lib/network/drakconnect/edit.pm:346
+#, fuzzy, c-format
+msgid "Flow control"
+msgstr "<control>Q"
+
+#: ../lib/network/drakconnect/edit.pm:347
+#, c-format
+msgid "Line termination"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:358
+#, fuzzy, c-format
+msgid "Modem timeout"
+msgstr "Modem 連線"
+
+#: ../lib/network/drakconnect/edit.pm:362
+#, fuzzy, c-format
+msgid "Use lock file"
+msgstr "選擇檔案"
+
+#: ../lib/network/drakconnect/edit.pm:364
+#, c-format
+msgid "Wait for dialup tone before dialing"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:367
+#, fuzzy, c-format
+msgid "Busy wait"
+msgstr "科威特"
+
+#: ../lib/network/drakconnect/edit.pm:372
+#, fuzzy, c-format
+msgid "Modem sound"
+msgstr "數據機"
+
+#: ../lib/network/drakconnect/edit.pm:385 ../lib/network/netconnect.pm:357
+#, c-format
+msgid "Card IRQ"
+msgstr "卡的 IRQ"
+
+#: ../lib/network/drakconnect/edit.pm:386 ../lib/network/netconnect.pm:358
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "卡的 mem (DMA)"
+
+#: ../lib/network/drakconnect/edit.pm:387 ../lib/network/netconnect.pm:359
+#, c-format
+msgid "Card IO"
+msgstr "卡的 IO"
+
+#: ../lib/network/drakconnect/edit.pm:388 ../lib/network/netconnect.pm:360
+#, c-format
+msgid "Card IO_0"
+msgstr "卡的 IO_0"
+
+#: ../lib/network/drakconnect/edit.pm:394 ../lib/network/netconnect.pm:71
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "歐洲人的通訊協定 (EDSS1)"
+
+#: ../lib/network/drakconnect/edit.pm:395 ../lib/network/netconnect.pm:72
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"其他世界的通訊協定\n"
+"無 D-Channel (leased lines)"
+
+#: ../lib/network/drakconnect/edit.pm:422
+#, c-format
+msgid "Vendor"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:424
+#, c-format
+msgid "Media class"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:425
+#, fuzzy, c-format
+msgid "Module name"
+msgstr "模組"
+
+#: ../lib/network/drakconnect/edit.pm:426
+#, fuzzy, c-format
+msgid "Mac Address"
+msgstr "真實位址"
+
+#: ../lib/network/drakconnect/edit.pm:427
+#, fuzzy, c-format
+msgid "Bus"
+msgstr "白俄羅斯"
+
+#: ../lib/network/drakconnect/edit.pm:428
+#, c-format
+msgid "Location on the bus"
+msgstr ""
+
+#: ../lib/network/drakconnect/edit.pm:519 ../lib/network/netconnect.pm:832
+#, c-format
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Gateway 位址必須要用類似 1.2.3.4 的格式來輸入"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Gateway:"
+msgstr "閘道"
+
+#: ../lib/network/drakconnect/global.pm:27
+#, fuzzy, c-format
+msgid "Interface:"
+msgstr "介面"
+
+#: ../lib/network/drakconnect/global.pm:30
+#, fuzzy, c-format
+msgid "Internet connection configuration"
+msgstr "沒有設定好的網路連線設定"
+
+#: ../lib/network/drakconnect/global.pm:35
+#, fuzzy, c-format
+msgid ""
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mageia Control Center"
+msgstr ""
+"您尚未設定任何網際網路連線。\n"
+"請在 Mageia Linux 控制中心裡執行「%s」"
+
+#: ../lib/network/drakconnect/global.pm:50
+#, fuzzy, c-format
+msgid "Host name (optional)"
+msgstr "第一台 DNS 伺服器 (選擇性輸入)"
+
+#: ../lib/network/drakconnect/global.pm:51 ../lib/network/netconnect.pm:651
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "第一台 DNS 伺服器 (選擇性輸入)"
+
+#: ../lib/network/drakconnect/global.pm:52 ../lib/network/netconnect.pm:652
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "第二台 DNS 伺服器 (選擇性輸入)"
+
+#: ../lib/network/drakconnect/global.pm:53
+#, fuzzy, c-format
+msgid "Third DNS server (optional)"
+msgstr "第一台 DNS 伺服器 (選擇性輸入)"
+
+#: ../lib/network/drakconnect/global.pm:75
+#, fuzzy, c-format
+msgid "Internet Connection Configuration"
+msgstr "連線組態設定"
+
+#: ../lib/network/drakconnect/global.pm:76
+#, fuzzy, c-format
+msgid "Internet access"
+msgstr "存取印表機"
+
+#: ../lib/network/drakconnect/global.pm:78
+#, fuzzy, c-format
+msgid "Connection type: "
+msgstr "連線時間："
+
+#: ../lib/network/drakconnect/global.pm:81
+#, fuzzy, c-format
+msgid "Status:"
+msgstr "狀態"
+
+#: ../lib/network/drakconnect/global.pm:82 ../lib/network/netconnect.pm:305
+#: ../lib/network/netconnect.pm:733
+#, c-format
+msgid "Testing your connection..."
+msgstr "正在測試您的連線..."
+
+#: ../lib/network/drakconnect/global.pm:86
+#, fuzzy, c-format
+msgid "Parameters"
+msgstr "IP 參數"
+
 #: ../lib/network/drakfirewall.pm:14
 #, c-format
 msgid "Web Server"
@@ -4876,11 +5201,6 @@ msgstr "使用互動式防火牆"
 msgid "No device found"
 msgstr "沒有找到任何裝置"
 
-#: ../lib/network/drakroam.pm:85
-#, c-format
-msgid "Device: "
-msgstr "裝置："
-
 #: ../lib/network/drakroam.pm:89 ../lib/network/netcenter.pm:66
 #, c-format
 msgid "Configure"
@@ -5111,6 +5431,103 @@ msgstr "安裝一個新的驅動程式"
 msgid "Select a device:"
 msgstr "選擇一個裝置："
 
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:100
+#, fuzzy, c-format
+msgid "Process attack"
+msgstr "攻擊服務"
+
+#: ../lib/network/net_applet/ifw.pm:113
+#, fuzzy, c-format
+msgid "Interactive Firewall: intrusion detected"
+msgstr "互動式防火牆自動模式"
+
+#: ../lib/network/net_applet/ifw.pm:130
+#, fuzzy, c-format
+msgid "What do you want to do with this attacker?"
+msgstr "您想要如何撥接這個連線？"
+
+#: ../lib/network/net_applet/ifw.pm:133
+#, c-format
+msgid "Attack details"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:137
+#, c-format
+msgid "Attack time: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:138
+#, fuzzy, c-format
+msgid "Network interface: %s"
+msgstr "網路介面"
+
+#: ../lib/network/net_applet/ifw.pm:139
+#, c-format
+msgid "Attack type: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:140
+#, fuzzy, c-format
+msgid "Protocol: %s"
+msgstr "通訊協定"
+
+#: ../lib/network/net_applet/ifw.pm:141
+#, fuzzy, c-format
+msgid "Attacker IP address: %s"
+msgstr "IP 位址：%s"
+
+#: ../lib/network/net_applet/ifw.pm:142
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:145
+#, fuzzy, c-format
+msgid "Service attacked: %s"
+msgstr "攻擊服務"
+
+#: ../lib/network/net_applet/ifw.pm:146
+#, c-format
+msgid "Port attacked: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:148
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:153
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:168
+#, c-format
+msgid "Ignore"
+msgstr ""
+
+#: ../lib/network/net_applet/ifw.pm:186 ../lib/network/net_applet/ifw.pm:204
+#, fuzzy, c-format
+msgid "Interactive Firewall: new service"
+msgstr "互動式防火牆"
+
+#. -PO: "Process" is a verb
+#: ../lib/network/net_applet/ifw.pm:192
+#, fuzzy, c-format
+msgid "Process connection"
+msgstr "無線網路連線"
+
+#: ../lib/network/net_applet/ifw.pm:214
+#, fuzzy, c-format
+msgid "Do you want to open this service?"
+msgstr "您想要如何撥接這個連線？"
+
+#: ../lib/network/net_applet/ifw.pm:217
+#, c-format
+msgid "Remember this answer"
+msgstr ""
+
 #: ../lib/network/netcenter.pm:55 ../lib/network/netconnect.pm:211
 #, c-format
 msgid "Please select your network:"
@@ -5154,20 +5571,6 @@ msgstr "內部 ISDN 卡"
 msgid "Protocol for the rest of the world"
 msgstr "其他世界的通訊協定"
 
-#: ../lib/network/netconnect.pm:71
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "歐洲人的通訊協定 (EDSS1)"
-
-#: ../lib/network/netconnect.pm:72
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"其他世界的通訊協定\n"
-"無 D-Channel (leased lines)"
-
 #: ../lib/network/netconnect.pm:122
 #, c-format
 msgid "Network & Internet Configuration"
@@ -5218,11 +5621,6 @@ msgstr ""
 msgid "Connection control"
 msgstr "連線控制"
 
-#: ../lib/network/netconnect.pm:305 ../lib/network/netconnect.pm:733
-#, c-format
-msgid "Testing your connection..."
-msgstr "正在測試您的連線..."
-
 #: ../lib/network/netconnect.pm:344
 #, c-format
 msgid "Connection Configuration"
@@ -5243,11 +5641,6 @@ msgstr "您的個人電話號碼"
 msgid "Provider name (ex provider.net)"
 msgstr "提供者的名稱 (ex provider.net)"
 
-#: ../lib/network/netconnect.pm:349
-#, c-format
-msgid "Provider phone number"
-msgstr "提供者的電話號碼"
-
 #: ../lib/network/netconnect.pm:350
 #, c-format
 msgid "Provider DNS 1 (optional)"
@@ -5258,41 +5651,6 @@ msgstr "提供者 DNS 1 (選擇性輸入)"
 msgid "Provider DNS 2 (optional)"
 msgstr "提供者 DNS 2 (選擇性輸入)"
 
-#: ../lib/network/netconnect.pm:352
-#, c-format
-msgid "Dialing mode"
-msgstr "撥接的模式"
-
-#: ../lib/network/netconnect.pm:353
-#, c-format
-msgid "Connection speed"
-msgstr "連線速度"
-
-#: ../lib/network/netconnect.pm:354
-#, c-format
-msgid "Connection timeout (in sec)"
-msgstr "連線逾時 (以秒為單位)"
-
-#: ../lib/network/netconnect.pm:357
-#, c-format
-msgid "Card IRQ"
-msgstr "卡的 IRQ"
-
-#: ../lib/network/netconnect.pm:358
-#, c-format
-msgid "Card mem (DMA)"
-msgstr "卡的 mem (DMA)"
-
-#: ../lib/network/netconnect.pm:359
-#, c-format
-msgid "Card IO"
-msgstr "卡的 IO"
-
-#: ../lib/network/netconnect.pm:360
-#, c-format
-msgid "Card IO_0"
-msgstr "卡的 IO_0"
-
 #: ../lib/network/netconnect.pm:361
 #, c-format
 msgid "Card IO_1"
@@ -5457,16 +5815,6 @@ msgstr "DNS"
 msgid "Domain name"
 msgstr "網域名稱"
 
-#: ../lib/network/netconnect.pm:651
-#, c-format
-msgid "First DNS Server (optional)"
-msgstr "第一台 DNS 伺服器 (選擇性輸入)"
-
-#: ../lib/network/netconnect.pm:652
-#, c-format
-msgid "Second DNS Server (optional)"
-msgstr "第二台 DNS 伺服器 (選擇性輸入)"
-
 #: ../lib/network/netconnect.pm:653
 #, c-format
 msgid "Set hostname from IP"
@@ -5767,11 +6115,6 @@ msgstr "最後，您也可以輸入您自己的 DNS 伺服器 IP 位址。"
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "DNS 伺服器位址必須要用 1.2.3.4 的格式來輸入"
 
-#: ../lib/network/netconnect.pm:832
-#, c-format
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Gateway 位址必須要用類似 1.2.3.4 的格式來輸入"
-
 #: ../lib/network/netconnect.pm:833
 #, c-format
 msgid "Gateway device"