update catalogs (#3371)

1 files changed, 871 insertions, 273 deletions

diff --git a/po/et.po b/po/et.po
index 0638b9d..a706c80 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-18 13:57+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"
@@ -3887,8 +4096,12 @@ msgstr "Windowsi draiver"
 
 #: ../lib/network/connection/wireless.pm:369
 #, 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
 #, c-format
@@ -3897,6 +4110,7 @@ msgstr "Juhtmeta ühenduse seadistused"
 
 #: ../lib/network/connection/wireless.pm:464
 #: ../lib/network/connection_manager.pm:280
+#: ../lib/network/drakconnect/edit.pm:236
 #, c-format
 msgid "Operating Mode"
 msgstr "Töörežiim"
@@ -3932,6 +4146,7 @@ msgid "Auto"
 msgstr "Automaatne"
 
 #: ../lib/network/connection/wireless.pm:468
+#: ../lib/network/drakconnect/edit.pm:237
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Võrgu nimi (ESSID)"
@@ -3942,6 +4157,7 @@ msgid "Encryption mode"
 msgstr "Krüptorežiim"
 
 #: ../lib/network/connection/wireless.pm:472
+#: ../lib/network/drakconnect/edit.pm:251
 #, c-format
 msgid "Encryption key"
 msgstr "Krüptovõti"
@@ -4029,26 +4245,31 @@ msgstr ""
 " Märkus: täiendavad seadistused leiab muude valikute leheküljel."
 
 #: ../lib/network/connection/wireless.pm:512
+#: ../lib/network/drakconnect/edit.pm:238
 #, c-format
 msgid "Network ID"
 msgstr "Võrgu ID"
 
 #: ../lib/network/connection/wireless.pm:513
+#: ../lib/network/drakconnect/edit.pm:239
 #, c-format
 msgid "Operating frequency"
 msgstr "Töösagedus"
 
 #: ../lib/network/connection/wireless.pm:514
+#: ../lib/network/drakconnect/edit.pm:240
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Tundlikkuslävi"
 
 #: ../lib/network/connection/wireless.pm:515
+#: ../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/drakconnect/edit.pm:252
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
@@ -4056,11 +4277,14 @@ msgstr "RTS/CTS"
 #: ../lib/network/connection/wireless.pm:517
 #, 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"
@@ -4071,11 +4295,13 @@ msgstr ""
 "fikseerituks või üldse välja lülitada."
 
 #: ../lib/network/connection/wireless.pm:524
+#: ../lib/network/drakconnect/edit.pm:253
 #, c-format
 msgid "Fragmentation"
 msgstr "Killustus"
 
 #: ../lib/network/connection/wireless.pm:525
+#: ../lib/network/drakconnect/edit.pm:254
 #, c-format
 msgid "iwconfig command extra arguments"
 msgstr "Käsu iwconfig lisaargumendid"
@@ -4084,18 +4310,20 @@ msgstr "Käsu iwconfig lisaargumendid"
 #, 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
+#. -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/drakconnect/edit.pm:255
 #, c-format
 msgid "iwspy command extra arguments"
 msgstr "Käsu iwspy lisaargumendid"
@@ -4120,6 +4348,7 @@ msgstr ""
 "Täpsemat infot annab man-lehekülg iwspy(8)."
 
 #: ../lib/network/connection/wireless.pm:542
+#: ../lib/network/drakconnect/edit.pm:256
 #, c-format
 msgid "iwpriv command extra arguments"
 msgstr "Käsu iwpriv lisaargumendid"
@@ -4127,13 +4356,16 @@ msgstr "Käsu iwpriv lisaargumendid"
 #: ../lib/network/connection/wireless.pm:544
 #, 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."
@@ -4365,23 +4597,38 @@ msgstr "Vajalik on krüptovõti."
 
 #: ../lib/network/connection/wireless.pm:620
 #, 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
 #, 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
 #, 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
 #, 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
 #, c-format
@@ -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