Added translation for "recommended" string

1 files changed, 4553 insertions, 4384 deletions

diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index a2b72ebfd..49886c49b 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -1,13 +1,13 @@
 # Translation of DrakX.po to Estonian.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Riho Kurg <rx@linux.ee>, 1999-2003.
-# Marek Laane <bald@online.ee>, 2002-2004.
+# Marek Laane <bald@online.ee>, 2002-2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-et\n"
-"POT-Creation-Date: 2004-10-07 21:57+0200\n"
-"PO-Revision-Date: 2004-10-08 11:57+0200\n"
+"POT-Creation-Date: 2005-02-24 14:10+0100\n"
+"PO-Revision-Date: 2005-02-21 13:25+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -38,7 +38,7 @@ msgstr ""
 
 #: ../move/move.pm:448 ../move/move.pm:460
 #, c-format
-msgid "Key isn't writable"
+msgid "Key is not writable"
 msgstr "Mälupulk ei ole kirjutatav!"
 
 #: ../move/move.pm:450
@@ -63,7 +63,7 @@ msgstr "Jätka ilma USB mälupulgata"
 #: ../move/move.pm:462
 #, c-format
 msgid ""
-"The USB key seems to have write protection enabled, but we can't safely\n"
+"The USB key seems to have write protection enabled, but we can not safely\n"
 "unplug it now.\n"
 "\n"
 "\n"
@@ -78,7 +78,7 @@ msgstr ""
 "eemaldage kirjutuskaitse, ühendage seade uuesti ja käivitage taas Mandrake "
 "Move."
 
-#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1353
+#: ../move/move.pm:468 help.pm:409 install_steps_interactive.pm:1317
 #, c-format
 msgid "Reboot"
 msgstr "Taaskäivitus"
@@ -86,7 +86,7 @@ msgstr "Taaskäivitus"
 #: ../move/move.pm:473
 #, c-format
 msgid ""
-"Your USB key doesn't have any valid Windows (FAT) partitions.\n"
+"Your USB key does not have any valid Windows (FAT) partitions.\n"
 "We need one to continue (beside, it's more standard so that you\n"
 "will be able to move and access your files from machines\n"
 "running Windows). Please plug in an USB key containing a\n"
@@ -99,7 +99,7 @@ msgid ""
 msgstr ""
 "Teie USB mälupulgal pole ühtki sobivat Windows (FAT) partitsiooni.\n"
 "Jätkamiseks on seda aga kindlasti vaja, pealegi on see vajalik\n"
-"ka selleks et liigutada faile ja neile ligi pääseda masinatelt,\n"
+"ka selleks et liigutada faile ja neile ligi pääseda masinatest,\n"
 "millel töötab Windows.\n"
 "Seepärast palun ühendage Windowsi partitsiooniga USB mälupulk.\n"
 "\n"
@@ -111,7 +111,7 @@ msgstr ""
 #: ../move/move.pm:483
 #, c-format
 msgid ""
-"We didn't detect any USB key on your system. If you\n"
+"We did not detect any USB key on your system. If you\n"
 "plug in an USB key now, Mandrake Move will have the ability\n"
 "to transparently save the data in your home directory and\n"
 "system wide configuration, for next boot on this computer\n"
@@ -126,8 +126,8 @@ msgstr ""
 "Teie süsteemist ei suudetud leida ühtki USB mälupulka.\n"
 "Kui ühendate USB mälupulga nüüd, võib Mandrake Move\n"
 "salvestada läbipaistvalt Teie kodukataloogi andmed ning\n"
-"süsteemse seadistuse järgmiseks alglaadimiseks sellel\n"
-"või mõnel muul arvutil. Märkus: kui ühendate mälupulga\n"
+"süsteemse seadistuse järgmiseks alglaadimiseks selles\n"
+"või mõnes muus arvutis. Märkus: kui ühendate mälupulga\n"
 "praegu, oodake mõni sekund, enne kui proovite seda\n"
 "uuesti tuvastada.\n"
 "\n"
@@ -172,58 +172,61 @@ msgid "Please wait, detecting and configuring devices..."
 msgstr "Palun oodake, tuvastan ja seadistan seadmeid..."
 
 #: ../move/move.pm:604 ../move/move.pm:660 ../move/move.pm:664
-#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:223
-#: diskdrake/interactive.pm:236 diskdrake/interactive.pm:377
-#: diskdrake/interactive.pm:392 diskdrake/interactive.pm:515
-#: diskdrake/interactive.pm:520 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:167
-#: install_steps.pm:82 install_steps_interactive.pm:38 interactive/http.pm:117
-#: interactive/http.pm:118 network/netconnect.pm:995 network/netconnect.pm:999
-#: network/netconnect.pm:1004 network/netconnect.pm:1045
-#: network/netconnect.pm:1049 network/netconnect.pm:1187
-#: network/netconnect.pm:1192 network/netconnect.pm:1210
-#: network/netconnect.pm:1393 printer/printerdrake.pm:238
+#: diskdrake/dav.pm:75 diskdrake/hd_gtk.pm:116 diskdrake/interactive.pm:227
+#: diskdrake/interactive.pm:240 diskdrake/interactive.pm:393
+#: diskdrake/interactive.pm:411 diskdrake/interactive.pm:541
+#: diskdrake/interactive.pm:546 diskdrake/smbnfs_gtk.pm:42 fsedit.pm:183
+#: install_any.pm:1564 install_any.pm:1587 install_steps.pm:82
+#: install_steps_interactive.pm:38 interactive/http.pm:117
+#: interactive/http.pm:118 network/netconnect.pm:1037
+#: network/netconnect.pm:1041 network/netconnect.pm:1046
+#: network/netconnect.pm:1072 network/netconnect.pm:1141
+#: network/netconnect.pm:1145 network/netconnect.pm:1283
+#: network/netconnect.pm:1288 network/netconnect.pm:1306
+#: network/netconnect.pm:1491 printer/printerdrake.pm:238
 #: printer/printerdrake.pm:245 printer/printerdrake.pm:270
 #: printer/printerdrake.pm:416 printer/printerdrake.pm:421
 #: printer/printerdrake.pm:434 printer/printerdrake.pm:444
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:1182
-#: printer/printerdrake.pm:1229 printer/printerdrake.pm:1266
-#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1314
-#: printer/printerdrake.pm:1328 printer/printerdrake.pm:1418
-#: printer/printerdrake.pm:1498 printer/printerdrake.pm:1502
-#: printer/printerdrake.pm:1506 printer/printerdrake.pm:1555
-#: printer/printerdrake.pm:1612 printer/printerdrake.pm:1616
-#: printer/printerdrake.pm:1630 printer/printerdrake.pm:1740
-#: printer/printerdrake.pm:1744 printer/printerdrake.pm:1781
-#: printer/printerdrake.pm:1846 printer/printerdrake.pm:1864
-#: printer/printerdrake.pm:1873 printer/printerdrake.pm:1882
-#: printer/printerdrake.pm:1893 printer/printerdrake.pm:1955
-#: printer/printerdrake.pm:2408 printer/printerdrake.pm:2672
-#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3188
-#: printer/printerdrake.pm:3192 printer/printerdrake.pm:3196
-#: printer/printerdrake.pm:3606 printer/printerdrake.pm:3846
-#: printer/printerdrake.pm:3866 printer/printerdrake.pm:3942
-#: printer/printerdrake.pm:4007 printer/printerdrake.pm:4123
-#: standalone/drakTermServ:379 standalone/drakTermServ:731
-#: standalone/drakTermServ:738 standalone/drakTermServ:933
-#: standalone/drakTermServ:1403 standalone/drakTermServ:1408
-#: standalone/drakTermServ:1415 standalone/drakTermServ:1426
-#: standalone/drakTermServ:1447 standalone/drakauth:37
-#: standalone/drakbackup:512 standalone/drakbackup:626
-#: standalone/drakbackup:1128 standalone/drakbackup:1161
-#: standalone/drakbackup:1665 standalone/drakbackup:1821
-#: standalone/drakbackup:2416 standalone/drakbackup:4105
-#: standalone/drakbackup:4325 standalone/drakbug:235 standalone/drakbug:254
-#: standalone/drakbug:260 standalone/drakclock:125 standalone/drakconnect:648
-#: standalone/drakconnect:651 standalone/drakconnect:670
-#: standalone/drakfloppy:297 standalone/drakfloppy:301
-#: standalone/drakfloppy:307 standalone/drakfont:210 standalone/drakfont:223
-#: standalone/drakfont:259 standalone/drakfont:604 standalone/draksplash:21
-#: standalone/draksplash:501 standalone/drakxtv:107 standalone/logdrake:169
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:635
+#: printer/printerdrake.pm:1288 printer/printerdrake.pm:1335
+#: printer/printerdrake.pm:1372 printer/printerdrake.pm:1416
+#: printer/printerdrake.pm:1420 printer/printerdrake.pm:1434
+#: printer/printerdrake.pm:1524 printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1609 printer/printerdrake.pm:1613
+#: printer/printerdrake.pm:1662 printer/printerdrake.pm:1719
+#: printer/printerdrake.pm:1723 printer/printerdrake.pm:1737
+#: printer/printerdrake.pm:1848 printer/printerdrake.pm:1852
+#: printer/printerdrake.pm:1889 printer/printerdrake.pm:1957
+#: printer/printerdrake.pm:1975 printer/printerdrake.pm:1984
+#: printer/printerdrake.pm:1993 printer/printerdrake.pm:2004
+#: printer/printerdrake.pm:2066 printer/printerdrake.pm:2159
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:2949
+#: printer/printerdrake.pm:2955 printer/printerdrake.pm:3501
+#: printer/printerdrake.pm:3505 printer/printerdrake.pm:3509
+#: printer/printerdrake.pm:3965 printer/printerdrake.pm:4205
+#: printer/printerdrake.pm:4225 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366 printer/printerdrake.pm:4483
+#: standalone/drakTermServ:392 standalone/drakTermServ:753
+#: standalone/drakTermServ:760 standalone/drakTermServ:779
+#: standalone/drakTermServ:998 standalone/drakTermServ:1478
+#: standalone/drakTermServ:1483 standalone/drakTermServ:1490
+#: standalone/drakTermServ:1502 standalone/drakTermServ:1523
+#: standalone/drakauth:35 standalone/drakbackup:511 standalone/drakbackup:625
+#: standalone/drakbackup:1127 standalone/drakbackup:1160
+#: standalone/drakbackup:1671 standalone/drakbackup:1827
+#: standalone/drakbackup:2421 standalone/drakbackup:4110
+#: standalone/drakbackup:4330 standalone/drakbug:191 standalone/drakclock:124
+#: standalone/drakconnect:649 standalone/drakconnect:652
+#: standalone/drakconnect:671 standalone/drakfloppy:297
+#: standalone/drakfloppy:300 standalone/drakfloppy:306 standalone/drakfont:209
+#: standalone/drakfont:222 standalone/drakfont:258 standalone/drakfont:604
+#: standalone/draksplash:21 standalone/draksplash:501 standalone/drakxtv:107
+#: standalone/finish-install:39 standalone/logdrake:169
 #: standalone/logdrake:437 standalone/logdrake:442 standalone/scannerdrake:59
-#: standalone/scannerdrake:196 standalone/scannerdrake:255
-#: standalone/scannerdrake:684 standalone/scannerdrake:695
-#: standalone/scannerdrake:834 standalone/scannerdrake:845
-#: standalone/scannerdrake:915 wizards.pm:95 wizards.pm:99 wizards.pm:121
+#: standalone/scannerdrake:202 standalone/scannerdrake:261
+#: standalone/scannerdrake:715 standalone/scannerdrake:726
+#: standalone/scannerdrake:865 standalone/scannerdrake:876
+#: standalone/scannerdrake:946 wizards.pm:95 wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
 msgstr "Viga"
@@ -231,7 +234,7 @@ msgstr "Viga"
 #: ../move/move.pm:605 install_steps.pm:83
 #, c-format
 msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
+"An error occurred, but I do not know how to handle it nicely.\n"
 "Continue at your own risk."
 msgstr ""
 "Tekkis mingi viga, aga seda ei suuda programm ise klaarida.\n"
@@ -289,7 +292,7 @@ msgstr "Taaskäivita"
 #: ../move/tree/mdk_totem:50 ../move/tree/mdk_totem:96
 #, c-format
 msgid "You can only run with no CDROM support"
-msgstr "Töötada saab ainult ilma CD-ROM toetuseta"
+msgstr "Töötada saab ainult ilma CD toetuseta"
 
 #: ../move/tree/mdk_totem:71
 #, c-format
@@ -299,11 +302,11 @@ msgstr "Tapa need programmid"
 #: ../move/tree/mdk_totem:72
 #, c-format
 msgid "No CDROM support"
-msgstr "CD-ROM toetuseta"
+msgstr "CD toetuseta"
 
 #: ../move/tree/mdk_totem:76 diskdrake/hd_gtk.pm:95
-#: diskdrake/interactive.pm:1005 diskdrake/interactive.pm:1015
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1020 diskdrake/interactive.pm:1030
+#: diskdrake/interactive.pm:1083
 #, c-format
 msgid "Read carefully!"
 msgstr "Lugege hoolega!"
@@ -311,16 +314,16 @@ msgstr "Lugege hoolega!"
 #: ../move/tree/mdk_totem:77
 #, c-format
 msgid ""
-"You can't use another CDROM when the following programs are running: \n"
+"You can not use another CDROM when the following programs are running: \n"
 "%s"
 msgstr ""
-"Muud CD-ROMi ei saa valida, kui töötavad järgmised programmid: \n"
+"Muud CD-d ei saa valida, kui töötavad järgmised programmid: \n"
 "%s"
 
 #: ../move/tree/mdk_totem:101
 #, c-format
 msgid "Copying to memory to allow removing the CDROM"
-msgstr "Kopeerimine mällu CD-ROM eemaldamise võimaldamiseks"
+msgstr "Kopeerimine mällu CD eemaldamise võimaldamiseks"
 
 #: Xconfig/card.pm:13
 #, c-format
@@ -367,23 +370,23 @@ msgstr "32 MB"
 msgid "64 MB or more"
 msgstr "64 MB või rohkem"
 
-#: Xconfig/card.pm:155
+#: Xconfig/card.pm:159
 #, c-format
 msgid "X server"
 msgstr "X server"
 
-#: Xconfig/card.pm:156
+#: Xconfig/card.pm:160
 #, c-format
 msgid "Choose an X server"
 msgstr "Valige X server"
 
 #
-#: Xconfig/card.pm:188
+#: Xconfig/card.pm:192
 #, c-format
 msgid "Multi-head configuration"
 msgstr "Mitme monitori seadistamine"
 
-#: Xconfig/card.pm:189
+#: Xconfig/card.pm:193
 #, c-format
 msgid ""
 "Your system supports multiple head configuration.\n"
@@ -392,62 +395,62 @@ msgstr ""
 "Süsteemis on võimalik kasutada mitut monitori.\n"
 "Mida Te soovite teha?"
 
-#: Xconfig/card.pm:255
+#: Xconfig/card.pm:262
 #, c-format
-msgid "Can't install Xorg package: %s"
+msgid "Can not install Xorg package: %s"
 msgstr "Ei õnnestunud paigaldada Xorg paketti: %s"
 
-#: Xconfig/card.pm:265
+#: Xconfig/card.pm:272
 #, c-format
 msgid "Select the memory size of your graphics card"
 msgstr "Valige graafikamälu suurus"
 
-#: Xconfig/card.pm:352
+#: Xconfig/card.pm:349
 #, c-format
 msgid "Xorg configuration"
 msgstr "Xorg seadistused"
 
-#: Xconfig/card.pm:354
+#: Xconfig/card.pm:351
 #, c-format
 msgid "Which configuration of Xorg do you want to have?"
 msgstr "Millist Xorg seadistust soovite kasutada?"
 
-#: Xconfig/card.pm:387
+#: Xconfig/card.pm:384
 #, c-format
 msgid "Configure all heads independently"
 msgstr "Seadistada kõik monitorid sõltumatult"
 
-#: Xconfig/card.pm:388
+#: Xconfig/card.pm:385
 #, c-format
 msgid "Use Xinerama extension"
 msgstr "Kasutada Xinerama laiendusi"
 
-#: Xconfig/card.pm:393
+#: Xconfig/card.pm:390
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Seadistada ainult kaardi \"%s\"%s"
 
-#: Xconfig/card.pm:405 Xconfig/various.pm:23
+#: Xconfig/card.pm:402 Xconfig/various.pm:23
 #, c-format
 msgid "Xorg %s"
 msgstr "Xorg %s"
 
-#: Xconfig/card.pm:412 Xconfig/various.pm:22
+#: Xconfig/card.pm:409 Xconfig/various.pm:22
 #, c-format
 msgid "Xorg %s with 3D hardware acceleration"
 msgstr "Xorg %s koos 3D graafikakiirendi toega"
 
-#: Xconfig/card.pm:414
+#: Xconfig/card.pm:411
 #, c-format
 msgid "Your card can have 3D hardware acceleration support with Xorg %s."
 msgstr "Teie kaardi 3D graafikakiirendit toetab Xorg %s."
 
-#: Xconfig/card.pm:420
+#: Xconfig/card.pm:417
 #, c-format
 msgid "Xorg %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "Xorg %s koos EKSPERIMENTAALSE 3D kiirendi toega"
 
-#: Xconfig/card.pm:422
+#: Xconfig/card.pm:419
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with Xorg %s,\n"
@@ -456,16 +459,16 @@ msgstr ""
 "Teie videokaardi 3D graafikakiirendit saab kasutada koos Xorg %s-ga.\n"
 "SEE ON AGA EKSPERIMENTAALNE JA VÕIB OLLA EBASTABIILNE."
 
-#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:116 any.pm:912
+#: Xconfig/main.pm:90 Xconfig/main.pm:91 Xconfig/monitor.pm:117 any.pm:914
 #, c-format
 msgid "Custom"
-msgstr "Isetehtud"
+msgstr "Kohandatud"
 
 #: Xconfig/main.pm:115 diskdrake/dav.pm:26 help.pm:14
-#: install_steps_interactive.pm:88 printer/printerdrake.pm:712
-#: printer/printerdrake.pm:3937 printer/printerdrake.pm:4382
-#: standalone/draksplash:120 standalone/harddrake2:265 standalone/logdrake:174
-#: standalone/net_applet:160 standalone/scannerdrake:446
+#: install_steps_interactive.pm:86 printer/printerdrake.pm:737
+#: printer/printerdrake.pm:4296 printer/printerdrake.pm:4742
+#: standalone/draksplash:120 standalone/logdrake:174 standalone/net_applet:183
+#: standalone/scannerdrake:477
 #, c-format
 msgid "Quit"
 msgstr "Välju"
@@ -475,34 +478,34 @@ msgstr "Välju"
 msgid "Graphic Card"
 msgstr "Graafikakaart"
 
-#: Xconfig/main.pm:120 Xconfig/monitor.pm:110
+#: Xconfig/main.pm:120 Xconfig/monitor.pm:111
 #, c-format
 msgid "Monitor"
 msgstr "Monitor"
 
-#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:222
+#: Xconfig/main.pm:123 Xconfig/resolution_and_depth.pm:221
 #, c-format
 msgid "Resolution"
-msgstr "Kuvatihedus"
+msgstr "Ekraanilahutus"
 
 #: Xconfig/main.pm:128
 #, c-format
 msgid "Test"
 msgstr "Test"
 
-#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:418
+#: Xconfig/main.pm:133 diskdrake/dav.pm:65 diskdrake/interactive.pm:437
 #: diskdrake/removable.pm:24 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakfont:494 standalone/drakfont:556 standalone/harddrake2:262
+#: standalone/drakfont:493 standalone/drakfont:555
 #, c-format
 msgid "Options"
 msgstr "Eelistused"
 
-#: Xconfig/main.pm:167
+#: Xconfig/main.pm:168
 #, c-format
 msgid "Your Xorg configuration file is broken, we will ignore it."
 msgstr "Teie Xorgi konfiguratsioonifail on vigane, seda ignoreeritakse."
 
-#: Xconfig/main.pm:184
+#: Xconfig/main.pm:186
 #, c-format
 msgid ""
 "Keep the changes?\n"
@@ -515,38 +518,38 @@ msgstr ""
 "\n"
 "%s"
 
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
 #, c-format
 msgid "Choose a monitor for head #%d"
 msgstr "Valige monitor peale #%d"
 
-#: Xconfig/monitor.pm:111
+#: Xconfig/monitor.pm:112
 #, c-format
 msgid "Choose a monitor"
 msgstr "Valige monitor"
 
-#: Xconfig/monitor.pm:117
+#: Xconfig/monitor.pm:118
 #, c-format
 msgid "Plug'n Play"
 msgstr "Plug'n Play"
 
-#: Xconfig/monitor.pm:118 mouse.pm:49
+#: Xconfig/monitor.pm:119 mouse.pm:49
 #, c-format
 msgid "Generic"
 msgstr "Tavaline"
 
-#: Xconfig/monitor.pm:119 standalone/drakconnect:567 standalone/harddrake2:49
-#: standalone/harddrake2:83
+#: Xconfig/monitor.pm:120 standalone/drakconnect:569 standalone/harddrake2:52
+#: standalone/harddrake2:86
 #, c-format
 msgid "Vendor"
 msgstr "Tootja"
 
-#: Xconfig/monitor.pm:129
+#: Xconfig/monitor.pm:130
 #, c-format
 msgid "Plug'n Play probing failed. Please select the correct monitor"
 msgstr "Plug'n Play test ebaõnnestus. Palun valige monitor täpsemalt"
 
-#: Xconfig/monitor.pm:134
+#: Xconfig/monitor.pm:135
 #, c-format
 msgid ""
 "The two critical parameters are the vertical refresh rate, which is the "
@@ -568,12 +571,12 @@ msgstr ""
 "hävida.\n"
 "Kui kahtlete, valige pigem väiksem väärtus."
 
-#: Xconfig/monitor.pm:141
+#: Xconfig/monitor.pm:142
 #, c-format
 msgid "Horizontal refresh rate"
 msgstr "Realaotussagedus"
 
-#: Xconfig/monitor.pm:142
+#: Xconfig/monitor.pm:143
 #, c-format
 msgid "Vertical refresh rate"
 msgstr "Ekraaniuuendussagedus"
@@ -598,60 +601,60 @@ msgstr "65 tuhat värvi (16 bitti)"
 msgid "16 million colors (24 bits)"
 msgstr "16 miljonit värvi (24 bitti)"
 
-#: Xconfig/resolution_and_depth.pm:135
+#: Xconfig/resolution_and_depth.pm:133
 #, c-format
 msgid "Resolutions"
-msgstr "Kuvatihedused"
+msgstr "Ekraanilahutused"
 
 #: Xconfig/resolution_and_depth.pm:270
 #, c-format
 msgid "Choose the resolution and the color depth"
-msgstr "Valige kuvatihedus ja värvisügavus"
+msgstr "Valige ekraanilahutus ja värvisügavus"
 
 #: Xconfig/resolution_and_depth.pm:271
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Graafikakaart: %s"
 
-#: Xconfig/resolution_and_depth.pm:284 interactive.pm:403
-#: interactive/gtk.pm:766 interactive/http.pm:103 interactive/http.pm:156
+#: Xconfig/resolution_and_depth.pm:285 interactive.pm:424
+#: interactive/gtk.pm:768 interactive/http.pm:103 interactive/http.pm:156
 #: interactive/newt.pm:317 interactive/newt.pm:419 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakTermServ:201 standalone/drakTermServ:474
-#: standalone/drakbackup:3962 standalone/drakbackup:4022
-#: standalone/drakbackup:4066 standalone/drakconnect:165
-#: standalone/drakconnect:850 standalone/drakconnect:937
-#: standalone/drakconnect:1036 standalone/drakfont:577 standalone/drakroam:388
-#: standalone/drakups:208 standalone/net_monitor:345 ugtk2.pm:417 ugtk2.pm:515
-#: ugtk2.pm:1122 ugtk2.pm:1145
+#: standalone/drakTermServ:199 standalone/drakTermServ:490
+#: standalone/drakbackup:3967 standalone/drakbackup:4027
+#: standalone/drakbackup:4071 standalone/drakconnect:165
+#: standalone/drakconnect:849 standalone/drakconnect:936
+#: standalone/drakconnect:1035 standalone/drakfont:576 standalone/drakroam:388
+#: standalone/drakups:208 standalone/net_monitor:344 ugtk2.pm:409 ugtk2.pm:506
+#: ugtk2.pm:900 ugtk2.pm:923
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: Xconfig/resolution_and_depth.pm:284 diskdrake/smbnfs_gtk.pm:81 help.pm:89
-#: help.pm:444 install_steps_gtk.pm:458 install_steps_interactive.pm:412
-#: install_steps_interactive.pm:840 interactive.pm:404 interactive/gtk.pm:770
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/smbnfs_gtk.pm:81 help.pm:89
+#: help.pm:444 install_steps_gtk.pm:480 install_steps_interactive.pm:422
+#: install_steps_interactive.pm:826 interactive.pm:425 interactive/gtk.pm:772
 #: interactive/http.pm:104 interactive/http.pm:160 interactive/newt.pm:316
 #: interactive/newt.pm:423 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:3266
-#: standalone/drakautoinst:217 standalone/drakbackup:3888
-#: standalone/drakbackup:3892 standalone/drakbackup:3950
-#: standalone/drakconnect:164 standalone/drakconnect:935
-#: standalone/drakconnect:1035 standalone/drakfont:667 standalone/drakfont:744
-#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:344
-#: ugtk2.pm:411 ugtk2.pm:513 ugtk2.pm:522 ugtk2.pm:1122
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3579
+#: standalone/drakautoinst:217 standalone/drakbackup:3893
+#: standalone/drakbackup:3897 standalone/drakbackup:3955
+#: standalone/drakconnect:164 standalone/drakconnect:934
+#: standalone/drakconnect:1034 standalone/drakfont:668 standalone/drakfont:745
+#: standalone/drakups:215 standalone/logdrake:174 standalone/net_monitor:343
+#: ugtk2.pm:403 ugtk2.pm:504 ugtk2.pm:513 ugtk2.pm:900
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
-#: Xconfig/resolution_and_depth.pm:284 diskdrake/hd_gtk.pm:153
-#: install_steps_gtk.pm:239 install_steps_gtk.pm:644 interactive.pm:498
-#: interactive/gtk.pm:628 interactive/gtk.pm:630 standalone/drakTermServ:280
-#: standalone/drakbackup:3884 standalone/drakbug:128
+#: Xconfig/resolution_and_depth.pm:285 diskdrake/hd_gtk.pm:153
+#: install_steps_gtk.pm:228 install_steps_gtk.pm:629 interactive.pm:519
+#: interactive/gtk.pm:638 interactive/gtk.pm:640 standalone/drakTermServ:284
+#: standalone/drakbackup:3889 standalone/drakbug:104
 #: standalone/drakconnect:160 standalone/drakconnect:245
-#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:337
-#: standalone/draksec:339 standalone/draksec:357 standalone/draksec:359
-#: standalone/harddrake2:261 ugtk2.pm:1235 ugtk2.pm:1236
+#: standalone/drakfont:511 standalone/drakperm:134 standalone/draksec:336
+#: standalone/draksec:338 standalone/draksec:356 standalone/draksec:358
+#: ugtk2.pm:1031 ugtk2.pm:1032
 #, c-format
 msgid "Help"
 msgstr "Abi"
@@ -682,12 +685,12 @@ msgstr ""
 "%s\n"
 "Proovige mõnda parameetrit muuta"
 
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
 #, c-format
 msgid "Leaving in %d seconds"
 msgstr "Lõpuni %d sekundit"
 
-#: Xconfig/test.pm:133
+#: Xconfig/test.pm:129
 #, c-format
 msgid "Is this the correct setting?"
 msgstr "Kas see on sobiv?"
@@ -740,12 +743,12 @@ msgstr "Värvisügavus: %s\n"
 #: Xconfig/various.pm:41
 #, c-format
 msgid "Resolution: %s\n"
-msgstr "Kuvatihedus: %s\n"
+msgstr "Ekraanilahutus: %s\n"
 
 #: Xconfig/various.pm:43
 #, c-format
 msgid "Xorg driver: %s\n"
-msgstr "Xorg draiver: %s\n"
+msgstr "Xorg'i draiver: %s\n"
 
 #: Xconfig/various.pm:72
 #, c-format
@@ -787,20 +790,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Millist TV-standardit Te kasutate?"
 
-#: any.pm:116 harddrake/sound.pm:170 interactive.pm:441 standalone/drakbug:227
-#: standalone/drakconnect:167 standalone/drakconnect:611 standalone/draksec:68
-#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:211
-#: standalone/service_harddrake:199
+#: any.pm:140 harddrake/sound.pm:191 install_any.pm:652 interactive.pm:462
+#: standalone/drakconnect:167 standalone/drakconnect:613 standalone/draksec:68
+#: standalone/drakups:101 standalone/drakxtv:92 standalone/harddrake2:231
+#: standalone/service_harddrake:204
 #, c-format
 msgid "Please wait"
 msgstr "Palun oodake"
 
-#: any.pm:116
+#: any.pm:140
 #, c-format
 msgid "Bootloader installation in progress"
-msgstr "Alglaaduri paigaldus..."
+msgstr "Paigaldatakse alglaadurit..."
 
-#: any.pm:127
+#: any.pm:151
 #, c-format
 msgid ""
 "LILO wants to assign a new Volume ID to drive %s.  However, changing\n"
@@ -817,16 +820,16 @@ msgstr ""
 "\n"
 "Kas anda kettale uus ID?"
 
-#: any.pm:138
+#: any.pm:162
 #, c-format
 msgid "Installation of bootloader failed. The following error occurred:"
 msgstr "Alglaaduri paigaldamine ebaõnnestus. Tekkis järgmine viga:"
 
-#: any.pm:144
+#: any.pm:168
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  If you don't see the bootloader prompt at\n"
+" enable the bootloader.  If you do not see the bootloader prompt at\n"
 " reboot, hold down Command-Option-O-F at reboot and enter:\n"
 " setenv boot-device %s,\\\\:tbxi\n"
 " Then type: shut-down\n"
@@ -839,7 +842,7 @@ msgstr ""
 " Seejärel kirjutage: shut-down\n"
 "Järgmisel käivitusel peaksite nägema alglaaduri käsurida."
 
-#: any.pm:181
+#: any.pm:206
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -854,259 +857,258 @@ msgstr ""
 "\n"
 "Milliselt kettalt Te alglaadimise teete?"
 
-#: any.pm:204 help.pm:739
+#: any.pm:229 help.pm:739
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Ketta algusesse (MBR)"
 
-#: any.pm:205
+#: any.pm:230
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Juurpartitsiooni algusesse"
 
-#: any.pm:207
+#: any.pm:232
 #, c-format
 msgid "On Floppy"
 msgstr "Disketil"
 
-#: any.pm:209 help.pm:739 printer/printerdrake.pm:3603
+#: any.pm:234 help.pm:739 printer/printerdrake.pm:3962
 #, c-format
 msgid "Skip"
 msgstr "Jäta vahele"
 
-#: any.pm:213
+#: any.pm:238
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LiLo/grub paigaldamine"
 
-#: any.pm:214
+#: any.pm:239
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Kuhu soovite alglaaduri paigaldada?"
 
-#: any.pm:239 standalone/drakboot:307
+#: any.pm:264 standalone/drakboot:307
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Alglaaduri stiil"
 
-#: any.pm:241 any.pm:275
+#: any.pm:266 any.pm:298
 #, c-format
 msgid "Bootloader main options"
 msgstr "Alglaaduri põhiseadistused"
 
-#: any.pm:245
+#: any.pm:270
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Anna mälu suurus megabaitides"
 
-#: any.pm:247
+#: any.pm:272
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
-msgstr "Võti ``Piiratakse käsurea võtmeid'' ei ole kasutatav ilma salasõnata"
+msgstr ""
+"Võtit \"Piiratakse käsurea võtmeid\" ei saa kasutada parooli sisestamata"
 
-#: any.pm:248 any.pm:586 install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176
 #, c-format
 msgid "The passwords do not match"
-msgstr "Salasõnad ei klapi"
+msgstr "Paroolid ei klapi"
 
-#: any.pm:248 any.pm:586 diskdrake/interactive.pm:1261
-#: install_steps_interactive.pm:1215
+#: any.pm:273 any.pm:606 authentication.pm:176 diskdrake/interactive.pm:1270
 #, c-format
 msgid "Please try again"
 msgstr "Palun proovige veel"
 
-#: any.pm:253 any.pm:278
+#: any.pm:278 any.pm:301
 #, c-format
 msgid "Bootloader to use"
 msgstr "Eelistatav alglaadur"
 
-#: any.pm:255 any.pm:280
+#: any.pm:280 any.pm:303
 #, c-format
 msgid "Boot device"
 msgstr "Alglaadimisseade"
 
-#: any.pm:257
+#: any.pm:282
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Ooteaeg alglaadimisel"
 
-#: any.pm:258
+#: any.pm:283
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI lubamine"
 
-#: any.pm:260
+#: any.pm:285
 #, c-format
 msgid "Force no APIC"
 msgstr "APIC keelatakse"
 
-#: any.pm:262
+#: any.pm:287
 #, c-format
 msgid "Force No Local APIC"
 msgstr "Kohalik APIC keelatakse"
 
-#: any.pm:264 any.pm:613 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1220 network/netconnect.pm:595
-#: printer/printerdrake.pm:1489 printer/printerdrake.pm:1609
-#: standalone/drakbackup:1647 standalone/drakbackup:3490
-#: standalone/drakups:295
+#: any.pm:289 any.pm:633 authentication.pm:181 diskdrake/smbnfs_gtk.pm:180
+#: network/netconnect.pm:633 printer/printerdrake.pm:1596
+#: printer/printerdrake.pm:1716 standalone/drakbackup:1653
+#: standalone/drakbackup:3495 standalone/drakups:295
 #, c-format
 msgid "Password"
-msgstr "Salasõna"
+msgstr "Parool"
 
-#: any.pm:265 any.pm:614 install_steps_interactive.pm:1221
+#: any.pm:290 any.pm:634 authentication.pm:182
 #, c-format
 msgid "Password (again)"
-msgstr "Salasõna (uuesti)"
+msgstr "Parool (uuesti)"
 
-#: any.pm:266
+#: any.pm:291
 #, c-format
 msgid "Restrict command line options"
 msgstr "Piiratakse käsurea võtmeid"
 
-#: any.pm:266
+#: any.pm:291
 #, c-format
 msgid "restrict"
 msgstr "piiratud"
 
-#: any.pm:268
+#: any.pm:293
 #, c-format
 msgid "Clean /tmp at each boot"
-msgstr "Puhastatakse /tmp igal laadimisel"
+msgstr "/tmp puhastatakse igal käivitumisel"
 
-#: any.pm:269
+#: any.pm:294
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
-msgstr "Kui vaja, täpsustage RAM suurust (leitud %d MB)"
+msgstr "Vajadusel täpsustage mälu suurust (leitud %d MB)"
 
-#: any.pm:279
+#: any.pm:302
 #, c-format
 msgid "Init Message"
 msgstr "Initsialiseerimisteade"
 
-#: any.pm:281
+#: any.pm:304
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Open Firmware viivitus"
 
-#: any.pm:282
+#: any.pm:305
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Ajapiirang kerneli laadimisel"
 
-#: any.pm:283
+#: any.pm:306
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "CD-lt laadimine lubatud?"
 
-#: any.pm:284
+#: any.pm:307
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "OF laadimine lubatud?"
 
-#: any.pm:285
+#: any.pm:308
 #, c-format
 msgid "Default OS?"
 msgstr "Vaikimisi OS?"
 
-#: any.pm:338
+#: any.pm:361
 #, c-format
 msgid "Image"
 msgstr "Laadefail"
 
-#: any.pm:339 any.pm:349
+#: any.pm:362 any.pm:372
 #, c-format
 msgid "Root"
-msgstr "Juur"
+msgstr "Juurpartitsioon"
 
-#: any.pm:340 any.pm:362
+#: any.pm:363 any.pm:385
 #, c-format
 msgid "Append"
-msgstr "Lisand"
+msgstr "Lisaargumendid"
 
-#: any.pm:342 standalone/drakboot:309 standalone/drakboot:313
+#: any.pm:365 standalone/drakboot:309 standalone/drakboot:313
 #, c-format
 msgid "Video mode"
-msgstr "Graafikamood"
+msgstr "Ekraanilahutus"
 
-#: any.pm:344
+#: any.pm:367
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:345
+#: any.pm:368
 #, c-format
 msgid "Network profile"
 msgstr "Võrguprofiil"
 
-#: any.pm:354 any.pm:359 any.pm:361
+#: any.pm:377 any.pm:382 any.pm:384
 #, c-format
 msgid "Label"
-msgstr "Pealdis"
+msgstr "Nimi"
 
-#: any.pm:356 any.pm:366 harddrake/v4l.pm:275 standalone/drakfloppy:84
+#: any.pm:379 any.pm:389 harddrake/v4l.pm:275 standalone/drakfloppy:84
 #: standalone/drakfloppy:90 standalone/draksec:52
 #, c-format
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: any.pm:363
+#: any.pm:386
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd suurus"
 
-#: any.pm:365
+#: any.pm:388
 #, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: any.pm:376
+#: any.pm:399
 #, c-format
 msgid "Empty label not allowed"
-msgstr "Tühi kirjetähis ei ole lubatud"
+msgstr "Nimi ei tohi puududa"
 
-#: any.pm:377
+#: any.pm:400
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Teil peab olema kerneli laadepilt"
 
-#: any.pm:377
+#: any.pm:400
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Teil peab olema juurpartitsioon"
 
-#: any.pm:378
+#: any.pm:401
 #, c-format
 msgid "This label is already used"
-msgstr "Selline pealdis on juba kasutusel"
+msgstr "Selline nimi on juba kasutusel"
 
-#: any.pm:392
+#: any.pm:415
 #, c-format
 msgid "Which type of entry do you want to add?"
-msgstr "Millisele sektorile soovite seda tõsta?"
+msgstr "Millist kirjet soovite lisada?"
 
-#: any.pm:393
+#: any.pm:416
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:393
+#: any.pm:416
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Muu OS (SunOS...)"
 
-#: any.pm:394
+#: any.pm:417
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Muu OS (MacOS...)"
 
-#: any.pm:394
+#: any.pm:417
 #, c-format
 msgid "Other OS (Windows...)"
 msgstr "Muu OS (Windows...)"
 
-#: any.pm:422
+#: any.pm:445
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1115,154 +1117,155 @@ msgstr ""
 "Praegu on kasutusel sellised kirjed.\n"
 "Te võite neid lisada ning olemasolevaid muuta."
 
-#: any.pm:572
+#: any.pm:592
 #, c-format
 msgid "access to X programs"
-msgstr "ligipääs X-i rakendustele"
+msgstr "ligipääs X'i rakendustele"
 
-#: any.pm:573
+#: any.pm:593
 #, c-format
 msgid "access to rpm tools"
-msgstr "ligipääs rpm vahenditele"
+msgstr "ligipääs rpm-vahenditele"
 
-#: any.pm:574
+#: any.pm:594
 #, c-format
 msgid "allow \"su\""
 msgstr "\"su\" lubamine"
 
-#: any.pm:575
+#: any.pm:595
 #, c-format
 msgid "access to administrative files"
 msgstr "ligipääs administreerimisfailidele"
 
-#: any.pm:576
+#: any.pm:596
 #, c-format
 msgid "access to network tools"
 msgstr "ligipääs võrgutöövahenditele"
 
-#: any.pm:577
+#: any.pm:597
 #, c-format
 msgid "access to compilation tools"
 msgstr "ligipääs kompileerimisvahenditele"
 
-#: any.pm:582
+#: any.pm:602
 #, c-format
 msgid "(already added %s)"
 msgstr "(juba lisatud %s)"
 
-#: any.pm:587
+#: any.pm:607
 #, c-format
 msgid "This password is too simple"
-msgstr "Salasõna on liiga lihtne"
+msgstr "Parool on liiga lihtne"
 
-#: any.pm:588
+#: any.pm:608
 #, c-format
 msgid "Please give a user name"
 msgstr "Palun andke kasutajanimi"
 
-#: any.pm:589
+#: any.pm:609
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr ""
-"Kasutajanimi tohib sisaldada ainult väikesi tähti, numbreid ning märke '-' "
-"ja '_'"
+"Kasutajanimi tohib sisaldada ainult väikesi tähti, numbreid ning märke \"-\" "
+"ja \"_\""
 
-#: any.pm:590
+#: any.pm:610
 #, c-format
 msgid "The user name is too long"
 msgstr "See kasutajanimi on liiga pikk"
 
-#: any.pm:591
+#: any.pm:611
 #, c-format
 msgid "This user name has already been added"
 msgstr "See kasutajanimi on juba lisatud"
 
-#: any.pm:595
+#: any.pm:615
 #, c-format
 msgid "Add user"
 msgstr "Lisa kasutaja"
 
-#: any.pm:596
+#: any.pm:616
 #, c-format
 msgid ""
 "Enter a user\n"
 "%s"
 msgstr ""
-"Sisesta kasutaja\n"
+"Kasutaja lisamine\n"
 "%s"
 
-#: any.pm:599 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
+#: any.pm:619 diskdrake/dav.pm:66 diskdrake/hd_gtk.pm:157
 #: diskdrake/removable.pm:26 diskdrake/smbnfs_gtk.pm:82 help.pm:530
 #: interactive/http.pm:151 printer/printerdrake.pm:191
-#: printer/printerdrake.pm:376 printer/printerdrake.pm:4382
-#: standalone/drakbackup:2703 standalone/scannerdrake:637
-#: standalone/scannerdrake:787
+#: printer/printerdrake.pm:376 printer/printerdrake.pm:4742
+#: standalone/drakbackup:2708 standalone/scannerdrake:668
+#: standalone/scannerdrake:818
 #, c-format
 msgid "Done"
 msgstr "Tehtud"
 
-#: any.pm:600 help.pm:51
+#: any.pm:620 help.pm:51
 #, c-format
 msgid "Accept user"
-msgstr "Kasutaja õige"
+msgstr "Lisa kasutaja"
 
-#: any.pm:611
+#: any.pm:631
 #, c-format
 msgid "Real name"
 msgstr "Pärisnimi"
 
-#: any.pm:612 standalone/drakbackup:1642
+#: any.pm:632 standalone/drakbackup:1648
 #, c-format
 msgid "Login name"
 msgstr "Kasutajatunnus"
 
-#: any.pm:615
+#: any.pm:635
 #, c-format
 msgid "Shell"
-msgstr "Käsurida"
+msgstr "Shell"
 
-#: any.pm:617
+#: any.pm:637
 #, c-format
 msgid "Icon"
 msgstr "Ikoon"
 
-#: any.pm:664 security/l10n.pm:14
+#: any.pm:684 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
-msgstr "Vaikimisi sisenemine"
+msgstr "Automaatne sisselogimine"
 
-#: any.pm:665
+#: any.pm:685
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
-msgstr "Teie arvutit saab seada vaikimisi kasutaja sisenemisele."
+msgstr ""
+"Teie arvutis saab määrata kasutaja, kel on lubatud automaatselt sisse logida."
 
-#: any.pm:666 help.pm:51
+#: any.pm:686 help.pm:51
 #, c-format
 msgid "Do you want to use this feature?"
-msgstr "Kas soovite kasutada seda omadust?"
+msgstr "Kas soovite seda lubada?"
 
-#: any.pm:667
+#: any.pm:687
 #, c-format
 msgid "Choose the default user:"
-msgstr "Valige vaikimisi kasutaja:"
+msgstr "Valige kasutaja:"
 
-#: any.pm:668
+#: any.pm:688
 #, c-format
 msgid "Choose the window manager to run:"
-msgstr "Valige palun käivitatav aknahaldur:"
+msgstr "Valige käivitatav aknahaldur:"
 
-#: any.pm:680
+#: any.pm:700
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Valige palun kasutatav keel."
 
-#: any.pm:681
+#: any.pm:701
 #, c-format
 msgid "Language choice"
 msgstr "Keelevalik"
 
-#: any.pm:707
+#: any.pm:727
 #, c-format
 msgid ""
 "Mandrakelinux can support multiple languages. Select\n"
@@ -1270,60 +1273,62 @@ msgid ""
 "when your installation is complete and you restart your system."
 msgstr ""
 "Mandrakelinux toetab paljusid keeli. Valige keeled, mida\n"
-"soovite paigaldada. Kui paigaldus on lõpetatud ja Te teete\n"
+"soovite paigaldada. Kui paigaldamine on lõpetatud ja Te teete\n"
 "süsteemile taaskäivituse, saate neid kasutada."
 
-#: any.pm:725 help.pm:647
+#: any.pm:746 help.pm:647
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Unicode kasutamine vaikimisi"
 
-#: any.pm:726 help.pm:647
+#: any.pm:747 help.pm:647
 #, c-format
 msgid "All languages"
 msgstr "Kõik keeled"
 
-#: any.pm:765 help.pm:566 help.pm:855 install_steps_interactive.pm:960
+#: any.pm:786 help.pm:566 help.pm:855 install_steps_interactive.pm:946
 #, c-format
 msgid "Country / Region"
-msgstr "Maa / Piirkond"
+msgstr "Riik / Piirkond"
 
-#: any.pm:766
+#: any.pm:787
 #, c-format
 msgid "Please choose your country."
-msgstr "Palun valige oma maa."
+msgstr "Palun valige oma riik."
 
-#: any.pm:768
+#: any.pm:789
 #, c-format
 msgid "Here is the full list of available countries"
-msgstr "See on saadaolevate maade täielik nimekiri"
+msgstr "See on kõigi riikide täielik nimekiri"
 
-#: any.pm:769
+#: any.pm:790
 #, c-format
 msgid "Other Countries"
 msgstr "Muud riigid"
 
-#: any.pm:777
+#: any.pm:798
 #, c-format
 msgid "Input method:"
 msgstr "Sisestusmeetod:"
 
-#: any.pm:778 install_any.pm:420 printer/printerdrake.pm:99
+#: any.pm:799 install_any.pm:388 network/netconnect.pm:323
+#: network/netconnect.pm:328 printer/printerdrake.pm:99
+#: printer/printerdrake.pm:2111
 #, c-format
 msgid "None"
 msgstr "Puudub"
 
-#: any.pm:912
+#: any.pm:914
 #, c-format
 msgid "No sharing"
 msgstr "Jagamiseta"
 
-#: any.pm:912
+#: any.pm:914
 #, c-format
 msgid "Allow all users"
 msgstr "Lubatud kõigile kasutajatele"
 
-#: any.pm:916
+#: any.pm:918
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1338,7 +1343,7 @@ msgstr ""
 "\n"
 "\"Isetehtud\" lubab määrata seda kasutajate kaupa.\n"
 
-#: any.pm:928
+#: any.pm:930
 #, c-format
 msgid ""
 "NFS: the traditional Unix file sharing system, with less support on Mac and "
@@ -1347,7 +1352,7 @@ msgstr ""
 "NFS: UNIX-i traditsiooniline failijagamissüsteem, mida Mac ja Windows eriti "
 "ei toeta."
 
-#: any.pm:931
+#: any.pm:933
 #, c-format
 msgid ""
 "SMB: a file sharing system used by Windows, Mac OS X and many modern Linux "
@@ -1356,28 +1361,28 @@ msgstr ""
 "SMB: failijagamissüsteem, mida toetavad Windows, Mac OS X ja enamik moodsaid "
 "Linuxi süsteeme."
 
-#: any.pm:939
+#: any.pm:941
 #, c-format
 msgid ""
 "You can export using NFS or SMB. Please select which you would like to use."
 msgstr "Eksportida saab NFS või SMB abil. Palun valige, kumba kasutada."
 
-#: any.pm:964
+#: any.pm:966
 #, c-format
 msgid "Launch userdrake"
 msgstr "Userdrake käivitamine"
 
-#: any.pm:964 printer/printerdrake.pm:3478 printer/printerdrake.pm:3481
-#: printer/printerdrake.pm:3482 printer/printerdrake.pm:3483
-#: printer/printerdrake.pm:4676 standalone/drakTermServ:289
-#: standalone/drakbackup:4084 standalone/drakbug:151 standalone/drakfont:500
-#: standalone/drakfont:594 standalone/net_monitor:123
-#: standalone/printerdrake:559
+#: any.pm:966 printer/printerdrake.pm:3802 printer/printerdrake.pm:3805
+#: printer/printerdrake.pm:3806 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:5036 standalone/drakTermServ:294
+#: standalone/drakbackup:4089 standalone/drakbug:126 standalone/drakfont:499
+#: standalone/drakfont:595 standalone/net_monitor:123
+#: standalone/printerdrake:547
 #, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: any.pm:966
+#: any.pm:968
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1401,38 +1406,43 @@ msgstr "LDAP"
 msgid "NIS"
 msgstr "NIS"
 
-#: authentication.pm:19 authentication.pm:127
+#: authentication.pm:19
+#, c-format
+msgid "Smart Card"
+msgstr "Kiipkaart"
+
+#: authentication.pm:20 authentication.pm:148
 #, c-format
 msgid "Windows Domain"
 msgstr "Windowsi domeen"
 
-#: authentication.pm:20
+#: authentication.pm:21
 #, c-format
 msgid "Active Directory with SFU"
 msgstr "Active Directory + SFU"
 
-#: authentication.pm:21
+#: authentication.pm:22
 #, c-format
 msgid "Active Directory with Winbind"
 msgstr "Active Directory + Winbind"
 
-#: authentication.pm:30
+#: authentication.pm:51
 #, c-format
 msgid "Local file:"
 msgstr "Kohalik fail:"
 
-#: authentication.pm:30
+#: authentication.pm:51
 #, c-format
 msgid ""
 "Use local for all authentication and information user tell in local file"
 msgstr "Kohaliku faili kasutamine autentimiseks ja kasutaja info hankimiseks."
 
-#: authentication.pm:31
+#: authentication.pm:52
 #, c-format
 msgid "LDAP:"
 msgstr "LDAP:"
 
-#: authentication.pm:31
+#: authentication.pm:52
 #, c-format
 msgid ""
 "Tells your computer to use LDAP for some or all authentication. LDAP "
@@ -1441,12 +1451,12 @@ msgstr ""
 "Paneb arvuti vähemalt osaliselt kasutama autentimiseks LDAP-i. LDAP sisaldab "
 "reeglina teatud laadi organisatsioonisisest infot."
 
-#: authentication.pm:32
+#: authentication.pm:53
 #, c-format
 msgid "NIS:"
 msgstr "NIS:"
 
-#: authentication.pm:32
+#: authentication.pm:53
 #, c-format
 msgid ""
 "Allows you to run a group of computers in the same Network Information "
@@ -1455,128 +1465,129 @@ msgstr ""
 "Võimaldab rühmal arvutitel töötada samas võrguinfoteenuse (NIS) domeenis "
 "ühise parooli- ja grupifailiga."
 
-#: authentication.pm:33
+#: authentication.pm:54
 #, c-format
 msgid "Windows Domain:"
 msgstr "Windowsi domeen:"
 
-#: authentication.pm:33
+#: authentication.pm:54
 #, c-format
 msgid ""
 "Winbind allows the system to retrieve information and authenticate users in "
 "a Windows domain."
 msgstr ""
-"Winbind võimaldab süsteemil hankida infot ja kasutajaid autentida Windowsi "
+"Winbind võimaldab süsteemil hankida infot ja autentida kasutajaid Windowsi "
 "domeeni põhjal."
 
-#: authentication.pm:34
+#: authentication.pm:55
 #, c-format
 msgid "Active Directory with SFU:"
 msgstr "Active Directory + SFU:"
 
-#: authentication.pm:34 authentication.pm:35
+#: authentication.pm:55 authentication.pm:56
 #, c-format
 msgid ""
 "Kerberos is a secure system for providing network authentication services."
 msgstr "Kerberos on turvaline võrguautentimisteenuseid pakkuv süsteem."
 
-#: authentication.pm:35
+#: authentication.pm:56
 #, c-format
 msgid "Active Directory with Winbind:"
 msgstr "Active Directory + Winbind:"
 
-#: authentication.pm:60
+#: authentication.pm:81
 #, c-format
 msgid "Authentication LDAP"
 msgstr "LDAP autentimine"
 
-#: authentication.pm:61
+#: authentication.pm:82
 #, c-format
 msgid "LDAP Base dn"
 msgstr "LDAPi alus dn"
 
-#: authentication.pm:62 share/compssUsers.pl:101
+#: authentication.pm:83 share/compssUsers.pl:101
 #, c-format
 msgid "LDAP Server"
 msgstr "LDAP server"
 
-#: authentication.pm:75 fsedit.pm:21
+#: authentication.pm:96 fsedit.pm:21
 #, c-format
 msgid "simple"
 msgstr "lihtne"
 
-#: authentication.pm:76
+#: authentication.pm:97
 #, c-format
 msgid "TLS"
 msgstr "TLS"
 
-#: authentication.pm:77
+#: authentication.pm:98
 #, c-format
 msgid "SSL"
 msgstr "SSL"
 
-#: authentication.pm:78
+#: authentication.pm:99
 #, c-format
 msgid "security layout (SASL/Kerberos)"
 msgstr "turvavorm (SASL/Kerberos)"
 
-#: authentication.pm:85 authentication.pm:123
+#: authentication.pm:106 authentication.pm:144
 #, c-format
 msgid "Authentication Active Directory"
 msgstr "Active Directory autentimine"
 
-#: authentication.pm:86 authentication.pm:125 diskdrake/smbnfs_gtk.pm:181
+#: authentication.pm:107 authentication.pm:146 diskdrake/smbnfs_gtk.pm:181
 #, c-format
 msgid "Domain"
 msgstr "Domeen"
 
-#: authentication.pm:88 diskdrake/dav.pm:63 help.pm:146
+#: authentication.pm:109 diskdrake/dav.pm:63 help.pm:146
 #: printer/printerdrake.pm:135 share/compssUsers.pl:81
+#: standalone/drakTermServ:269
 #, c-format
 msgid "Server"
 msgstr "Server"
 
-#: authentication.pm:89
+#: authentication.pm:110
 #, c-format
 msgid "LDAP users database"
 msgstr "LDAP kasutajate andmebaas"
 
-#: authentication.pm:90
+#: authentication.pm:111
 #, c-format
 msgid "Use Anonymous BIND "
 msgstr "Anonüümse BIND kasutamine "
 
-#: authentication.pm:91
+#: authentication.pm:112
 #, c-format
 msgid "LDAP user allowed to browse the Active Directory"
 msgstr "LDAP kasutajal on lubatud Active Directory sirvimine"
 
-#: authentication.pm:92
+#: authentication.pm:113
 #, c-format
 msgid "Password for user"
 msgstr "Kasutaja parool"
 
-#: authentication.pm:93
+#: authentication.pm:114
 #, c-format
 msgid "Encryption"
 msgstr "Krüptimine"
 
-#: authentication.pm:104
+#: authentication.pm:125
 #, c-format
 msgid "Authentication NIS"
 msgstr "NIS autentimine"
 
-#: authentication.pm:105
+#: authentication.pm:126
 #, c-format
 msgid "NIS Domain"
 msgstr "NIS domeen"
 
-#: authentication.pm:106
+#: authentication.pm:127
 #, c-format
 msgid "NIS Server"
 msgstr "NIS server"
 
-#: authentication.pm:111
+#: authentication.pm:132
 #, c-format
 msgid ""
 "For this to work for a W2K PDC, you will probably need to have the admin "
@@ -1593,53 +1604,85 @@ msgid ""
 "good."
 msgstr ""
 "Et see töötaks W2K primaarse domeenikontrolleri (PDC) puhul, on Teil vaja "
-"administraatori privileege, et käivitada serveril käsk  \"C:\\>net "
+"administraatori privileege, et käivitada serveris käsk  \"C:\\>net "
 "localgroup \"Pre-Windows 2000 Compatible Access\" everyone /add\" ja teha "
 "sellele alglaadimine.\n"
 "Samuti on Teil vaja domeeni administraatori kasutajanime/parooli, et "
 "ühendada see masin Windows(TM) domeeniga.\n"
-"Kui võrguühendus ei ole veel seadistatud, üritab DrakX domeeni ühenduda "
-"pärast võrgu seadistamist.\n"
-"Kui midagi peaks ebaõnnestuma ja domeeni autentimine ei tööta, käivitage "
-"pärast alglaadimist käsurealt 'smbpasswd -j DOMEEN -U KASUTAJA%%PAROOL', kus "
-"DOMEEN on Teie Windows(TM) domeen ja KASUTAJA%%PAROOL on domeeni "
+"Kui võrguühendus ei ole veel seadistatud, üritab DrakX domeeniga ühenduse "
+"luua pärast võrgu seadistamist.\n"
+"Kui midagi peaks ebaõnnestuma ja domeeni autentimine ei tööta, andke pärast "
+"alglaadimist käsureal korraldus \"smbpasswd -j DOMEEN -U KASUTAJA%%PAROOL\", "
+"kus DOMEEN on Teie Windows(TM) domeen ja KASUTAJA%%PAROOL on domeeni "
 "administraator parooliga.\n"
-"Käsk 'wbinfo -t' võimaldab kontrollida, kas domeeni autentimisfraasid on "
+"Käsk \"wbinfo -t\" võimaldab kontrollida, kas domeeni autentimisfraasid on "
 "õiged."
 
-#: authentication.pm:123
+#: authentication.pm:144
 #, c-format
 msgid "Authentication Windows Domain"
 msgstr "Windowsi domeeni autentimine"
 
-#: authentication.pm:128
+#: authentication.pm:149
 #, c-format
 msgid "Domain Admin User Name"
 msgstr "Domeeni administraatori kasutajatunnus"
 
-#: authentication.pm:129
+#: authentication.pm:150
 #, c-format
 msgid "Domain Admin Password"
 msgstr "Domeeni administraatori parool"
 
-#: authentication.pm:130
+#: authentication.pm:151
 #, c-format
 msgid "Use Idmap for store UID/SID "
 msgstr "Idmapi kasutamine UID/SID salvestamiseks "
 
-#: authentication.pm:131
+#: authentication.pm:152
 #, c-format
 msgid "Default Idmap "
 msgstr "Vaikimisi Idmap "
 
-#: authentication.pm:231
+#: authentication.pm:165
+#, c-format
+msgid "Set administrator (root) password and network authentication methods"
+msgstr "Administraatori (root) )parooli ja võrguautentimismeetodite määramine"
+
+#: authentication.pm:166
+#, c-format
+msgid "Set administrator (root) password"
+msgstr "Administraatori (root) parool"
+
+#: authentication.pm:167 standalone/drakvpn:1125
+#, c-format
+msgid "Authentication method"
+msgstr "Autentimisviis"
+
+#. -PO: keep this short or else the buttons will not fit in the window
+#: authentication.pm:172 help.pm:722
+#, c-format
+msgid "No password"
+msgstr "Parool puudub"
+
+#: authentication.pm:178
+#, c-format
+msgid "This password is too short (it must be at least %d characters long)"
+msgstr "Parool on liiga lühike (peaks olema vähemalt %d tähemärki)"
+
+#: authentication.pm:183 network/netconnect.pm:328 network/netconnect.pm:634
+#: standalone/drakauth:23 standalone/drakauth:25 standalone/drakconnect:459
+#, c-format
+msgid "Authentication"
+msgstr "Autentimisviis"
+
+#: authentication.pm:296
 #, c-format
-msgid "Can't use broadcast with no NIS domain"
+msgid "Can not use broadcast with no NIS domain"
 msgstr "Üldlevi kasutamine on ilma NIS domeenita võimatu"
 
 # NOTE: this message will be displayed at boot time; that is# only the ascii charset will be available on most machines# so use only 7bit for this message (and do transliteration or# leave it in English, as it is the best for your language)
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:673
+#: bootloader.pm:728
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1654,56 +1697,56 @@ msgstr ""
 "ehk oodake, kuni laetakse vaikimisi valitu.\n"
 "\n"
 
-#: bootloader.pm:787
+#: bootloader.pm:815
 #, c-format
 msgid "LILO with graphical menu"
-msgstr "LiLo graafikaresiimis"
+msgstr "LiLo graafilises režiimis"
 
-#: bootloader.pm:788
+#: bootloader.pm:816
 #, c-format
 msgid "LILO with text menu"
-msgstr "LiLo tekstiresiimis"
+msgstr "LiLo tekstirežiimis"
 
-#: bootloader.pm:789
+#: bootloader.pm:817
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:790
+#: bootloader.pm:818
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:852
+#: bootloader.pm:881
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot on liiga täis"
 
-#: bootloader.pm:1266
+#: bootloader.pm:1295
 #, c-format
-msgid "You can't install the bootloader on a %s partition\n"
+msgid "You can not install the bootloader on a %s partition\n"
 msgstr "Alglaadurit ei ole võimalik paigaldada partitsioonile %s\n"
 
-#: bootloader.pm:1311
+#: bootloader.pm:1340
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
 msgstr "Alglaaduri seadistust tuleb uuendada, sest partitsioon on ümber seatud"
 
-#: bootloader.pm:1326
+#: bootloader.pm:1355
 #, c-format
 msgid ""
-"The bootloader can't be installed correctly. You have to boot rescue and "
+"The bootloader can not be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
 "Alglaadurit ei ole võimalik korrektselt paigaldada. Teil tuleb ette võtta "
-"alglaadimine päästeresiimis (rescue) ja valida \"%s\""
+"alglaadimine päästerežiimis (rescue) ja valida \"%s\""
 
-#: bootloader.pm:1327
+#: bootloader.pm:1356
 #, c-format
 msgid "Re-install Boot Loader"
-msgstr "Alglaaduri taaspaigaldus"
+msgstr "Alglaaduri taaspaigaldamine"
 
 #: common.pm:125
 #, c-format
@@ -1740,94 +1783,115 @@ msgstr "1 minut"
 msgid "%d seconds"
 msgstr "%d sekundit"
 
-#: common.pm:197
-#, c-format
-msgid "Can't make screenshots before partitioning"
-msgstr "Hetktõmmiseid ei saa teha enne partitsioneerimist"
-
-#: common.pm:204
-#, c-format
-msgid "Screenshots will be available after install in %s"
-msgstr "Hetktõmmised asuvad pärast paigaldust asukohas %s"
-
-#: common.pm:269
+#: common.pm:240
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesu puudub"
 
-#: common.pm:272
+#: common.pm:243
 #, c-format
 msgid "consolehelper missing"
 msgstr "consolehelper puudub"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:254 network/adsl_consts.pm:309
-#: network/adsl_consts.pm:320 network/adsl_consts.pm:330
-#: network/adsl_consts.pm:340 network/adsl_consts.pm:350
-#: network/adsl_consts.pm:361 network/adsl_consts.pm:372
-#: network/adsl_consts.pm:382 network/adsl_consts.pm:392
-#: network/netconnect.pm:47
+#: crypto.pm:14 crypto.pm:43 lang.pm:202 network/adsl_consts.pm:50
+#: network/adsl_consts.pm:58 network/adsl_consts.pm:66
 #, c-format
-msgid "France"
-msgstr "Prantsusmaa"
-
-#: crypto.pm:15 lang.pm:229
-#, c-format
-msgid "Costa Rica"
-msgstr "Costa Rica"
+msgid "Austria"
+msgstr "Austria"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:201 network/adsl_consts.pm:59
-#: network/adsl_consts.pm:66 network/adsl_consts.pm:77
-#: network/adsl_consts.pm:85 network/netconnect.pm:50
+#: crypto.pm:15 crypto.pm:34 lang.pm:209 network/adsl_consts.pm:74
+#: network/adsl_consts.pm:82 network/adsl_consts.pm:93
+#: network/adsl_consts.pm:101 network/netconnect.pm:50
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:235
+#: crypto.pm:16 lang.pm:230 network/adsl_consts.pm:780
+#: network/adsl_consts.pm:788 network/adsl_consts.pm:798
+#, c-format
+msgid "Switzerland"
+msgstr "Šveits"
+
+#: crypto.pm:17 lang.pm:237
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
+
+#: crypto.pm:18 crypto.pm:35 lang.pm:243 network/adsl_consts.pm:319
 #, c-format
 msgid "Czech Republic"
 msgstr "Tšehhi"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:236 network/adsl_consts.pm:410
-#: network/adsl_consts.pm:418
+#: crypto.pm:19 crypto.pm:36 lang.pm:244 network/adsl_consts.pm:437
+#: network/adsl_consts.pm:445
 #, c-format
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:267 network/adsl_consts.pm:428
+#: crypto.pm:20 crypto.pm:33 lang.pm:262 network/adsl_consts.pm:343
+#: network/adsl_consts.pm:354 network/adsl_consts.pm:365
+#: network/adsl_consts.pm:375 network/adsl_consts.pm:385
+#: network/adsl_consts.pm:396 network/adsl_consts.pm:407
+#: network/adsl_consts.pm:417 network/adsl_consts.pm:427
+#: network/netconnect.pm:47
+#, c-format
+msgid "France"
+msgstr "Prantsusmaa"
+
+#: crypto.pm:21 crypto.pm:37 lang.pm:275 network/adsl_consts.pm:455
 #, c-format
 msgid "Greece"
 msgstr "Kreeka"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:340
+#: crypto.pm:22 lang.pm:286 network/adsl_consts.pm:463
 #, c-format
-msgid "Norway"
-msgstr "Norra"
+msgid "Hungary"
+msgstr "Ungari"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:369 network/adsl_consts.pm:561
+#: crypto.pm:23 crypto.pm:42 lang.pm:295 network/adsl_consts.pm:489
+#: network/adsl_consts.pm:499 network/adsl_consts.pm:509
+#: network/adsl_consts.pm:517 network/netconnect.pm:49 standalone/drakxtv:47
 #, c-format
-msgid "Sweden"
-msgstr "Rootsi"
+msgid "Italy"
+msgstr "Itaalia"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:339 network/adsl_consts.pm:495
-#: network/netconnect.pm:48
+#: crypto.pm:24 crypto.pm:41 lang.pm:347 network/adsl_consts.pm:545
+#: network/adsl_consts.pm:553 network/adsl_consts.pm:561
+#: network/adsl_consts.pm:569 network/netconnect.pm:48
 #, c-format
 msgid "Netherlands"
 msgstr "Holland"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:287 network/adsl_consts.pm:452
-#: network/adsl_consts.pm:462 network/adsl_consts.pm:469
-#: network/netconnect.pm:49 standalone/drakxtv:47
+#: crypto.pm:25 crypto.pm:38 lang.pm:348 network/adsl_consts.pm:577
+#: network/adsl_consts.pm:582 network/adsl_consts.pm:587
+#: network/adsl_consts.pm:592 network/adsl_consts.pm:597
+#: network/adsl_consts.pm:602 network/adsl_consts.pm:607
 #, c-format
-msgid "Italy"
-msgstr "Itaalia"
+msgid "Norway"
+msgstr "Norra"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:194 network/adsl_consts.pm:36
-#: network/adsl_consts.pm:44 network/adsl_consts.pm:52
+#: crypto.pm:26 lang.pm:360 network/adsl_consts.pm:614
+#: network/adsl_consts.pm:624
 #, c-format
-msgid "Austria"
-msgstr "Austria"
+msgid "Poland"
+msgstr "Poola"
+
+#: crypto.pm:27 crypto.pm:39 lang.pm:377 network/adsl_consts.pm:772
+#, c-format
+msgid "Sweden"
+msgstr "Rootsi"
+
+#: crypto.pm:28 lang.pm:382
+#, c-format
+msgid "Slovakia"
+msgstr "Slovakkia"
 
-#: crypto.pm:35 crypto.pm:65 lang.pm:403 network/netconnect.pm:51
+#: crypto.pm:29 lang.pm:406
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: crypto.pm:40 crypto.pm:75 lang.pm:411 network/netconnect.pm:51
 #, c-format
 msgid "United States"
 msgstr "USA"
@@ -1843,25 +1907,25 @@ msgstr ""
 "WebDAV on protokoll, mis võimaldab haakida veebiserveri kataloogi\n"
 "kohalikult ning käsitleda seda kui kohalikku failisüsteemi (eeldusel, et\n"
 "veebiserver on seadistatud WebDAV-serverina). Kui soovite lisada\n"
-"WebDAVi haakepunkte, vajutage nupule \"Uus\"."
+"WebDAVi haakepunkte, klõpsake nupule \"Uus\"."
 
 #: diskdrake/dav.pm:25
 #, c-format
 msgid "New"
 msgstr "Uus"
 
-#: diskdrake/dav.pm:61 diskdrake/interactive.pm:425 diskdrake/smbnfs_gtk.pm:75
+#: diskdrake/dav.pm:61 diskdrake/interactive.pm:443 diskdrake/smbnfs_gtk.pm:75
 #, c-format
 msgid "Unmount"
 msgstr "Lahuta"
 
-#: diskdrake/dav.pm:62 diskdrake/interactive.pm:422 diskdrake/smbnfs_gtk.pm:76
+#: diskdrake/dav.pm:62 diskdrake/interactive.pm:440 diskdrake/smbnfs_gtk.pm:76
 #, c-format
 msgid "Mount"
 msgstr "Haagi"
 
-#: diskdrake/dav.pm:64 diskdrake/interactive.pm:416
-#: diskdrake/interactive.pm:627 diskdrake/interactive.pm:646
+#: diskdrake/dav.pm:64 diskdrake/interactive.pm:435
+#: diskdrake/interactive.pm:653 diskdrake/interactive.pm:672
 #: diskdrake/removable.pm:23 diskdrake/smbnfs_gtk.pm:79
 #, c-format
 msgid "Mount point"
@@ -1882,13 +1946,13 @@ msgstr "URL peab algama kas http:// või https://"
 msgid "Server: "
 msgstr "Server: "
 
-#: diskdrake/dav.pm:110 diskdrake/interactive.pm:479
-#: diskdrake/interactive.pm:1155 diskdrake/interactive.pm:1232
+#: diskdrake/dav.pm:110 diskdrake/interactive.pm:504
+#: diskdrake/interactive.pm:1166 diskdrake/interactive.pm:1241
 #, c-format
 msgid "Mount point: "
 msgstr "Haakepunkt: "
 
-#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1239
+#: diskdrake/dav.pm:111 diskdrake/interactive.pm:1248
 #, c-format
 msgid "Options: %s"
 msgstr "Eelistused: %s"
@@ -1935,8 +1999,8 @@ msgstr ""
 msgid "Please click on a partition"
 msgstr "Palun valige partitsioon"
 
-#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:474
-#: standalone/drakbackup:2938 standalone/drakbackup:2998
+#: diskdrake/hd_gtk.pm:208 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:482
+#: standalone/drakbackup:2943 standalone/drakbackup:3003
 #, c-format
 msgid "Details"
 msgstr "Üksikasjad"
@@ -1946,169 +2010,180 @@ msgstr "Üksikasjad"
 msgid "No hard drives found"
 msgstr "Kõvakettaid ei leitud"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Ext2"
 msgstr "Ext2"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Journalised FS"
 msgstr "Kirjendatud FS"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Swap"
 msgstr "Saaleala"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "SunOS"
 msgstr "SunOS"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "HFS"
 msgstr "HFS"
 
-#: diskdrake/hd_gtk.pm:325
+#: diskdrake/hd_gtk.pm:338
 #, c-format
 msgid "Windows"
 msgstr "Windows"
 
-#: diskdrake/hd_gtk.pm:326 install_steps_gtk.pm:298 mouse.pm:168
-#: services.pm:164 standalone/drakbackup:1603 standalone/drakperm:250
+#: diskdrake/hd_gtk.pm:339 install_steps_gtk.pm:284 mouse.pm:168
+#: services.pm:162 standalone/drakbackup:1609 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "Muu"
 
-#: diskdrake/hd_gtk.pm:326 diskdrake/interactive.pm:1172
+#: diskdrake/hd_gtk.pm:339 diskdrake/interactive.pm:1181
 #, c-format
 msgid "Empty"
 msgstr "Tühi"
 
-#: diskdrake/hd_gtk.pm:330
+#: diskdrake/hd_gtk.pm:343
 #, c-format
 msgid "Filesystem types:"
 msgstr "Failisüsteemi tüübid: "
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:349 diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:362 diskdrake/hd_gtk.pm:368
 #, c-format
 msgid "Use ``%s'' instead"
-msgstr "Kasutage pigem ``%s''"
+msgstr "Kasutage pigem \"%s\""
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/hd_gtk.pm:352
-#: diskdrake/interactive.pm:417 diskdrake/interactive.pm:580
+#: diskdrake/hd_gtk.pm:360 diskdrake/interactive.pm:459
+#, c-format
+msgid "Create"
+msgstr "Tekita"
+
+#: diskdrake/hd_gtk.pm:360 diskdrake/hd_gtk.pm:368
+#: diskdrake/interactive.pm:436 diskdrake/interactive.pm:606
 #: diskdrake/removable.pm:25 diskdrake/removable.pm:48
-#: standalone/harddrake2:101
+#: standalone/harddrake2:106 standalone/harddrake2:115
 #, c-format
 msgid "Type"
 msgstr "Tüüp"
 
-#: diskdrake/hd_gtk.pm:347 diskdrake/interactive.pm:441
-#, c-format
-msgid "Create"
-msgstr "Tekita"
-
 #. -PO: "Delete" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: diskdrake/hd_gtk.pm:349 diskdrake/interactive.pm:426
-#: standalone/drakperm:124 standalone/printerdrake:242
+#: diskdrake/hd_gtk.pm:362 diskdrake/interactive.pm:444
+#: standalone/drakperm:124 standalone/printerdrake:235
 #, c-format
 msgid "Delete"
 msgstr "Kustuta"
 
-#: diskdrake/hd_gtk.pm:352
+#: diskdrake/hd_gtk.pm:368
 #, c-format
 msgid "Use ``Unmount'' first"
 msgstr "Kasutage enne \"Lahuta\""
 
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
 #, c-format
 msgid "Choose another partition"
 msgstr "Valige muu partitsioon"
 
-#: diskdrake/interactive.pm:187
+#: diskdrake/interactive.pm:191
 #, c-format
 msgid "Choose a partition"
 msgstr "Valige partitsioon"
 
-#: diskdrake/interactive.pm:216
+#: diskdrake/interactive.pm:220
 #, c-format
 msgid "Exit"
 msgstr "Välju"
 
-#: diskdrake/interactive.pm:249 help.pm:530
+#: diskdrake/interactive.pm:253 help.pm:530
 #, c-format
 msgid "Undo"
 msgstr "Tagasi"
 
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
 #, c-format
 msgid "Toggle to normal mode"
-msgstr "Ekspert -> Tavakasutaja"
+msgstr "Lülitu tavarežiimi"
 
-#: diskdrake/interactive.pm:249
+#: diskdrake/interactive.pm:253
 #, c-format
 msgid "Toggle to expert mode"
-msgstr "Tavakasutaja -> Ekspert"
+msgstr "Lülitu ekspertrežiimi"
 
-#: diskdrake/interactive.pm:268
+#: diskdrake/interactive.pm:272
 #, c-format
 msgid "Continue anyway?"
 msgstr "Kas ikkagi jätkata?"
 
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:275
+#, c-format
+msgid ""
+"You should format partition %s.\n"
+"Otherwise no entry for mount point %s will be written in fstab.\n"
+"Quit anyway?"
+msgstr ""
+"Teil tuleks vormindada partitsioon %s.\n"
+"Vastasel juhul ei kirjutata fstab-i haakepunktile %s üldse kirjet.\n"
+"Kas sellele vaatamata väljuda?"
+
+#: diskdrake/interactive.pm:282
 #, c-format
 msgid "Quit without saving"
 msgstr "Välju ilma salvestamata"
 
-#: diskdrake/interactive.pm:273
+#: diskdrake/interactive.pm:282
 #, c-format
 msgid "Quit without writing the partition table?"
 msgstr "Kas väljuda partitsioonitabelit salvestamata?"
 
-#: diskdrake/interactive.pm:278
+#: diskdrake/interactive.pm:287
 #, c-format
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Kas salvestada /etc/fstab muudatused"
 
-#: diskdrake/interactive.pm:285 install_steps_interactive.pm:313
+#: diskdrake/interactive.pm:294 install_steps_interactive.pm:329
 #, c-format
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Partitsioonitabeli säilitamiseks vajate alglaadimist"
 
-#: diskdrake/interactive.pm:298 help.pm:530
+#: diskdrake/interactive.pm:307 help.pm:530
 #, c-format
 msgid "Clear all"
 msgstr "Kustuta kõik"
 
-#: diskdrake/interactive.pm:299 help.pm:530
+#: diskdrake/interactive.pm:308 help.pm:530
 #, c-format
 msgid "Auto allocate"
-msgstr "Paiguta ise"
+msgstr "Automaatne jagamine"
 
-#: diskdrake/interactive.pm:300 help.pm:530 help.pm:566 help.pm:606
-#: help.pm:855 install_steps_interactive.pm:124
+#: diskdrake/interactive.pm:309 help.pm:530 help.pm:566 help.pm:606
+#: help.pm:855 install_steps_interactive.pm:122
 #, c-format
 msgid "More"
 msgstr "Veel..."
 
-#: diskdrake/interactive.pm:305
+#: diskdrake/interactive.pm:314
 #, c-format
 msgid "Hard drive information"
 msgstr "Kõvaketta info"
 
-#: diskdrake/interactive.pm:337
+#: diskdrake/interactive.pm:346
 #, c-format
 msgid "All primary partitions are used"
 msgstr "Kõik primaarsed partitsioonid on kasutusel"
 
-#: diskdrake/interactive.pm:338
+#: diskdrake/interactive.pm:347
 #, c-format
-msgid "I can't add any more partitions"
+msgid "I can not add any more partitions"
 msgstr "Partitsioone ei saa enam lisada"
 
-#: diskdrake/interactive.pm:339
+#: diskdrake/interactive.pm:348
 #, c-format
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
@@ -2117,37 +2192,37 @@ msgstr ""
 "Et saada rohkem partitsioone, kustutage palun üks, et luua laiendatud "
 "partitsioon"
 
-#: diskdrake/interactive.pm:350 help.pm:530
+#: diskdrake/interactive.pm:359 help.pm:530
 #, c-format
 msgid "Save partition table"
 msgstr "Salvesta partitsioonitabel"
 
-#: diskdrake/interactive.pm:351 help.pm:530
+#: diskdrake/interactive.pm:360 help.pm:530
 #, c-format
 msgid "Restore partition table"
 msgstr "Taasta partitsioonitabel"
 
-#: diskdrake/interactive.pm:352 help.pm:530
+#: diskdrake/interactive.pm:361 help.pm:530
 #, c-format
 msgid "Rescue partition table"
 msgstr "Päästa partitsioonitabel"
 
-#: diskdrake/interactive.pm:354 help.pm:530
+#: diskdrake/interactive.pm:363 help.pm:530
 #, c-format
 msgid "Reload partition table"
 msgstr "Laadi partitsioonitabel uuesti"
 
-#: diskdrake/interactive.pm:356
+#: diskdrake/interactive.pm:365
 #, c-format
 msgid "Removable media automounting"
 msgstr "Eemaldatava andmekandja automaatne haakimine"
 
-#: diskdrake/interactive.pm:365 diskdrake/interactive.pm:385
+#: diskdrake/interactive.pm:376 diskdrake/interactive.pm:402
 #, c-format
 msgid "Select file"
 msgstr "Valige fail"
 
-#: diskdrake/interactive.pm:372
+#: diskdrake/interactive.pm:388
 #, c-format
 msgid ""
 "The backup partition table has not the same size\n"
@@ -2156,215 +2231,185 @@ msgstr ""
 "Tabeli varukoopia ei ole sama suurusega\n"
 "Kas ikkagi jätkata?"
 
-#: diskdrake/interactive.pm:386 harddrake/sound.pm:246 keyboard.pm:351
-#: lang.pm:1046 network/netconnect.pm:470 printer/printerdrake.pm:1037
-#: printer/printerdrake.pm:2009 printer/printerdrake.pm:2075
-#: printer/printerdrake.pm:2110 printer/printerdrake.pm:2414
-#: printer/printerdrake.pm:3330 printer/printerdrake.pm:3611
-#: printer/printerdrake.pm:3733 printer/printerdrake.pm:4823
-#: standalone/drakTermServ:315 standalone/drakTermServ:1045
-#: standalone/drakTermServ:1101 standalone/drakTermServ:1769
-#: standalone/drakbackup:511 standalone/drakbackup:610 standalone/drakboot:165
-#: standalone/drakclock:225 standalone/drakconnect:972
-#: standalone/drakfloppy:291 standalone/drakups:27 standalone/scannerdrake:51
-#: standalone/scannerdrake:909
-#, c-format
-msgid "Warning"
-msgstr "Hoiatus"
-
-#: diskdrake/interactive.pm:387
-#, c-format
-msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
-msgstr ""
-"Pange tühi diskett masinasse\n"
-"Kõik andmed sellel hävivad"
-
-#: diskdrake/interactive.pm:398
+#: diskdrake/interactive.pm:417
 #, c-format
 msgid "Trying to rescue partition table"
 msgstr "Proovin päästa partitsioonitabelit"
 
-#: diskdrake/interactive.pm:404
+#: diskdrake/interactive.pm:423
 #, c-format
 msgid "Detailed information"
 msgstr "Üksikasjalik info"
 
-#: diskdrake/interactive.pm:419 diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:438 diskdrake/interactive.pm:743
 #, c-format
 msgid "Resize"
 msgstr "Muuda suurust"
 
-#: diskdrake/interactive.pm:420 diskdrake/interactive.pm:783
-#, c-format
-msgid "Move"
-msgstr "Liiguta"
-
-#: diskdrake/interactive.pm:421
+#: diskdrake/interactive.pm:439
 #, c-format
 msgid "Format"
 msgstr "Vorminda"
 
-#: diskdrake/interactive.pm:423
+#: diskdrake/interactive.pm:441
 #, c-format
 msgid "Add to RAID"
 msgstr "Lisa RAIDi"
 
-#: diskdrake/interactive.pm:424
+#: diskdrake/interactive.pm:442
 #, c-format
 msgid "Add to LVM"
 msgstr "Lisa LVMi"
 
-#: diskdrake/interactive.pm:427
+#: diskdrake/interactive.pm:445
 #, c-format
 msgid "Remove from RAID"
 msgstr "Eemalda RAIDist"
 
-#: diskdrake/interactive.pm:428
+#: diskdrake/interactive.pm:446
 #, c-format
 msgid "Remove from LVM"
 msgstr "Eemalda LVMist"
 
-#: diskdrake/interactive.pm:429
+#: diskdrake/interactive.pm:447
 #, c-format
 msgid "Modify RAID"
 msgstr "Modifitseeri RAIDi"
 
-#: diskdrake/interactive.pm:430
+#: diskdrake/interactive.pm:448
 #, c-format
 msgid "Use for loopback"
 msgstr "Kasuta loopback-ina"
 
-#: diskdrake/interactive.pm:472
+#: diskdrake/interactive.pm:497
 #, c-format
 msgid "Create a new partition"
 msgstr "Loo uus partitsioon"
 
-#: diskdrake/interactive.pm:475
+#: diskdrake/interactive.pm:500
 #, c-format
 msgid "Start sector: "
 msgstr "Algsektor: "
 
-#: diskdrake/interactive.pm:477 diskdrake/interactive.pm:884
+#: diskdrake/interactive.pm:502 diskdrake/interactive.pm:899
 #, c-format
 msgid "Size in MB: "
 msgstr "Suurus (MB): "
 
-#: diskdrake/interactive.pm:478 diskdrake/interactive.pm:885
+#: diskdrake/interactive.pm:503 diskdrake/interactive.pm:900
 #, c-format
 msgid "Filesystem type: "
 msgstr "Failisüsteemi tüüp: "
 
-#: diskdrake/interactive.pm:483
+#: diskdrake/interactive.pm:508
 #, c-format
 msgid "Preference: "
 msgstr "Eelistus: "
 
-#: diskdrake/interactive.pm:486
+#: diskdrake/interactive.pm:511
 #, c-format
 msgid "Logical volume name "
 msgstr "Loogilise ketta nimi "
 
-#: diskdrake/interactive.pm:515
+#: diskdrake/interactive.pm:541
 #, c-format
 msgid ""
-"You can't create a new partition\n"
+"You can not create a new partition\n"
 "(since you reached the maximal number of primary partitions).\n"
 "First remove a primary partition and create an extended partition."
 msgstr ""
 "Uut partitsiooni ei saa luua\n"
-"(sest primaarseid partitsioone on juba maksimaalselt).\n"
+"(sest primaarseid partitsioone on juba maksimaalne arv).\n"
 "Eemaldage kõigepealt mõni primaarne partitsioon ja \n"
 "tekitage laiendatud partitsioon."
 
-#: diskdrake/interactive.pm:545
+#: diskdrake/interactive.pm:571
 #, c-format
 msgid "Remove the loopback file?"
-msgstr "Kas eemaldada loopback fail?"
+msgstr "Kas eemaldada loopback-fail?"
 
-#: diskdrake/interactive.pm:564
+#: diskdrake/interactive.pm:590
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "Partitsiooni %s tüübi muutmisel hävivad kõik seal olnud andmed"
 
-#: diskdrake/interactive.pm:576
+#: diskdrake/interactive.pm:602
 #, c-format
 msgid "Change partition type"
 msgstr "Muuda partitsiooni tüüpi"
 
-#: diskdrake/interactive.pm:577 diskdrake/removable.pm:47
+#: diskdrake/interactive.pm:603 diskdrake/removable.pm:47
 #, c-format
 msgid "Which filesystem do you want?"
 msgstr "Millist failisüsteemi soovite kasutada?"
 
-#: diskdrake/interactive.pm:585
+#: diskdrake/interactive.pm:611
 #, c-format
 msgid "Switching from ext2 to ext3"
 msgstr "Ext2 vahetamine ext3 vastu"
 
-#: diskdrake/interactive.pm:614
+#: diskdrake/interactive.pm:640
 #, c-format
 msgid "Where do you want to mount the loopback file %s?"
 msgstr "Kuhu soovite haakida loopback faili %s?"
 
-#: diskdrake/interactive.pm:615
+#: diskdrake/interactive.pm:641
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Kuhu soovite haakida seadme %s?"
 
-#: diskdrake/interactive.pm:620
+#: diskdrake/interactive.pm:646
 #, c-format
 msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
+"Can not unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
 "Seda haakepunkti ei saa eemaldada, sest partitsioon on kasutusel\n"
 "loopback-ina. Eemaldage esmalt loopback"
 
-#: diskdrake/interactive.pm:645
+#: diskdrake/interactive.pm:671
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Kuhu soovite haakida %s?"
 
-#: diskdrake/interactive.pm:669 diskdrake/interactive.pm:748
+#: diskdrake/interactive.pm:695 diskdrake/interactive.pm:774
 #: install_interactive.pm:156 install_interactive.pm:188
 #, c-format
 msgid "Resizing"
 msgstr "Muudan suurust"
 
-#: diskdrake/interactive.pm:669
+#: diskdrake/interactive.pm:695
 #, c-format
 msgid "Computing FAT filesystem bounds"
 msgstr "Arvutan FAT failisüsteemi piire"
 
-#: diskdrake/interactive.pm:705
+#: diskdrake/interactive.pm:731
 #, c-format
 msgid "This partition is not resizeable"
 msgstr "See partitsioon ei ole muudetav"
 
-#: diskdrake/interactive.pm:710
+#: diskdrake/interactive.pm:736
 #, c-format
 msgid "All data on this partition should be backed-up"
 msgstr "Selle partitsiooni andmetest võiks olla varukoopia"
 
-#: diskdrake/interactive.pm:712
+#: diskdrake/interactive.pm:738
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "Partitsiooni %s suuruse muutmisel hävivad sellel kõik andmed"
 
-#: diskdrake/interactive.pm:717
+#: diskdrake/interactive.pm:743
 #, c-format
 msgid "Choose the new size"
 msgstr "Valige uus suurus"
 
-#: diskdrake/interactive.pm:718
+#: diskdrake/interactive.pm:744
 #, c-format
 msgid "New size in MB: "
 msgstr "Uus suurus (MB): "
 
-#: diskdrake/interactive.pm:761 install_interactive.pm:196
+#: diskdrake/interactive.pm:787 install_interactive.pm:196
 #, c-format
 msgid ""
 "To ensure data integrity after resizing the partition(s), \n"
@@ -2373,142 +2418,117 @@ msgstr ""
 "Andmepidevuse tagamiseks pärast partitsiooni(de) suuruse muutmist \n"
 "kontrollitakse järgmisel Windows(TM) alglaadimisel failisüsteemi"
 
-#: diskdrake/interactive.pm:784
-#, c-format
-msgid "Which disk do you want to move it to?"
-msgstr "Millisele kettale soovite seda ümber paigutada?"
-
-#: diskdrake/interactive.pm:785
-#, c-format
-msgid "Sector"
-msgstr "Sektor"
-
-#: diskdrake/interactive.pm:786
-#, c-format
-msgid "Which sector do you want to move it to?"
-msgstr "Millisele sektorile soovite seda ümber paigutada?"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving"
-msgstr "Paigutan ümber"
-
-#: diskdrake/interactive.pm:789
-#, c-format
-msgid "Moving partition..."
-msgstr "Liigutan partitsiooni..."
-
-#: diskdrake/interactive.pm:810
+#: diskdrake/interactive.pm:825
 #, c-format
 msgid "Choose an existing RAID to add to"
 msgstr "Valige olemasolev RAID, millele lisada"
 
-#: diskdrake/interactive.pm:812 diskdrake/interactive.pm:828
+#: diskdrake/interactive.pm:827 diskdrake/interactive.pm:844
 #, c-format
 msgid "new"
 msgstr "uus"
 
-#: diskdrake/interactive.pm:826
+#: diskdrake/interactive.pm:842
 #, c-format
 msgid "Choose an existing LVM to add to"
 msgstr "Valige olemasolev LVM, millele lisada"
 
-#: diskdrake/interactive.pm:832
+#: diskdrake/interactive.pm:848
 #, c-format
 msgid "LVM name?"
 msgstr "LVM nimi?"
 
-#: diskdrake/interactive.pm:869
+#: diskdrake/interactive.pm:884
 #, c-format
-msgid "This partition can't be used for loopback"
+msgid "This partition can not be used for loopback"
 msgstr "Seda partitsiooni ei saa loopback-ina kasutada"
 
-#: diskdrake/interactive.pm:882
+#: diskdrake/interactive.pm:897
 #, c-format
 msgid "Loopback"
 msgstr "Loopback"
 
-#: diskdrake/interactive.pm:883
+#: diskdrake/interactive.pm:898
 #, c-format
 msgid "Loopback file name: "
 msgstr "Loopback faili nimi:"
 
-#: diskdrake/interactive.pm:888
+#: diskdrake/interactive.pm:903
 #, c-format
 msgid "Give a file name"
 msgstr "Failinimi"
 
-#: diskdrake/interactive.pm:891
+#: diskdrake/interactive.pm:906
 #, c-format
 msgid "File is already used by another loopback, choose another one"
 msgstr "See fail on juba loopback-ina kasutusel, valige mõni muu"
 
-#: diskdrake/interactive.pm:892
+#: diskdrake/interactive.pm:907
 #, c-format
 msgid "File already exists. Use it?"
 msgstr "Fail on juba olemas. Kas kasutada seda?"
 
-#: diskdrake/interactive.pm:915
+#: diskdrake/interactive.pm:930
 #, c-format
 msgid "Mount options"
 msgstr "Haakimise valikud"
 
-#: diskdrake/interactive.pm:922
+#: diskdrake/interactive.pm:937
 #, c-format
 msgid "Various"
 msgstr "Mitmesugust"
 
-#: diskdrake/interactive.pm:987
+#: diskdrake/interactive.pm:1002
 #, c-format
 msgid "device"
 msgstr "seade"
 
-#: diskdrake/interactive.pm:988
+#: diskdrake/interactive.pm:1003
 #, c-format
 msgid "level"
 msgstr "tase"
 
-#: diskdrake/interactive.pm:989
+#: diskdrake/interactive.pm:1004
 #, c-format
 msgid "chunk size in KiB"
 msgstr "ühiku suurus (KiB)"
 
-#: diskdrake/interactive.pm:1006
+#: diskdrake/interactive.pm:1021
 #, c-format
 msgid "Be careful: this operation is dangerous."
 msgstr "Vaadake ette: see võib olla ohtlik."
 
-#: diskdrake/interactive.pm:1021
+#: diskdrake/interactive.pm:1036
 #, c-format
 msgid "What type of partitioning?"
 msgstr "Mis tüüpi partitsioonid teete?"
 
-#: diskdrake/interactive.pm:1059
+#: diskdrake/interactive.pm:1074
 #, c-format
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Muudatuste rakendamiseks vajate alglaadimist"
 
-#: diskdrake/interactive.pm:1068
+#: diskdrake/interactive.pm:1083
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Ketta %s partitsioonitabel salvestatakse!"
 
-#: diskdrake/interactive.pm:1081
+#: diskdrake/interactive.pm:1096
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Partitsiooni %s vormindamisel hävivad sellel kõik andmed"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
 #, c-format
 msgid "Move files to the new partition"
 msgstr "Liiguta failid uuele partitsioonile"
 
-#: diskdrake/interactive.pm:1101
+#: diskdrake/interactive.pm:1112
 #, c-format
 msgid "Hide files"
 msgstr "Failide peitmine"
 
-#: diskdrake/interactive.pm:1102
+#: diskdrake/interactive.pm:1113
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2517,141 +2537,146 @@ msgstr ""
 "Kataloogis %s on juba andmed\n"
 "(%s)"
 
-#: diskdrake/interactive.pm:1113
+#: diskdrake/interactive.pm:1124
 #, c-format
 msgid "Moving files to the new partition"
 msgstr "Failide liigutamine uuele partitsioonile"
 
-#: diskdrake/interactive.pm:1117
+#: diskdrake/interactive.pm:1128
 #, c-format
 msgid "Copying %s"
 msgstr "%s kopeerimine"
 
-#: diskdrake/interactive.pm:1121
+#: diskdrake/interactive.pm:1132
 #, c-format
 msgid "Removing %s"
 msgstr "%s eemaldamine"
 
-#: diskdrake/interactive.pm:1135
+#: diskdrake/interactive.pm:1146
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "partitsioon %s kannab nüüd nime %s"
 
-#: diskdrake/interactive.pm:1156 diskdrake/interactive.pm:1217
+#: diskdrake/interactive.pm:1147
+#, c-format
+msgid "Partitions have been renumbered: "
+msgstr "Partitsioone on muudetud: "
+
+#: diskdrake/interactive.pm:1167 diskdrake/interactive.pm:1226
 #, c-format
 msgid "Device: "
 msgstr "Seade: "
 
-#: diskdrake/interactive.pm:1157
+#: diskdrake/interactive.pm:1168
 #, c-format
 msgid "Devfs name: "
 msgstr "Devfs nimi: "
 
-#: diskdrake/interactive.pm:1158
+#: diskdrake/interactive.pm:1169
 #, c-format
 msgid "Volume label: "
 msgstr "Kettatähis: "
 
-#: diskdrake/interactive.pm:1159
+#: diskdrake/interactive.pm:1170
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "DOS kettatähis: %s (arvatavasti)\n"
 
-#: diskdrake/interactive.pm:1163 diskdrake/interactive.pm:1170
-#: diskdrake/interactive.pm:1235
+#: diskdrake/interactive.pm:1174 diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1244
 #, c-format
 msgid "Type: "
 msgstr "Tüüp: "
 
-#: diskdrake/interactive.pm:1167 install_steps_gtk.pm:310
+#: diskdrake/interactive.pm:1178 install_steps_gtk.pm:296
 #, c-format
 msgid "Name: "
 msgstr "Nimi: "
 
-#: diskdrake/interactive.pm:1174
+#: diskdrake/interactive.pm:1185
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Algus: sektor %s\n"
 
-#: diskdrake/interactive.pm:1175
+#: diskdrake/interactive.pm:1186
 #, c-format
 msgid "Size: %s"
 msgstr "Suurus: %s"
 
-#: diskdrake/interactive.pm:1177
+#: diskdrake/interactive.pm:1188
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektorit"
 
-#: diskdrake/interactive.pm:1179
+#: diskdrake/interactive.pm:1190
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "Silindrid %d kuni %d\n"
 
-#: diskdrake/interactive.pm:1180
+#: diskdrake/interactive.pm:1191
 #, c-format
 msgid "Number of logical extents: %d"
 msgstr "Loogiliste seadmete arv: %d"
 
-#: diskdrake/interactive.pm:1181
+#: diskdrake/interactive.pm:1192
 #, c-format
 msgid "Formatted\n"
 msgstr "Vormindatud\n"
 
-#: diskdrake/interactive.pm:1182
+#: diskdrake/interactive.pm:1193
 #, c-format
 msgid "Not formatted\n"
 msgstr "Vormindamata\n"
 
-#: diskdrake/interactive.pm:1183
+#: diskdrake/interactive.pm:1194
 #, c-format
 msgid "Mounted\n"
 msgstr "Haagitud\n"
 
-#: diskdrake/interactive.pm:1184
+#: diskdrake/interactive.pm:1195
 #, c-format
 msgid "RAID %s\n"
 msgstr "RAID %s\n"
 
-#: diskdrake/interactive.pm:1186
+#: diskdrake/interactive.pm:1197
 #, c-format
 msgid ""
 "Loopback file(s):\n"
 "   %s\n"
 msgstr ""
-"Loopback fail(id):\n"
+"Loopback-fail(id):\n"
 "   %s\n"
 
-#: diskdrake/interactive.pm:1187
+#: diskdrake/interactive.pm:1198
 #, c-format
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
 "Partitsioonilt toimub alglaadimine\n"
-"    (MS-DOS-i, mitte lilo jaoks)\n"
+"    (MS-DOS-i, mitte LiLo jaoks)\n"
 
-#: diskdrake/interactive.pm:1189
+#: diskdrake/interactive.pm:1200
 #, c-format
 msgid "Level %s\n"
 msgstr "Tase %s\n"
 
-#: diskdrake/interactive.pm:1190
+#: diskdrake/interactive.pm:1201
 #, c-format
 msgid "Chunk size %d KiB\n"
 msgstr "Ühiku suurus %d KiB\n"
 
-#: diskdrake/interactive.pm:1191
+#: diskdrake/interactive.pm:1202
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-kettad %s\n"
 
-#: diskdrake/interactive.pm:1193
+#: diskdrake/interactive.pm:1204
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Loopback faili nimi: %s"
 
-#: diskdrake/interactive.pm:1196
+#: diskdrake/interactive.pm:1207
 #, c-format
 msgid ""
 "\n"
@@ -2664,7 +2689,7 @@ msgstr ""
 "juhtpartitsiooniga, parem oleks\n"
 "seda mitte puutuda.\n"
 
-#: diskdrake/interactive.pm:1199
+#: diskdrake/interactive.pm:1210
 #, c-format
 msgid ""
 "\n"
@@ -2678,68 +2703,68 @@ msgstr ""
 "võimaldab mitme operatsioonisüsteemi\n"
 "laadimist.\n"
 
-#: diskdrake/interactive.pm:1218
+#: diskdrake/interactive.pm:1227
 #, c-format
 msgid "Read-only"
 msgstr "Ainult lugemisõigusega"
 
-#: diskdrake/interactive.pm:1219
+#: diskdrake/interactive.pm:1228
 #, c-format
 msgid "Size: %s\n"
 msgstr "Suurus: %s\n"
 
-#: diskdrake/interactive.pm:1220
+#: diskdrake/interactive.pm:1229
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geomeetria: %s silindrit, %s pead, %s sektorit\n"
 
-#: diskdrake/interactive.pm:1221
+#: diskdrake/interactive.pm:1230
 #, c-format
 msgid "Info: "
 msgstr "Info: "
 
-#: diskdrake/interactive.pm:1222
+#: diskdrake/interactive.pm:1231
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM-kettad %s\n"
 
-#: diskdrake/interactive.pm:1223
+#: diskdrake/interactive.pm:1232
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Partitsioonitabeli tüüp: %s\n"
 
-#: diskdrake/interactive.pm:1224
+#: diskdrake/interactive.pm:1233
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "kanalil %d id %d\n"
 
-#: diskdrake/interactive.pm:1256
+#: diskdrake/interactive.pm:1265
 #, c-format
 msgid "Filesystem encryption key"
 msgstr "Failisüsteemi krüptovõti"
 
-#: diskdrake/interactive.pm:1257
+#: diskdrake/interactive.pm:1266
 #, c-format
 msgid "Choose your filesystem encryption key"
 msgstr "Valige failisüsteemi krüptovõti"
 
-#: diskdrake/interactive.pm:1260
+#: diskdrake/interactive.pm:1269
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "See krüptovõti on liiga lihtne (peaks olema vähemalt %d märki)"
 
-#: diskdrake/interactive.pm:1261
+#: diskdrake/interactive.pm:1270
 #, c-format
 msgid "The encryption keys do not match"
 msgstr "Krüptovõtmed ei klapi"
 
-#: diskdrake/interactive.pm:1264 network/netconnect.pm:1040
-#: standalone/drakconnect:395
+#: diskdrake/interactive.pm:1273 network/netconnect.pm:1136
+#: standalone/drakconnect:397
 #, c-format
 msgid "Encryption key"
 msgstr "Krüptovõti"
 
-#: diskdrake/interactive.pm:1265
+#: diskdrake/interactive.pm:1274
 #, c-format
 msgid "Encryption key (again)"
 msgstr "Krüptovõti (uuesti)"
@@ -2751,7 +2776,7 @@ msgstr "Muuda tüüpi"
 
 #: diskdrake/smbnfs_gtk.pm:163
 #, c-format
-msgid "Can't login using username %s (bad password?)"
+msgid "Can not login using username %s (bad password?)"
 msgstr "Sisselogimine kasutajanimega %s ebaõnnestus (vale parool?)"
 
 #: diskdrake/smbnfs_gtk.pm:167 diskdrake/smbnfs_gtk.pm:176
@@ -2774,10 +2799,10 @@ msgstr "Veel üks"
 msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr ""
-"Palun sisestage sellele masinale ligipääsuks oma kasutajanimi, parool ja "
+"Palun sisestage selle masina kasutamiseks oma kasutajanimi, parool ja "
 "domeeni nimi."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3489
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3494
 #, c-format
 msgid "Username"
 msgstr "Kasutajanimi"
@@ -2807,52 +2832,52 @@ msgstr "Puudub kohustuslik pakett %s"
 msgid "Installing packages..."
 msgstr "Pakettide paigaldamine..."
 
-#: do_pkgs.pm:216
+#: do_pkgs.pm:217
 #, c-format
 msgid "Removing packages..."
 msgstr "Pakettide eemaldamine..."
 
-#: fs.pm:445 fs.pm:494
+#: fs.pm:487 fs.pm:536
 #, c-format
 msgid "Mounting partition %s"
 msgstr "Partitsiooni %s haakimine"
 
-#: fs.pm:446 fs.pm:495
+#: fs.pm:488 fs.pm:537
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "partitsiooni %s haakimine kataloogis %s ebaõnnestus"
 
-#: fs.pm:466 fs.pm:473
+#: fs.pm:508 fs.pm:515
 #, c-format
 msgid "Checking %s"
 msgstr "%s kontrollimine"
 
-#: fs.pm:511 partition_table.pm:387
+#: fs.pm:553 partition_table.pm:391
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "viga %s lahutamisel: %s"
 
-#: fs.pm:543
+#: fs.pm:585
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "Vormindan saaleala %s"
 
-#: fs/format.pm:39 fs/format.pm:46
+#: fs/format.pm:44 fs/format.pm:51
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Partitsiooni %s vormindamine"
 
-#: fs/format.pm:43
+#: fs/format.pm:48
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Faili %s loomine ja vormindamine"
 
-#: fs/format.pm:78
+#: fs/format.pm:83
 #, c-format
-msgid "I don't know how to format %s in type %s"
+msgid "I do not know how to format %s in type %s"
 msgstr "Ei oska seadet %s vormindada tüüpi %s"
 
-#: fs/format.pm:80
+#: fs/format.pm:88 fs/format.pm:90
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s vormindamine seadmel %s ebaõnnestus"
@@ -2938,14 +2963,14 @@ msgstr "Kirjutamisõiguse andmine tavakasutajale"
 msgid "Give read-only access to ordinary users"
 msgstr "Lugemisõiguse andmine tavakasutajale"
 
-#: fs/type.pm:364
+#: fs/type.pm:370
 #, c-format
-msgid "You can't use JFS for partitions smaller than 16MB"
+msgid "You can not use JFS for partitions smaller than 16MB"
 msgstr "JFS ei ole kasutatav alla 16MB partitsioonidel"
 
-#: fs/type.pm:365
+#: fs/type.pm:371
 #, c-format
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgid "You can not use ReiserFS for partitions smaller than 32MB"
 msgstr "ReiserFS ei ole kasutatav alla 32MB partitsioonidel"
 
 #: fsedit.pm:25
@@ -2958,39 +2983,40 @@ msgstr "koos /usr-ga"
 msgid "server"
 msgstr "server"
 
-#: fsedit.pm:168
+#: fsedit.pm:184
 #, c-format
 msgid ""
-"I can't read the partition table of device %s, it's too corrupted for me :(\n"
+"I can not read the partition table of device %s, it's too corrupted for me :"
+"(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
 "The other solution is to not allow DrakX to modify the partition table.\n"
 "(the error is %s)\n"
 "\n"
 "Do you agree to lose all the partitions?\n"
 msgstr ""
-"Partitsioonitabel seadmel %s on loetamatu, liiga rikutud DrakX-i jaoks :(\n"
+"Partitsioonitabel seadmel %s on loetamatu, liiga rikutud DrakX'i jaoks :(\n"
 "Proovin loetamatud kirjed puhastada, kuid ANDMED NEIL HÄVIVAD.\n"
-"Teine võimalus on keelata DrakX-il partitsioonitabeli muutmine.\n"
+"Teine võimalus on keelata DrakX'il partitsioonitabeli muutmine.\n"
 "(Viga oli selline: %s)\n"
 "\n"
 "Kas olete nõus kõigi partitsioonide kaotamisega?\n"
 
-#: fsedit.pm:385
+#: fsedit.pm:401
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Haakepunktid peavad algama kaldkriipsuga (/)"
 
-#: fsedit.pm:386
+#: fsedit.pm:402
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Haakepunkti nimi tohib sisaldada vaid tähti ja numbreid"
 
-#: fsedit.pm:387
+#: fsedit.pm:403
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Haakepunktile %s on juba partitsioon määratud\n"
 
-#: fsedit.pm:389
+#: fsedit.pm:405
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2998,15 +3024,15 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 "Olete valinud juurpartitsiooniks (/) tarkvaralise RAID-i.\n"
-"Ilma /boot partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
-"Lisage kindlasti /boot partitsioon!"
+"Ilma /boot-partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
+"Lisage kindlasti /boot-partitsioon!"
 
-#: fsedit.pm:392
+#: fsedit.pm:408
 #, c-format
-msgid "You can't use a LVM Logical Volume for mount point %s"
+msgid "You can not use a LVM Logical Volume for mount point %s"
 msgstr "Te ei saa haakepunkti %s jaoks kasutada LVM loogilist ketast"
 
-#: fsedit.pm:394
+#: fsedit.pm:410
 #, c-format
 msgid ""
 "You've selected a LVM Logical Volume as root (/).\n"
@@ -3014,24 +3040,24 @@ msgid ""
 "Please be sure to add a /boot partition"
 msgstr ""
 "Olete valinud juurpartitsiooniks (/) LVM loogilise ketta.\n"
-"Ilma /boot partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
-"Lisage kindlasti /boot partitsioon!"
+"Ilma /boot-partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
+"Lisage kindlasti /boot-partitsioon!"
 
-#: fsedit.pm:397
+#: fsedit.pm:413
 #, c-format
 msgid ""
-"You may not be able to install lilo (since lilo doesn't handle a LV on "
+"You may not be able to install lilo (since lilo does not handle a LV on "
 "multiple PVs)"
 msgstr ""
 "Võib juhtuda, et Te ei saa LiLo-t paigaldada (sest LiLo ei suuda käsitleda "
 "loogilist ketast mitmel füüsilisel kettal)"
 
-#: fsedit.pm:400 fsedit.pm:402
+#: fsedit.pm:416 fsedit.pm:418
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "See kataloog peab jääma kokku juurfailisüsteemiga"
 
-#: fsedit.pm:404 fsedit.pm:406
+#: fsedit.pm:420 fsedit.pm:422
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -3040,27 +3066,22 @@ msgstr ""
 "See haakepunkt vajab tõelist (ext2/ext3, reiserfs, xfs või jfs) "
 "failisüsteemi\n"
 
-#: fsedit.pm:408
+#: fsedit.pm:424
 #, c-format
-msgid "You can't use an encrypted file system for mount point %s"
+msgid "You can not use an encrypted file system for mount point %s"
 msgstr "Te ei saa haakepunkti %s jaoks kasutada krüptitud failisüsteemi"
 
-#: fsedit.pm:469
+#: fsedit.pm:485
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Ei ole piisavalt ruumi automaatpaigutuseks"
 
-#: fsedit.pm:471
+#: fsedit.pm:487
 #, c-format
 msgid "Nothing to do"
 msgstr "Pole midagi teha"
 
-#: fsedit.pm:569
-#, c-format
-msgid "Error opening %s for writing: %s"
-msgstr "%s avamine kirjutamiseks ebaõnnestus: %s"
-
-#: harddrake/data.pm:61
+#: harddrake/data.pm:61 install_any.pm:1505
 #, c-format
 msgid "Floppy"
 msgstr "Diskett"
@@ -3070,27 +3091,27 @@ msgstr "Diskett"
 msgid "Zip"
 msgstr "Zip"
 
-#: harddrake/data.pm:81
+#: harddrake/data.pm:81 install_any.pm:1506
 #, c-format
-msgid "Disk"
+msgid "Hard Disk"
 msgstr "Ketas"
 
-#: harddrake/data.pm:90
+#: harddrake/data.pm:90 install_any.pm:1507
 #, c-format
 msgid "CDROM"
-msgstr "CD-ROM"
+msgstr "CD-lugeja"
 
 #: harddrake/data.pm:100
 #, c-format
 msgid "CD/DVD burners"
-msgstr "CD/DVD kirjutajad"
+msgstr "CD/DVD-kirjutid"
 
 #: harddrake/data.pm:110
 #, c-format
 msgid "DVD-ROM"
-msgstr "DVD-ROM"
+msgstr "DVD-lugeja"
 
-#: harddrake/data.pm:120 standalone/drakbackup:2045
+#: harddrake/data.pm:120 standalone/drakbackup:2051
 #, c-format
 msgid "Tape"
 msgstr "Lint"
@@ -3120,135 +3141,140 @@ msgstr "Helikaart"
 msgid "Webcam"
 msgstr "Veebikaamera"
 
-#: harddrake/data.pm:181
+#: harddrake/data.pm:180
 #, c-format
 msgid "Processors"
 msgstr "Protsessorid"
 
-#: harddrake/data.pm:191
+#: harddrake/data.pm:190
 #, c-format
 msgid "ISDN adapters"
 msgstr "ISDN kaardid"
 
-#: harddrake/data.pm:201
+#: harddrake/data.pm:200
 #, c-format
 msgid "Ethernetcard"
 msgstr "Võrgukaart"
 
-#: harddrake/data.pm:219 network/netconnect.pm:484
+#: harddrake/data.pm:218 network/netconnect.pm:518
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:229
+#: harddrake/data.pm:228
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL kaardid"
 
-#: harddrake/data.pm:243
+#: harddrake/data.pm:242
 #, c-format
-msgid "AGP controllers"
-msgstr "AGP kontrollerid"
+msgid "Memory"
+msgstr "Mälu"
 
-#: harddrake/data.pm:252
+#: harddrake/data.pm:251
 #, c-format
-msgid "Bridges and system controllers"
-msgstr "Sillad ja kontrollerid"
+msgid "AGP controllers"
+msgstr "AGP kontrollerid"
 
-#: harddrake/data.pm:261 help.pm:186 help.pm:855
-#: install_steps_interactive.pm:992 printer/printerdrake.pm:875
+#: harddrake/data.pm:260 help.pm:186 help.pm:855
+#: install_steps_interactive.pm:978
 #, c-format
 msgid "Printer"
 msgstr "Printer"
 
-#: harddrake/data.pm:271
+#: harddrake/data.pm:270
 #, c-format
 msgid "Joystick"
 msgstr "Juhtkang"
 
-#: harddrake/data.pm:281
+#: harddrake/data.pm:280
 #, c-format
 msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATA kontrollerid"
 
-#: harddrake/data.pm:290
+#: harddrake/data.pm:289
 #, c-format
 msgid "SATA controllers"
 msgstr "SATA kontrollerid"
 
-#: harddrake/data.pm:299
+#: harddrake/data.pm:298
 #, c-format
 msgid "Firewire controllers"
 msgstr "FireWire kontrollerid"
 
-#: harddrake/data.pm:308
+#: harddrake/data.pm:307
 #, c-format
 msgid "PCMCIA controllers"
 msgstr "PCMCIA kontrolerid"
 
-#: harddrake/data.pm:321
+#: harddrake/data.pm:316
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSI kontrolerid"
 
-#: harddrake/data.pm:330
+#: harddrake/data.pm:325
 #, c-format
 msgid "USB controllers"
 msgstr "USB kontrollerid"
 
-#: harddrake/data.pm:339
+#: harddrake/data.pm:334
 #, c-format
 msgid "USB ports"
 msgstr "USB pordid"
 
-#: harddrake/data.pm:348
+#: harddrake/data.pm:343
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus kontrollerid"
 
-#: harddrake/data.pm:357
+#: harddrake/data.pm:352
+#, c-format
+msgid "Bridges and system controllers"
+msgstr "Sillad ja kontrollerid"
+
+#: harddrake/data.pm:361
 #, c-format
 msgid "UPS"
 msgstr "UPS"
 
-#: harddrake/data.pm:366 help.pm:855 install_steps_interactive.pm:120
-#: install_steps_interactive.pm:952 standalone/keyboarddrake:24
+#: harddrake/data.pm:370 help.pm:855 install_steps_interactive.pm:118
+#: install_steps_interactive.pm:938 standalone/keyboarddrake:28
 #, c-format
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
-#: harddrake/data.pm:379 help.pm:855 install_steps_interactive.pm:985
+#: harddrake/data.pm:383 help.pm:855 install_steps_interactive.pm:971
 #, c-format
 msgid "Mouse"
 msgstr "Hiir"
 
-#: harddrake/data.pm:393
+#: harddrake/data.pm:397
 #, c-format
 msgid "Scanner"
 msgstr "Skänner"
 
-#: harddrake/data.pm:403 standalone/harddrake2:431
+#: harddrake/data.pm:407 standalone/harddrake2:439
 #, c-format
 msgid "Unknown/Others"
 msgstr "Tundmatu/Muu"
 
-#: harddrake/data.pm:431
+#: harddrake/data.pm:435
 #, c-format
 msgid "cpu # "
 msgstr "cpu # "
 
-#: harddrake/sound.pm:170 standalone/drakconnect:169
-#: standalone/drakconnect:613
+#: harddrake/sound.pm:191 standalone/drakconnect:169
+#: standalone/drakconnect:615
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Palun oodake... Rakendan seadistusi"
 
-#: harddrake/sound.pm:206
+#: harddrake/sound.pm:227
 #, c-format
 msgid "No alternative driver"
 msgstr "Alternatiivne fraiver puudub"
 
-#: harddrake/sound.pm:207
+#: harddrake/sound.pm:228
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -3257,12 +3283,12 @@ msgstr ""
 "Pole teada ühtegi alternatiivset OSS/ALSA draiverit Teie helikaardile (%s), "
 "millel praegu on kasutusel \"%s\""
 
-#: harddrake/sound.pm:213
+#: harddrake/sound.pm:234
 #, c-format
 msgid "Sound configuration"
 msgstr "Heliseadistused"
 
-#: harddrake/sound.pm:215
+#: harddrake/sound.pm:236
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -3271,7 +3297,10 @@ msgstr ""
 "Siin saate valida alternatiivse draiveri (OSS või ALSA) oma helikaardile (%"
 "s)."
 
-#: harddrake/sound.pm:217
+#. -PO: here the first %s is either "OSS" or "ALSA", 
+#. -PO: the second %s is the name of the current driver
+#. -PO: and the third %s is the name of the default driver
+#: harddrake/sound.pm:241
 #, c-format
 msgid ""
 "\n"
@@ -3284,7 +3313,7 @@ msgstr ""
 "Teie helikaart kasutab praegu %s\"%s\" draiverit (selle kaardi vaikedraiver "
 "on \"%s\")"
 
-#: harddrake/sound.pm:219
+#: harddrake/sound.pm:243
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3318,17 +3347,34 @@ msgstr ""
 "- uut ALSA API-t, mis pakub hulga täiustatud võimalusi, kuid nõuab ALSA "
 "teegi kasutamist.\n"
 
-#: harddrake/sound.pm:233 harddrake/sound.pm:318 standalone/drakups:146
+#: harddrake/sound.pm:257 harddrake/sound.pm:342 standalone/drakups:146
 #, c-format
 msgid "Driver:"
 msgstr "Draiver: "
 
-#: harddrake/sound.pm:238
+#: harddrake/sound.pm:262
 #, c-format
 msgid "Trouble shooting"
 msgstr "Probleemi otsimine"
 
-#: harddrake/sound.pm:246
+#: harddrake/sound.pm:270 keyboard.pm:391 lang.pm:1039
+#: network/netconnect.pm:504 printer/printerdrake.pm:1142
+#: printer/printerdrake.pm:2142 printer/printerdrake.pm:2228
+#: printer/printerdrake.pm:2274 printer/printerdrake.pm:2341
+#: printer/printerdrake.pm:2376 printer/printerdrake.pm:2684
+#: printer/printerdrake.pm:2691 printer/printerdrake.pm:3643
+#: printer/printerdrake.pm:3970 printer/printerdrake.pm:4092
+#: printer/printerdrake.pm:5183 standalone/drakTermServ:325
+#: standalone/drakTermServ:1111 standalone/drakTermServ:1172
+#: standalone/drakTermServ:1821 standalone/drakbackup:510
+#: standalone/drakbackup:609 standalone/drakboot:165 standalone/drakclock:224
+#: standalone/drakconnect:971 standalone/drakfloppy:291 standalone/drakups:27
+#: standalone/scannerdrake:51 standalone/scannerdrake:940
+#, c-format
+msgid "Warning"
+msgstr "Hoiatus"
+
+#: harddrake/sound.pm:270
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3343,12 +3389,12 @@ msgstr ""
 "\n"
 "Uut \"%s\" draiverit kasutatakse järgmisel alglaadimisel."
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:278
 #, c-format
 msgid "No open source driver"
 msgstr "Vabavara-draiver puudub"
 
-#: harddrake/sound.pm:255
+#: harddrake/sound.pm:279
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
@@ -3357,33 +3403,33 @@ msgstr ""
 "Pole teada ühtegi vabavara-draiverit Teie helikaardile (%s), kuid on olemas "
 "tootja draiver, mille asukoht on \"%s\"."
 
-#: harddrake/sound.pm:258
+#: harddrake/sound.pm:282
 #, c-format
 msgid "No known driver"
 msgstr "Draiverit ei õnnestunud tuvastada"
 
-#: harddrake/sound.pm:259
+#: harddrake/sound.pm:283
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Teie helikaardile (%s) ei õnnestunud tuvastada draiverit"
 
-#: harddrake/sound.pm:263
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Unknown driver"
 msgstr "Tundmatu draiver"
 
-#: harddrake/sound.pm:264
+#: harddrake/sound.pm:288
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
-msgstr "Viga: helikaardi draiverit \"%s\" ei ole loendis"
+msgstr "Viga: helikaardi draiverit \"%s\" ei ole nimekirjas"
 
-#: harddrake/sound.pm:278
+#: harddrake/sound.pm:302
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Heliprobleemide lahendamine"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:281
+#: harddrake/sound.pm:305
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3426,18 +3472,18 @@ msgstr ""
 "- \"/sbin/fuser -v /dev/dsp\" näitab, milline programm hetkel\n"
 "helikaarti kasutab.\n"
 
-#: harddrake/sound.pm:307
+#: harddrake/sound.pm:331
 #, c-format
 msgid "Let me pick any driver"
 msgstr "Suvalise draiveri valimine"
 
-#: harddrake/sound.pm:310
+#: harddrake/sound.pm:334
 #, c-format
 msgid "Choosing an arbitrary driver"
 msgstr "Suvalise draiveri valimine"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: harddrake/sound.pm:313
+#: harddrake/sound.pm:337
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3479,10 +3525,10 @@ msgid ""
 "If your card is misdetected, you can force the right tuner and card types "
 "here. Just select your tv card parameters if needed."
 msgstr ""
-"Enamiku moodsate TV-kaartide puhul avastab GNU/Linuxi kerneli bttv-moodul "
+"Enamiku moodsate TV-kaartide puhul tuvastab GNU/Linuxi kerneli bttv-moodul "
 "automaatselt õiged parameetrid.\n"
 "Kui kaart siiski valesti tuvastati, võite siin määrata õige tuuneri ja "
-"kaardi tüübi. Valige vajadusel korral sobivad TV-kaardi parameetrid"
+"kaardi tüübi. Valige vajadusel korral sobivad TV-kaardi parameetrid."
 
 #: harddrake/v4l.pm:312
 #, c-format
@@ -3532,27 +3578,28 @@ msgstr ""
 "nõus olete, märkige ära kast \"%s\". Kui Teile aga miski ei meeldi, siis\n"
 "klõps nupule \"%s\" sooritab arvuti taaskäivitamise."
 
-#: help.pm:14 install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745 standalone/drakautoinst:216
+#: help.pm:14 install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
-msgstr "Nõus"
+msgstr "Nõustun"
 
 #: help.pm:17
 #, c-format
 msgid ""
 "GNU/Linux is a multi-user system which means each user can have his or her\n"
 "own preferences, own files and so on. But unlike \"root\", who is the\n"
-"system administrator, the users you add at this point won't be authorized\n"
+"system administrator, the users you add at this point will not be "
+"authorized\n"
 "to change anything except their own files and their own configurations,\n"
 "protecting the system from unintentional or malicious changes which could\n"
 "impact on the system as a whole. You'll have to create at least one regular\n"
 "user for yourself -- this is the account which you should use for routine,\n"
 "day-to-day usage. Although it's very easy to log in as \"root\" to do\n"
 "anything and everything, it may also be very dangerous! A very simple\n"
-"mistake could mean that your system won't work any more. If you make a\n"
+"mistake could mean that your system will not work any more. If you make a\n"
 "serious mistake as a regular user, the worst that can happen is that you'll\n"
-"lose some information, but you won't affect the entire system.\n"
+"lose some information, but you will not affect the entire system.\n"
 "\n"
 "The first field asks you for a real name. Of course, this is not mandatory\n"
 "-- you can actually enter whatever you like. DrakX will use the first word\n"
@@ -3573,15 +3620,15 @@ msgid ""
 "\n"
 "When you're finished adding users, you'll be asked to choose a user who\n"
 "will be automatically logged into the system when the computer boots up. If\n"
-"you're interested in that feature (and don't care much about local\n"
+"you're interested in that feature (and do not care much about local\n"
 "security), choose the desired user and window manager, then click on\n"
 "\"%s\". If you're not interested in this feature, uncheck the \"%s\" box."
 msgstr ""
-"GNU/Linux on paljude kasutajatega süsteem, mis tähendab, et igal kasutajal\n"
+"GNU/Linux on mitmekasutajasüsteem, mis tähendab, et igal kasutajal\n"
 "võivad olla oma eelistused, failid jne. Selle kontseptsiooni kohta leiab "
 "lähemat\n"
 "infot \"Kasutaja käsiraamatust\". Kuid erinevalt administraatorist ei ole\n"
-"kasutajal õigust muuta midagi muud kui vaid oma faile ja enda seadistusi.\n"
+"kasutajal õigust muuta midagi muud kui vaid omaenda faile ja seadistusi.\n"
 "Te peaksite looma ka endale vähemalt ühe tavakasutaja konto, millele sisse\n"
 "logida igapäevategevuseks. Kuigi võib olla vägagi praktiline logida iga "
 "päev\n"
@@ -3596,50 +3643,47 @@ msgstr ""
 "sisestatud sõna\n"
 "ning kopeerib selle väljale \"%s\". See on siis nimi, mille all konkreetne "
 "kasutaja\n"
-"saab ennast süsteemi sisse logida. Seda saab ka hiljem muuta. Seejärel "
-"tuleb\n"
-"sisestada parool. Privileegideta (tavalise) kasutaja parool ei ole "
-"turvalisuse mõttes\n"
-"nii oluline kui administraatori oma, kuid pole põhjust sellest ka "
-"naljanumbrit teha:\n"
+"saab ennast süsteemi sisse logida. Soovi korral võite DrakX'i pakutut ka\n"
+"muuta. Seejärel tuleb sisestada parool. Privileegideta (tavalise) kasutaja\n"
+"parool ei ole turvalisuse mõttes nii oluline kui administraatori oma,\n"
+"kuid pole põhjust sellest ka naljanumbrit teha:\n"
 "lõppeks on ju mängus Teie failid.\n"
 "\n"
 "Kui klõpsate nupule \"%s\", võite lisada veel nii palju kasutajaid, kui "
 "vaja.\n"
 "Lisage üks kasutaja iga inimese kohta, kes Teie arvutit kasutab. Kui olete "
 "kõik\n"
-"soovitud sisestanud, vajutage nupule \"%s\".\n"
+"soovitud sisestanud, klõpsake nupule \"%s\".\n"
 "\n"
-"Klõps nupule \"%s\" võimaldab muuta kasutajale määratavat vaike-\"shelli\"\n"
+"Klõps nupule \"%s\" võimaldab muuta kasutajale määratavat shelli\n"
 "(vaikimisi on see bash).\n"
 "\n"
 "Kui olete kasutajate lisamise lõpetanud, pakutakse Teile valida kasutaja, "
 "kel on\n"
-"õigus logida süsteemi automaatselt, kui arvuti algkäivituse teeb. Kui see "
-"võimalus\n"
+"õigus logida süsteemi automaatselt, kui arvuti käivitub. Kui see võimalus\n"
 "Teile huvi pakub (ja kohalik turvalisus muret ei valmista), valige "
 "meelepärane\n"
-"kasutaja ning aknahaldur ja vajutage \"%s\". Kui Te sellest aga huvitatud ei "
-"ole,\n"
+"kasutaja ning aknahaldur ja klõpsake nupule \"%s\". Kui Te sellest aga "
+"huvitatud ei ole,\n"
 "eemaldage märge kastist \"%s\"."
 
-#: help.pm:51 printer/printerdrake.pm:1488 printer/printerdrake.pm:1608
+#: help.pm:51 printer/printerdrake.pm:1595 printer/printerdrake.pm:1715
 #, c-format
 msgid "User name"
 msgstr "Kasutajanimi"
 
-#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:247
-#: interactive.pm:403 interactive/newt.pm:317 network/netconnect.pm:280
-#: network/tools.pm:198 printer/printerdrake.pm:3268
-#: standalone/drakTermServ:372 standalone/drakbackup:3941
-#: standalone/drakbackup:4035 standalone/drakbackup:4052
-#: standalone/drakbackup:4070 ugtk2.pm:515
+#: help.pm:51 help.pm:431 help.pm:681 install_steps_gtk.pm:233
+#: install_steps_gtk.pm:689 interactive.pm:424 interactive/newt.pm:317
+#: network/netconnect.pm:278 network/tools.pm:182 printer/printerdrake.pm:3581
+#: standalone/drakTermServ:382 standalone/drakbackup:3946
+#: standalone/drakbackup:4040 standalone/drakbackup:4057
+#: standalone/drakbackup:4075 ugtk2.pm:506
 #, c-format
 msgid "Next"
-msgstr "Järgmine"
+msgstr "Edasi"
 
 #: help.pm:51 help.pm:409 help.pm:431 help.pm:647 help.pm:722
-#: interactive.pm:371
+#: interactive.pm:385
 #, c-format
 msgid "Advanced"
 msgstr "Edasijõudnud"
@@ -3714,8 +3758,8 @@ msgid ""
 "CD at hand, just click on \"%s\", the corresponding packages will not be\n"
 "installed."
 msgstr ""
-"Mandrakelinuxi paigalduspaketid on jagatud mitme CD-ROMi vahel.\n"
-"DrakX suudab ära tunda, kui valitud pakett asub muul CD-ROMil,\n"
+"Mandrakelinuxi paigalduspaketid on jagatud mitme CD vahel.\n"
+"DrakX suudab ära tunda, kui valitud pakett asub muul CD-l,\n"
 "ning väljastab siis seesoleva CD ja palub sisestada selle,\n"
 "mida parajasti vaja läheb.\n"
 "Kui Teil ei ole nõutavat CD-d käepärast, klõpsake nupul \"%s\"\n"
@@ -3780,7 +3824,7 @@ msgid ""
 "command-line interface. The total size of this installation is about 65\n"
 "megabytes."
 msgstr ""
-"Nüüd on aeg määrata rakendused, mida soovite oma süsteemi paigaldada.\n"
+"Nüüd on aeg valida rakendused, mida soovite oma süsteemi paigaldada.\n"
 "Mandrakelinux pakub tuhandeid pakette ja mõistagi ei eelda keegi,\n"
 "et Te neid kõiki juba ette tunneksite.\n"
 "\n"
@@ -3802,26 +3846,28 @@ msgstr ""
 "Seda tehakse täieliku ühilduvuse saavutamiseks LSB standardiga.\n"
 "Kui te aga jätate grupi \"LSB\" valimata, saate ikkagi süsteemi,\n"
 "mis vastab peaaegu täielikult LSB standardile.\n"
+"\n"
 " * \"%s\": kui arvuti peab täitma serveri ülesandeid, saate siit valida,\n"
-"milliseid kõige enam levinud teenuseid oma masinale paigaldada.\n"
+"milliseid levinumaid teenuseid oma süsteemi paigaldada.\n"
 "\n"
-" * \"%s\": lõppeks saate siit valida meelepärase graafilise töökeskkonna.\n"
-" Neist tuleb valida vähemalt üks, kui soovite kasutada graafilist tööjaama!\n"
+" * \"%s\": lõpuks saate siit valida ka meelepärase graafilise töökeskkonna.\n"
+" Kui soovite kasutada graafilist töökeskkonda, tuleb Teil siit valida "
+"vähemalt üks variant.\n"
 "\n"
 "Hiire liigutamine grupi nimele toob nähtavale selle lühikirjelduse.\n"
 "\n"
-"Ära märkida saab kasti \"%s\", mis on kasuks, kui tunnete pakette,\n"
-"mida Teile pakutakse, või kui soovite totaalset kontrolli selle üle,\n"
-"mida Teie masinasse paigaldatakse.\n"
+"Märkida võib ka kasti \"%s\", mis on eriti mõttekas siis, kui tunnete\n"
+"pakette, mida Teile pakutakse, või kui soovite täielikku kontrolli selle\n"
+"üle, mida Teie süsteemi paigaldatakse.\n"
 "\n"
-"Kui käivitasite paigalduse resiimis \"%s\", võite jätta kõik grupid "
+"Kui käivitasite paigaldamise režiimis \"%s\", võite jätta kõik grupid "
 "valimata,\n"
 "mis takistab uute pakettide paigaldamist.\n"
 "Seda tasub tarvitada näiteks olemasoleva süsteemi parandamisel või "
 "värskendamisel.\n"
 "\n"
-"Kui olete tavapärast paigaldust tehes kõik grupid valimata jätnud\n"
-"(seega talitanud vastupidi uuenduse mõttele), ilmub dialoog,\n"
+"Kui olete tavapärast paigaldamist tehes kõik grupid valimata jätnud\n"
+"(seega talitanud vastupidi uuendamise mõttele), ilmub dialoog,\n"
 "mis pakub mitmesuguseid võimalusi minimaalseks paigalduseks.\n"
 "\n"
 " * \"%s\": paigaldatakse minimaalselt graafiliseks töölauaks vajalikud "
@@ -3851,7 +3897,7 @@ msgstr "Arendus"
 msgid "Graphical Environment"
 msgstr "Graafiline keskkond"
 
-#: help.pm:146 install_steps_gtk.pm:242 install_steps_interactive.pm:646
+#: help.pm:146 install_steps_gtk.pm:231 install_steps_interactive.pm:642
 #, c-format
 msgid "Individual package selection"
 msgstr "Valik paketthaaval"
@@ -3864,7 +3910,7 @@ msgstr "Uuendus"
 #: help.pm:146 install_steps_interactive.pm:600
 #, c-format
 msgid "With X"
-msgstr "X-iga"
+msgstr "X'iga"
 
 #: help.pm:146
 #, c-format
@@ -3894,7 +3940,8 @@ msgid ""
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that\n"
 "security holes were discovered after this version of Mandrakelinux was\n"
-"finalized. If you don't know what a particular service is supposed to do or\n"
+"finalized. If you do not know what a particular service is supposed to do "
+"or\n"
 "why it's being installed, then click \"%s\". Clicking \"%s\" will install\n"
 "the listed services and they will be started automatically at boot time. !!\n"
 "\n"
@@ -3936,29 +3983,30 @@ msgstr ""
 "\n"
 "Lisavõimalus \"%s\" lihtsalt keelab hoiatava dialoogi,\n"
 "mis ilmub alati, kui paigaldaja valib automaatselt mõne paketi.\n"
-"See juhtub siis, kui leitakse, et paigalduse edukaks lõpetamiseks\n"
+"See juhtub siis, kui leitakse, et paigaldamise edukaks lõpetamiseks\n"
 "on vajalik paigaldada veel mõni muu pakett.\n"
 "\n"
-"Väike disketiikoon loendi all võimaldab avada\n"
-"eelmise paigalduse ajal valitud pakettide nimekirja.\n"
+"Väike disketiikoon nimekirja all võimaldab avada\n"
+"eelmise paigaldamise ajal valitud pakettide nimekirja.\n"
 "Sellel klõpsamise järel palutakse Teil sisestada diskett,\n"
-"mille lõite eelmise paigalduse lõpul.\n"
+"mille lõite eelmise paigaldamise lõpul.\n"
 "Vaadake ka eelmise sammu teist nõuannet selle kohta, kuidas sellist disketti "
 "luua."
 
-#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:722
-#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2503
-#: standalone/draksec:54 standalone/harddrake2:299 ugtk2.pm:1121
-#: wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:313 help.pm:444 install_any.pm:792
+#: interactive.pm:149 modules/interactive.pm:71 standalone/drakbackup:2508
+#: standalone/draksec:54 standalone/harddrake2:306 standalone/net_applet:255
+#: ugtk2.pm:899 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Ei"
 
-#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:722 interactive.pm:149
-#: modules/interactive.pm:71 printer/printerdrake.pm:711
-#: standalone/drakbackup:2503 standalone/drakgw:290 standalone/drakgw:291
-#: standalone/drakgw:299 standalone/drakgw:309 standalone/draksec:55
-#: standalone/harddrake2:298 ugtk2.pm:1121 wizards.pm:156
+#: help.pm:180 help.pm:285 help.pm:444 install_any.pm:792 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:736
+#: standalone/drakbackup:2508 standalone/drakgw:287 standalone/drakgw:288
+#: standalone/drakgw:296 standalone/drakgw:306 standalone/draksec:55
+#: standalone/harddrake2:305 standalone/net_applet:259 ugtk2.pm:899
+#: wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Jah"
@@ -3976,14 +4024,14 @@ msgid ""
 "information on how to set up a new printer. The interface presented in our\n"
 "manual is similar to the one used during installation."
 msgstr ""
-"\"%s\": klõps nupul \"%s\" avab printeri seadistamise\n"
-"nõustaja. Uurige lähemalt \"Juhised alustamiseks\" (\"Starter Guide\")\n"
-"vastavast peatükist, kuidas uut printerit häälestada. Siin näidatav\n"
-"sarnaneb sellele, mida võisite näha paigalduse ajal."
+"\"%s\": klõps nupul \"%s\" avab printeri seadistamise nõustaja.\n"
+"Uurige lähemalt \"Põhiteadmiste käsiraamatu\" (\"Starter Guide\")\n"
+"vastavast peatükist, kuidas uut printerit häälestada.\n"
+"Siin näidatav sarnaneb sellele, mida võisite näha paigaldamise ajal."
 
-#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:622
-#: standalone/drakbackup:2329 standalone/drakbackup:2333
-#: standalone/drakbackup:2337 standalone/drakbackup:2341
+#: help.pm:186 help.pm:566 help.pm:855 install_steps_gtk.pm:607
+#: standalone/drakbackup:2333 standalone/drakbackup:2337
+#: standalone/drakbackup:2341 standalone/drakbackup:2345
 #, c-format
 msgid "Configure"
 msgstr "Seadista"
@@ -3995,7 +4043,7 @@ msgid ""
 "time.\n"
 "\n"
 "DrakX will list all services available on the current installation. Review\n"
-"each one of them carefully and uncheck those which aren't needed at boot\n"
+"each one of them carefully and uncheck those which are not needed at boot\n"
 "time.\n"
 "\n"
 "A short explanatory text will be displayed about a service when it is\n"
@@ -4003,7 +4051,8 @@ msgid ""
 "it is safer to leave the default behavior.\n"
 "\n"
 "!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you probably don't want to start any services which you don't need.\n"
+"server: you probably do not want to start any services which you do not "
+"need.\n"
 "Please remember that some services can be dangerous if they're enabled on a\n"
 "server. In general, select only those services you really need. !!"
 msgstr ""
@@ -4022,7 +4071,7 @@ msgstr ""
 "!! Kui kavatsete oma süsteemi kasutada serverina, olge eriti tähelepanelik:\n"
 "tõenäoliselt ei soovi Te käivitada mittevajalikke teenuseid. Pidage meeles, "
 "et\n"
-"mõned teenused võivad serveril kasutatuna olla isegi ohtlikud. Üldiselt "
+"mõned teenused võivad serveris kasutatuna olla isegi ohtlikud. Üldiselt "
 "tasub\n"
 "valida ainult neid teenuseid, mida Teil tõesti vaja läheb.\n"
 "!!"
@@ -4054,11 +4103,11 @@ msgstr ""
 "Võimalus \"%s\" võimaldab kellaaega reguleerida,\n"
 "ühendudes Internetis mõne ajaserveriga. Pakutavas nimekirjas valige mõni\n"
 "lähemal asuv server. Mõistagi peab selle võimaluse kasutamiseks olema ka\n"
-"Internetiühendus. Tegelikult paigaldab see Teie arvutile ajaserveri, mida "
+"Internetiühendus. Tegelikult paigaldab see Teie arvutisse ajaserveri, mida "
 "saab\n"
 "kasutada isegi teiste kohtvõrgus olevate masinate aja täpsustamiseks."
 
-#: help.pm:217 install_steps_interactive.pm:887
+#: help.pm:217 install_steps_interactive.pm:873
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "Arvuti sisekell on seatud GMT ajale"
@@ -4083,9 +4132,9 @@ msgid ""
 msgstr ""
 "Videokaart\n"
 "\n"
-"   Paigaldaja tuvastab ja seadistab tavaliselt automaatselt masinale\n"
+"   Paigaldaja tuvastab ja seadistab tavaliselt automaatselt masinasse\n"
 "paigaldatud videokaardi. Kui see ei õnnestu, saate nimekirjast valida\n"
-"kaardi, mis tegelikult on masinale paigaldatud.\n"
+"kaardi, mis tegelikult on masinass paigaldatud.\n"
 "\n"
 "   Juhul, kui Teie kaardile peaks saada olema erinevaid servereid nii 3D\n"
 "kiirendusega kui ilma, saate valida serveri, mis Teie vajadustele\n"
@@ -4160,9 +4209,9 @@ msgstr ""
 "\n"
 "Videokaart\n"
 "\n"
-"   Paigaldaja tuvastab ja seadistab tavaliselt automaatselt masinale\n"
+"   Paigaldaja tuvastab ja seadistab tavaliselt automaatselt masinasse\n"
 "paigaldatud videokaardi. Kui see ei õnnestu, saate nimekirjast valida\n"
-"kaardi, mis tegelikult on masinale paigaldatud.\n"
+"kaardi, mis tegelikult on masinas paigaldatud.\n"
 "\n"
 "   Juhul, kui Teie kaardile peaks saada olema erinevaid servereid nii 3D\n"
 "kiirendusega kui ilma, saate valida serveri, mis Teie vajadustele\n"
@@ -4178,10 +4227,12 @@ msgstr ""
 "\n"
 "\n"
 "\n"
-"Kuvatihedus\n"
+"Ekraanilahutus\n"
 "\n"
-"   Siin saate valida Teie riistvaraga sobiva kuvatiheduse ja värvisügavuse.\n"
-"Kui Te paigalduse järel leiate, et siin valitu siiski ei kõlba, saate seda\n"
+"   Siin saate valida Teie riistvaraga sobiva ekraanilahutuse ja "
+"värvisügavuse.\n"
+"Kui Te paigaldamise järel leiate, et siin valitu siiski ei kõlba, saate "
+"seda\n"
 "hiljem muuta. Valitud seadistust näidatakse monitoril.\n"
 "\n"
 "\n"
@@ -4190,7 +4241,8 @@ msgstr ""
 "\n"
 "   Sõltuvalt Teie riistvarast ei pruugi seda näha olla.\n"
 "\n"
-"   süsteem püüab avada graafilist akent soovitud kuvatihedusega. Kui näete\n"
+"   süsteem püüab avada graafilist akent soovitud ekraanilahutusega. Kui "
+"näete\n"
 "testi ajal sõnumit ja vastate \"%s\", suundub DrakX järgmise sammu juurde.\n"
 "Kui Te sõnumit ei näe, tähendab see, et miski automaatselt tuvastatud\n"
 "seadistuses oli mäda ja test lõpeb automaatselt 12 sekundi pärast, tuues\n"
@@ -4231,10 +4283,12 @@ msgid ""
 "able to make changes after the installation). A sample of the chosen\n"
 "configuration is shown in the monitor picture."
 msgstr ""
-"Kuvatihedus\n"
+"Ekraanilahutus\n"
 "\n"
-"   Siin saate valida Teie riistvaraga sobiva kuvatiheduse ja värvisügavuse.\n"
-"Kui Te paigalduse järel leiate, et siin valitu siiski ei kõlba, saate seda\n"
+"   Siin saate valida Teie riistvaraga sobiva ekraanilahutuse ja "
+"värvisügavuse.\n"
+"Kui Te paigaldamise järel leiate, et siin valitu siiski ei kõlba, saate "
+"seda\n"
 "hiljem muuta. Valitud seadistust näidatakse monitoril."
 
 #: help.pm:303
@@ -4312,7 +4366,8 @@ msgid ""
 "\n"
 " * \"%s\". If you want to delete all data and all partitions present on\n"
 "your hard drive and replace them with your new Mandrakelinux system, choose\n"
-"this option. Be careful, because you won't be able to undo this operation\n"
+"this option. Be careful, because you will not be able to undo this "
+"operation\n"
 "after you confirm.\n"
 "\n"
 "   !! If you choose this option, all data on your disk will be deleted. !!\n"
@@ -4332,11 +4387,12 @@ msgid ""
 msgstr ""
 "Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrakelinux\n"
 "oma kõvakettal paigaldada. Kui kõvaketas on tühi või mõni muu\n"
-"operatsioonisüsteem seda täielikult kasutab, on vaja partitsioneerida.\n"
+"operatsioonisüsteem seda täielikult kasutab, on vaja see osadeks jagada\n"
+"ehk partitsioneerida.\n"
 "Partitsioneerimine on tegevus, mille käigus tekitatakse kettale loogilised\n"
-"piirkonnad Teie uue Mandrakelinux süsteemi paigaldamiseks.\n"
+"piirkonnad Teie uue Mandrakelinuxi süsteemi paigaldamiseks.\n"
 "\n"
-"Kuna partitsioneerimine ei ole pööratav protsess, siis peab kogemusteta\n"
+"Kuna kõvaketta jagamine on pöördumatu protsess, siis peab kogemusteta\n"
 "kasutaja olema iseäranis ettevaatlik! Selle tegevuse lihtsustamiseks ja\n"
 "vigade vähendamiseks on Teie jaoks loodudki käesolev nõustaja. Siiski,\n"
 "palun varuge natuke ettevalmistusaega.\n"
@@ -4344,27 +4400,26 @@ msgstr ""
 "Sõltuvalt kõvaketta omadustest on ketta jagamiseks ehk partitsioneerimiseks\n"
 "mitmeid võimalusi.\n"
 "\n"
-" * \"%s\": see partitsioneerib lihtsalt Teie tühja(d) kõvaketta(d).\n"
+" * \"%s\": see jagab lihtsalt Teie tühja(d) kõvaketta(d).\n"
 "Mingeid edasisi küsimusi ei esitata.\n"
 "\n"
-" * \"%s\": nõustaja avastas kõvakettal vähemalt\n"
+" * \"%s\": nõustaja leidis kõvakettalt vähemalt\n"
 "ühe Linuxi partitsiooni. Kui soovite seda/neid kasutada, valige see "
 "võimalus.\n"
-"Seejärel palutakse valida iga partitsiooniga seonduvad haakepunktid. "
-"Vaikimisi\n"
+"Seejärel palutakse valida iga partitsiooniga seotud haakepunktid. Vaikimisi\n"
 "valitakse need juba ette ära ja üldiselt oleks mõistlik neid mitte muuta.\n"
 "\n"
 " * \"%s\": kui kõvakettale on paigaldatud\n"
-"Microsoft Windows ja see haarab enda alla kogu kõvaketta, võite luua vabale\n"
-"alale nurgakese GNU/Linuxi andmetele. Selleks võib hävitada Microsoft "
-"Windowsi\n"
+"Microsoft Windows ja see haarab enda alla kogu kõvaketta, tuleb Teil "
+"tekitada\n"
+"vaba ruum GNU/Linuxi andmetele. Selleks võib hävitada Microsoft Windowsi\n"
 "partitsiooni koos andmetega (vaata võimalusi \"Puhasta kogu ketas\" või\n"
-"\"Ekspertresiim\") või selle suurust muuta. Viimast on võimalik sooritada "
+"\"Ekspertrežiim\") või selle suurust muuta. Viimast on võimalik sooritada "
 "ilma\n"
 "andmeid kaotamata, seda küll eeldusel, et olete varem Windowsi partitsiooni\n"
 "defragmenteerinud. Siiski ei tule kindlasti kahjuks ka andmetest varukoopia\n"
-"valmistamine... See lahendus on soovitatav, kui tahate kasutada ühel "
-"arvutil\n"
+"valmistamine... See lahendus on soovitatav, kui tahate kasutada ühes "
+"arvutis\n"
 "nii Mandrakelinuxit kui Microsoft Windowsit.\n"
 "\n"
 "   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "
@@ -4389,13 +4444,13 @@ msgstr ""
 "\n"
 "   !! Kui valite selle võimaluse, kaotate kõik kõvakettal olevad andmed. !!\n"
 "\n"
-" ' \"%s\": valige see, kui soovite ise kontrollida kõvaketta jagamist\n"
-"partitsioonideks. Kuid olge ettevaatlik - see on küll võimas, aga ohte "
-"sisaldav\n"
+" * \"%s\": valige see, kui soovite ise kontrollida kõvaketta jagamist.\n"
+"Kuid olge ettevaatlik - see on küll võimas, aga ohte sisaldav\n"
 "valik, mille puhul võib kergesti kaotada olemasolevad andmed. Seepärast ei\n"
 "peaks seda valima, kui Te pole endas päris kindel. Täpsemalt saab teada,\n"
-"kuidas kasutada DiskDrake võimalusi, \"Juhised alustamiseks\" (\"Starter\n"
-"Guide\") osast \"Partitsioonide haldamine\"."
+"kuidas kasutada DiskDrake'i võimalusi, \"Põhiteadmiste käsiraamatu"
+"\" (\"Starter\n"
+"Guide\") alapeatükist \"Partitsioonide haldamine\"."
 
 #: help.pm:374 install_interactive.pm:95
 #, c-format
@@ -4425,13 +4480,13 @@ msgstr "Eemalda Windows"
 #: help.pm:374 install_interactive.pm:228
 #, c-format
 msgid "Custom disk partitioning"
-msgstr "Partitsioneerin ise"
+msgstr "Jagan ketta ise"
 
 #: help.pm:377
 #, c-format
 msgid ""
 "There you are. Installation is now complete and your GNU/Linux system is\n"
-"ready to be used. Just click on \"%s\" to reboot the system. Don't forget\n"
+"ready to be used. Just click on \"%s\" to reboot the system. Do not forget\n"
 "to remove the installation media (CD-ROM or floppy). The first thing you\n"
 "should see after your computer has finished doing its hardware tests is the\n"
 "boot-loader menu, giving you the choice of which operating system to start.\n"
@@ -4464,22 +4519,22 @@ msgid ""
 "\"mformat a:\", or \"fdformat /dev/fd0\" followed by \"mkfs.vfat\n"
 "/dev/fd0\"."
 msgstr ""
-"Ja nüüd ongi paigaldus selja taga ning Teie GNU/Linuxi süsteem valmis "
+"Ja nüüd ongi paigaldamine selja taga ning Teie GNU/Linuxi süsteem valmis "
 "tööks.\n"
 "Selleks tuleb vaid klõpsata \"%s\" ning arvuti teeb taaskäivituse. Ärge\n"
-"unustage eemaldamast paigaldus-andmekandjat (CD-ROM või diskett). Seejärel\n"
-"võite valida, kas käivitada GNU/Linux või Windows (kui Teie arvutil on mitu\n"
+"unustage eemaldamast paigaldus-andmekandjat (CD või diskett). Seejärel\n"
+"võite valida, kas käivitada GNU/Linux või Windows (kui Teie arvutis on mitu\n"
 "süsteemi).\n"
 "\n"
 "Nupp \"%s\" pakub veel kaks võimalust:\n"
 "\n"
 " * \"%s\": loob paigaldusdisketi, mis sooritab kogu\n"
-"paigalduse ilma kasutajata, paigaldus ise on samasugune nagu äsja\n"
+"paigaldamise ilma kasutajata, paigaldamine ise on samasugune nagu äsja\n"
 "seljataha jäänu.\n"
 "\n"
 "   Selle valiku korral ilmub veel kaks erinevat võimalust:\n"
 "\n"
-"    * \"%s\". See on osaliselt automaatne, sest partitsioneerimisel\n"
+"    * \"%s\". See on osaliselt automaatne, sest kõvaketta jagamisel\n"
 "(aga ka ainult seal) on võimalik sekkuda.\n"
 "\n"
 "    * \"%s\". Täisautomaatne paigaldus: kõvaketas kirjutatakse täielikult\n"
@@ -4490,10 +4545,10 @@ msgstr ""
 "ühesugustel masinatel. Lähemalt vaadake meie veebileheküljel\n"
 "automaatpaigalduse sektsiooni.\n"
 "\n"
-" * \"%s\"(*): salvestab paigalduse käigus valitud pakettide\n"
+" * \"%s\"(*): salvestab paigaldamise käigus valitud pakettide\n"
 "nimekirja. Kui nüüd võtate ette uue paigalduse, asetage diskett seadmesse "
 "ning\n"
-"käivitage paigaldus klahvile [F1] vajutades abiekraani vahendusel, andes "
+"käivitage paigaldamine klahvile [F1] vajutades abiekraani vahendusel, andes "
 "käsu\n"
 ">>linux defcfg=\"floppy\"<< ja vajutades seejärel klahvi [Enter].\n"
 "\n"
@@ -4507,17 +4562,17 @@ msgstr ""
 msgid "Generate auto-install floppy"
 msgstr "Loo kiirpaigaldusdiskett"
 
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
 #, c-format
 msgid "Replay"
 msgstr "Kordamine"
 
-#: help.pm:409 install_steps_interactive.pm:1363
+#: help.pm:409 install_steps_interactive.pm:1328
 #, c-format
 msgid "Automated"
 msgstr "Automaatne"
 
-#: help.pm:409 install_steps_interactive.pm:1366
+#: help.pm:409 install_steps_interactive.pm:1331
 #, c-format
 msgid "Save packages selection"
 msgstr "Salvesta paketivalik"
@@ -4531,12 +4586,13 @@ msgid ""
 "\n"
 "Please note that it's not necessary to reformat all pre-existing\n"
 "partitions. You must reformat the partitions containing the operating\n"
-"system (such as \"/\", \"/usr\" or \"/var\") but you don't have to reformat\n"
+"system (such as \"/\", \"/usr\" or \"/var\") but you do not have to "
+"reformat\n"
 "partitions containing data that you wish to keep (typically \"/home\").\n"
 "\n"
 "Please be careful when selecting partitions. After the formatting is\n"
 "completed, all data on the selected partitions will be deleted and you\n"
-"won't be able to recover it.\n"
+"will not be able to recover it.\n"
 "\n"
 "Click on \"%s\" when you're ready to format the partitions.\n"
 "\n"
@@ -4566,15 +4622,14 @@ msgstr ""
 "Klõpsake \"%s\", kui soovite valida oma uue Mandrakelinuxi süsteemi\n"
 "paigaldamiseks mõne muu partitsiooni.\n"
 "\n"
-"Klõpsake \"%s\", kui soovite valida partitsioone, millel kontrollitaks "
-"halbade\n"
-"blokkide olemasolu."
+"Klõpsake \"%s\", kui soovite valida partitsioone, millel kontrollitaks\n"
+"vigaste blokkide olemasolu."
 
-#: help.pm:431 install_steps_gtk.pm:402 interactive.pm:404
-#: interactive/newt.pm:316 printer/printerdrake.pm:3266
-#: standalone/drakTermServ:351 standalone/drakbackup:3901
-#: standalone/drakbackup:3940 standalone/drakbackup:4051
-#: standalone/drakbackup:4066 ugtk2.pm:513
+#: help.pm:431 install_steps_gtk.pm:388 interactive.pm:425
+#: interactive/newt.pm:316 printer/printerdrake.pm:3579
+#: standalone/drakTermServ:361 standalone/drakbackup:3906
+#: standalone/drakbackup:3945 standalone/drakbackup:4056
+#: standalone/drakbackup:4071 ugtk2.pm:504
 #, c-format
 msgid "Previous"
 msgstr "Eelmine"
@@ -4603,15 +4658,16 @@ msgstr ""
 "eelistate\n"
 "pakette uuendada millalgi hiljem.\n"
 "\n"
-"Kui valite \"%s\", näidatakse Teile loendit kohtadega, kust uuendusi "
+"Kui valite \"%s\", näidatakse Teile nimekirja kohtadega, kust uuendusi "
 "tõmmata\n"
 "saab. Valige endale lähim paik. Seejärel ilmub paketivaliku puu. Vaadake "
 "see\n"
-"üle ning vajutage \"%s\", kui soovite valitud paketi(d) alla laadida ja\n"
+"üle ning klõpsake nupule \"%s\", kui soovite valitud paketi(d) alla laadida "
+"ja\n"
 "paigaldada, või \"%s\", kui Te ei soovi seda teha."
 
-#: help.pm:444 help.pm:588 install_steps_gtk.pm:401
-#: install_steps_interactive.pm:158 standalone/drakbackup:4098
+#: help.pm:444 help.pm:588 install_steps_gtk.pm:387
+#: install_steps_interactive.pm:156 standalone/drakbackup:4103
 #, c-format
 msgid "Install"
 msgstr "Paigaldus"
@@ -4625,24 +4681,25 @@ msgid ""
 "exposed to the Internet. The trade-off that a higher security level is\n"
 "generally obtained at the expense of ease of use.\n"
 "\n"
-"If you don't know what to choose, keep the default option. You'll be able\n"
+"If you do not know what to choose, keep the default option. You'll be able\n"
 "to change it later with the draksec tool, which is part of Mandrakelinux\n"
 "Control Center.\n"
 "\n"
 "Fill the \"%s\" field with the e-mail address of the person responsible for\n"
 "security. Security messages will be sent to that address."
 msgstr ""
-"Nüüd on aeg valida masinale meelepärane turvatase. Rusikareeglina peaks\n"
+"Nüüd on aeg valida masinale sobiv turvatase. Rusikareeglina peaks\n"
 "turvatase olema seda kõrgem, mida ligipääsule avatum arvuti on ja mida "
 "rohkem\n"
-"leidub sellel olulise tähtsusega andmeid. Samas tähendab kõrgem turvatase\n"
-"üldiselt kasutamislihtsuse kahanemist.\n"
+"leidub selles olulise tähtsusega andmeid. Samas muudab kõrgem turvatase\n"
+"enamasti kasutamise mõnevõrra keerukamaks.\n"
 "\n"
-"Kui Te ei tea, mida valida, leppige pakutud võimalusega. Teil on hiljem\n"
-"võimalik turvataset muuta Mandrake juhtimiskeskuses abivahendiga Draksec.\n"
+"Kui Te ei tea, mida valida, jätke kehtima vaikimisi pakutud valik. Hiljem\n"
+"saate turvataset muuta Mandrakelinuxi juhtimiskeskuses abivahendiga "
+"Draksec.\n"
 "\n"
-"Väli \"%s\" on mõeldud süsteemi selle kasutaja teavitamiseks, kes vastutab\n"
-"turvalisuse eest. Turvalisusega seotud teated saadetakse sellele aadressile."
+"Väli \"%s\" on mõeldud süsteemi turvalisuse eest vastutava kasutaja\n"
+"teavitamiseks. Turvalisusega seotud teated saadetakse sellele aadressile."
 
 #: help.pm:458
 #, c-format
@@ -4679,7 +4736,7 @@ msgid ""
 "floppy disk.\n"
 "\n"
 " * \"%s\": if your partition table is damaged, you can try to recover it\n"
-"using this option. Please be careful and remember that it doesn't always\n"
+"using this option. Please be careful and remember that it does not always\n"
 "work.\n"
 "\n"
 " * \"%s\": discards all changes and reloads the partition table that was\n"
@@ -4730,25 +4787,25 @@ msgstr ""
 "\n"
 "Partitsioon on loogiliselt eraldatud kõvaketta piirkond, mille suurust\n"
 "ei ole võimalik hiljem, töötavas süsteemis enam muuta. Samuti hävivad\n"
-"partitsiooni kustutamisel kõik sellel sisalduvad andmed.\n"
+"partitsiooni kustutamisel kõik selles leiduvad andmed.\n"
 "\n"
-"Et muuta seda tegevust lihtsamaks, on loodud nõustaja, mille soovitused\n"
+"Kõvaketta jagamise lihtsustamiseks on loodud nõustaja, mille soovitused\n"
 "on harilikult mõistlikud.\n"
 "\n"
-"Partitsioonide loomiseks valige esmalt kõvaketas. ``hda'' tähendab siin "
+"Partitsioonide loomiseks valige esmalt kõvaketas. \"hda\" tähendab siin "
 "esimest\n"
-"IDE-ketast, ``hdb'' teist IDE-ketast, ``sda'' esimest SCSI-ketast ja nii "
+"IDE-ketast, \"hdb\" teist IDE-ketast, \"sda\" esimest SCSI-ketast ja nii "
 "edasi.\n"
 "\n"
-"Valitud ketta partitsioneerimiseks on järgmised võimalused:\n"
+"Valitud ketta jagamiseks on järgmised võimalused:\n"
 "\n"
 " * \"%s\": kustutatakse kõik olemasolevad partitsioonid\n"
 "sellel kettal.\n"
 "\n"
 " * \"%s\": sel juhul tekitatakse Linuxile vajalikud\n"
-"partitsioonid vabale kettapinnale automaatselt.\n"
+"partitsioonid kõvaketta vabale osale automaatselt.\n"
 "\n"
-"\"%s\": pakub mõned lisavõimalused:\n"
+"\"%s\" pakub mõned lisavõimalused:\n"
 " * \"%s\": salvestab partitsioonitabeli disketile.\n"
 "Sellest on kasu hilisemal partitsioonitabeli taastamisel, kui seda vaja\n"
 "peaks olema. Igal juhul on äärmiselt soovitav see samm ette võtta.\n"
@@ -4764,7 +4821,7 @@ msgstr ""
 "\n"
 " * \"%s\": selle võimaluse\n"
 "tühistamine sunnib kasutajaid käsitsi haakima ja lahutama eemaldatavaid\n"
-"andmekandjaid, st diskette ja CD-ROMe.\n"
+"andmekandjaid, st diskette ja CD-sid.\n"
 "\n"
 " * \"%s\": kui soovite uue partitsioonitabeli loomisel samm-sammulist\n"
 "juhatust. See on soovitatav, kui Te ei ole varem midagi sellist teinud.\n"
@@ -4774,25 +4831,28 @@ msgstr ""
 " * \"%s\": võimaldab partitsioonidega ette\n"
 "võtta lisaoperatsioone (tüüp, võtmed, vorming) ning pakub rohkem infot.\n"
 "\n"
-" * \"%s\": Partitsiooni suurust määrates saate seda täpselt paika\n"
-"panna klaviatuuril asuvaid nooleklahve kasutades.\n"
+" * \"%s\": kui olete kõvaketta jagamise lõpetanud, saate sellele nupule\n"
+"klõpsates tehtud muudatused salvestada.\n"
+"\n"
+"Partitsiooni suurust määrates saate seda täpselt paika panna klaviatuuril\n"
+"asuvaid nooleklahve kasutades.\n"
 "\n"
 "Märkus: igale võimalusele pääseb ligi ka klaviatuuri abil. Partitsioonidel\n"
 "saab liikuda klahvidega [Tab] ning üles-alla nooleklahvidega.\n"
 "\n"
-"Valitud partitsioonil on võimalikud järgmised tegevused:\n"
+"Partitsiooni valimisel saab ette võtta järgmisi toiminguid:\n"
 "\n"
 " * Ctrl+C uue partitsiooni loomine (kui valitud on tühi partitsioon).\n"
 "\n"
 " * Ctrl+D partitsiooni kustutamine.\n"
 "\n"
-" * Ctrl+M haakepunkti seadmine.\n"
+" * Ctrl+M haakepunkti määramine.\n"
 "\n"
-"Lähemat infot erinevate failisüsteemitüüpide kohta leiab käsiraamatu\n"
-"peatükist ext2FS.\n"
+"Lähemat infot erinevate failisüsteemitüüpide kohta leiab \"Süvateadmiste\n"
+"käsiraamatu\" (\"Reference Manual\") peatükist \"Linuxi failisüsteem\".\n"
 "\n"
-"Kui paigaldus toimub PPC-masinale, tuleks luua vähemalt 1MB suurune\n"
-"väike HFS ``bootstrap'' partitsioon, mida kasutab alglaadur yaboot. Kui Te\n"
+"Kui paigaldamine toimub PPC-masinas, tuleks luua vähemalt 1MB suurune\n"
+"väike HFS \"bootstrap\"-partitsioon, mida kasutab alglaadur yaboot. Kui Te\n"
 "aga teete selle partitsiooni natukene suuremaks (näiteks nii umbes 50MB),\n"
 "on see päris hea koht, kuhu hädaolukorraks paigutada tagavarakernel\n"
 "ja ramdisk-laadepildid."
@@ -4805,7 +4865,7 @@ msgstr "Eemaldatava andmekandja automaatne haakimine"
 #: help.pm:530
 #, c-format
 msgid "Toggle between normal/expert mode"
-msgstr "Ekspert > Tavakasutaja"
+msgstr "Tava- ja ekspertrežiimi lülitamine"
 
 #: help.pm:533
 #, c-format
@@ -4872,12 +4932,13 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%s\": check the current country selection. If you're not in this country,\n"
-"click on the \"%s\" button and choose another. If your country isn't in the\n"
+"click on the \"%s\" button and choose another. If your country is not in "
+"the\n"
 "list shown, click on the \"%s\" button to get the complete country list."
 msgstr ""
-"\"%s\": võimaldab konrollida praegust maa valikut. Kui see ei ole riik,\n"
-"kus Te viibite, vajutage nuppu \"%s\" ja valige mõni muu maa. Kui\n"
-"Teie maad ei ole ilmuvas nimekirjas, vajutage nuppu \"%s\", mis avab\n"
+"\"%s\": võimaldab kontrollida praegust riigi valikut. Kui see ei ole riik,\n"
+"kus Te viibite, klõpsake nupule \"%s\" ja valige mõni muu riik. Kui\n"
+"Teie riiki ei ole ilmuvas nimekirjas, klõpsake nupule \"%s\", mis avab\n"
 "riikide täisnimekirja."
 
 #: help.pm:569
@@ -4897,7 +4958,7 @@ msgid ""
 "\n"
 " * \"%s\". This installation class allows you to update the packages\n"
 "currently installed on your Mandrakelinux system. Your current partitioning\n"
-"scheme and user data won't be altered. Most of the other configuration\n"
+"scheme and user data will not be altered. Most of the other configuration\n"
 "steps remain available and are similar to a standard installation.\n"
 "\n"
 "Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
@@ -4916,12 +4977,12 @@ msgstr ""
 "kasutada. Sõltuvalt kettajagamise viisist on võimalik ka mõningaid andmeid\n"
 "ülekirjutamise eest päästa.\n"
 "\n"
-" * \"%s\": see paigaldusviis võimaldab uuendada praegu olemasolevasse\n"
+" * \"%s\": see paigaldamisviis võimaldab uuendada praegu olemasolevasse\n"
 "Mandrakelinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
 "kasutajate\n"
 "andmeid ei muudeta. Enamik seadistussamme on kasutatavad sarnaselt "
 "tavapärasele\n"
-"paigaldusele.\n"
+"paigaldamisele.\n"
 "\n"
 "Võimalus \"Uuendus\" peaks toimima edukalt Mandrakelinuxi süsteemides\n"
 "alates versioonist 8.1. Uuenduse proovimist varasemate versioonide peal\n"
@@ -4938,7 +4999,7 @@ msgid ""
 "language: for example, if you are an English-speaking Swiss native, you may\n"
 "have a Swiss keyboard. Or if you speak English and are located in Quebec,\n"
 "you may find yourself in the same situation where your native language and\n"
-"country-set keyboard don't match. In either case, this installation step\n"
+"country-set keyboard do not match. In either case, this installation step\n"
 "will allow you to select an appropriate keyboard from a list.\n"
 "\n"
 "Click on the \"%s\" button to be shown a list of supported keyboards.\n"
@@ -4949,10 +5010,11 @@ msgid ""
 msgstr ""
 "Tavaliselt valib DrakX klaviatuuri Teie eest juba ära (sõltuvalt valitud\n"
 "keelest). Kuid see võib tekitada olukorra, kus Teil ikkagi pole just see\n"
-"klaviatuur, mida soovite: kui olete näiteks inglise keelt kõnelev\n"
-"šveitslane, võite siiski soovida Šveitsi asetusega klaviatuuri. Teine kohe\n"
-"pähe tulev juhtum on inglise keele kõneleja Quebecis. Mõlemal juhul on\n"
-"mõtet naasta paigalduse selle sammu juurde ja valida loendist vajalik\n"
+"klaviatuur, mida soovite: kui olete näiteks eesti keelt kõnelev\n"
+"hispaanlane, võite siiski soovida hispaania asetusega klaviatuuri. Teine "
+"kohe\n"
+"pähe tulev juhtum on läti keele kõneleja Eestis. Mõlemal juhul on\n"
+"mõtet naasta paigaldamise selle sammu juurde ja valida nimekirjast vajalik\n"
 "klaviatuur.\n"
 "\n"
 "Klõpsake nupul \"%s\", mis näitab kõiki toetatud klaviatuure.\n"
@@ -5004,13 +5066,13 @@ msgid ""
 "by the entire system. Running the command as a regular user will only\n"
 "change the language settings for that particular user."
 msgstr ""
-"Esimene samm on meelepärase keele valik. Siin saate valida keele,\n"
-"mida kasutada paigaldamisel ja hilisemas töös. Valige esmalt maa,\n"
-"kus asute, ning seejärel meelepärane keel.\n"
+"Esimene samm on vajaliku keele valik. Siin saate valida keele,\n"
+"mida kasutada paigaldamisel ja hilisemas töös. Valige esmalt riik,\n"
+"kus asute, ning seejärel vajalik keel.\n"
 "\n"
 "Klõpsates nupul \"%s\", võite valida muid keeli, mida Teie tööjaamale\n"
 "paigaldada. Teiste keelte valikul paigaldatakse vastava keele rakenduste\n"
-"ja dokumentatsiooni failid. Kui Teie masinal töötab näiteks kasutajaid\n"
+"ja dokumentatsiooni failid. Kui Teie masinaga töötab näiteks kasutajaid\n"
 "Hispaaniast, valige puuvaates põhikeeleks eesti keel ning sektsioonis\n"
 "\"Muud\" märkige ära \"%s\".\n"
 "\n"
@@ -5084,7 +5146,8 @@ msgstr ""
 "see välja ei tule, eeldatakse, et Teil on kahe nupuga hiir, ning "
 "kasutatakse\n"
 "kolmanda nupu emuleerimist. Kahenupulisel hiirel saab kolmandat nuppu\n"
-"\"vajutada\" üheaegselt vasakut ja paremat nuppu vajutades. DrakX tuvastab\n"
+"\"klõpsata\" üheaegselt vasakut ja paremat nuppu alla vajutades. DrakX "
+"tuvastab\n"
 "automaatselt, kas tegemist on PS/2, jadapordi või USB-hiirega.\n"
 "\n"
 "Kui teil on kolme nupuga, aga ilma rattata hiir, võite valida tüübiks\n"
@@ -5099,13 +5162,13 @@ msgstr ""
 "testida. Kasutage nuppe ja ratast kontrollimaks, et valik oli õige. Kui\n"
 "hiir ei käitu korralikult, vajutage tühikuklahvi või klahvi [Return], mis "
 "viib\n"
-"Teid tagasi dialoogi ja lubab sooritada uue valiku.\n"
+"Teid tagasi dialoogi ja lubab uuesti valida.\n"
 "\n"
 "Vahel ei õnnestu rattaga hiirt automaatselt tuvastada. Siis tuleb see "
-"loendist\n"
+"nimekirjast\n"
 "käsitsi valida. Kontrollige, et valite õigesse porti ühendatud hiiretüübi. "
 "Kui\n"
-"vajutate nupule \"%s\", näidatakse hiire kujutist. Siis tuleb Teil "
+"klõpsate nupule \"%s\", näidatakse hiire kujutist. Siis tuleb Teil "
 "liigutada\n"
 "hiireratast, et see korrektselt aktiveerida. Seejärel testige, kas kõik "
 "nupud\n"
@@ -5150,10 +5213,11 @@ msgid ""
 "characters long. Never write down the \"root\" password -- it makes it far\n"
 "too easy to compromise your system.\n"
 "\n"
-"One caveat: don't make the password too long or too complicated because you\n"
+"One caveat: do not make the password too long or too complicated because "
+"you\n"
 "must be able to remember it!\n"
 "\n"
-"The password won't be displayed on screen as you type it. To reduce the\n"
+"The password will not be displayed on screen as you type it. To reduce the\n"
 "chance of a blind typing error you'll need to enter the password twice. If\n"
 "you do happen to make the same typing error twice, you'll have to use this\n"
 "``incorrect'' password the first time you'll try to connect as \"root\".\n"
@@ -5162,7 +5226,7 @@ msgid ""
 "click on the \"%s\" button.\n"
 "\n"
 "If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one for \"%s\". If you don't know which\n"
+"services, select the appropriate one for \"%s\". If you do not know which\n"
 "one to use, you should ask your network administrator.\n"
 "\n"
 "If you happen to have problems with remembering passwords, or if your\n"
@@ -5171,21 +5235,20 @@ msgid ""
 msgstr ""
 "Nüüd on kätte jõudnud kõige olulisem hetk Teie arvuti turvalisuse "
 "tagamisel:\n"
-"Teil tuleb määrata \"administraatori\" parool. Administraator haldab kogu\n"
-"süsteemi ja ainult temal on õigus uuendusi ette võtta, kasutajaid lisada, "
-"muuta\n"
+"Teil tuleb määrata administraatori (\"root\") parool. Administraator haldab "
+"kogu\n"
+"süsteemi ja ainult temal on õigus seda uuendada, kasutajaid lisada, muuta\n"
 "kogu süsteemi seadistusi ja nii edasi. Ehk teisisõnu - administraator võib "
 "teha\n"
 "kõike! Seepärast tuleks parool valida selline, mida oleks raske ära arvata.\n"
 "DrakX ütleb Teile, kui parool tundub olevat liiga lihtne. Te võite muidugi "
 "jätta\n"
-"ka parooli sisestamata, aga me soovitame väga tungivalt seda siiski teha - \n"
-"kasvõi juba sel põhjusel, et kuigi Te paigaldate endale GNU/Linuxi "
-"süsteemi,\n"
-"ei tähenda see veel, et vigu ette ei võiks tulla. Kuna administraator võib\n"
-"kõiki piiranguid muuta ning vahel tahtmatultki kustutada oma hooletu\n"
-"tegevusega kõik andmed mingilt partitsioonilt, on päris oluline, et\n"
-"administraatoriks saamine ei oleks eriti lihtne.\n"
+"ka parooli sisestamata, aga me soovitame väga tungivalt seda siiski teha.\n"
+"Nagu iga muu operatsioonisüsteem, ei ole ka GNU/Linuxi süsteem täielikult\n"
+"kaitstud vigade eest. Kuna administraator võib kõiki piiranguid muuta ning\n"
+"vahel tahtmatultki kustutada oma hooletu tegevusega kõik andmed mingilt\n"
+"partitsioonilt, on päris oluline, et administraatoriks saamine ei oleks\n"
+"eriti lihtne.\n"
 "\n"
 "Parool võib koosneda nii tähtedest kui numbritest ja peab olema vähemalt\n"
 "8 (kaheksa) märki pikk. Ärge pange kunagi administraatori parooli kirja - "
@@ -5195,10 +5258,10 @@ msgstr ""
 "Väike soovitus - ärge siiski parooli liiga keeruliseks või pikaks ajage,\n"
 "sest lõppeks peaksite seda ju suutma ka meelde jätta!\n"
 "\n"
-"Kui Te parooli sisestate, seda ekraanil ei näidata. Te peate selle "
-"sisestama\n"
-"kaks korda, mis väldib kirjutamisvea võimaluse. Siiski, kui teete ühesuguse\n"
-"vea kaks korda järjest, on just see \"vigane\" parool, mida Teilt oodatakse\n"
+"Kui Te parooli sisestate, seda ekraanil ei näidata. Juhuslike näpuvigade\n"
+"vältimiseks peate selle sisestama kaks korda järjest. Siiski, kui teete\n"
+"mõlemal korral ühesuguse vea, on just see \"vigane\" parool, mida Teilt "
+"oodatakse\n"
 "administraatorina sisselogimisel.\n"
 "\n"
 "Kui soovite, et ligipääsu käesolevale arvutile kontrolliks mõni\n"
@@ -5208,7 +5271,7 @@ msgstr ""
 "teenused, valige neist sobilik \"%s\". Kui Te aga ei juhtu teadma,\n"
 "mida teha, pöörduge oma võrgu administraatori poole.\n"
 "\n"
-"Kui Teil on probleeme salasõna meelespidamisega, Teie arvuti ei ole\n"
+"Kui Teil on probleeme parooli meelespidamisega, Teie arvuti ei ole\n"
 "ühendatud ühtegi administreeritavasse võrku või Te usaldate täielikult\n"
 "kõiki, kes Teie arvutit kasutavad, on mõttekas valida \"%s\"."
 
@@ -5217,12 +5280,6 @@ msgstr ""
 msgid "authentication"
 msgstr "autentimisviis"
 
-#. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:722 install_steps_interactive.pm:1211
-#, c-format
-msgid "No password"
-msgstr "Salasõna puudub"
-
 #: help.pm:725
 #, c-format
 msgid ""
@@ -5237,9 +5294,10 @@ msgid ""
 "\n"
 " * if a GRUB or LILO boot sector is found, it'll replace it with a new one.\n"
 "\n"
-"If DrakX can't determine where to place the boot sector, it'll ask you\n"
+"If DrakX can not determine where to place the boot sector, it'll ask you\n"
 "where it should place it. Generally, the \"%s\" is the safest place.\n"
-"Choosing \"%s\" won't install any boot loader. Use this option only if you\n"
+"Choosing \"%s\" will not install any boot loader. Use this option only if "
+"you\n"
 "know what you're doing."
 msgstr ""
 "Alglaadur on väike programm, mille arvuti käivitab alglaadimise ajal.\n"
@@ -5264,9 +5322,9 @@ msgid ""
 "operating systems may offer you one, but Mandrakelinux offers two. Each of\n"
 "the printing systems is best suited to particular types of configuration.\n"
 "\n"
-" * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
+" * \"%s\" -- which is an acronym for ``print, do not queue'', is the choice\n"
 "if you have a direct connection to your printer, you want to be able to\n"
-"panic out of printer jams, and you don't have networked printers. (\"%s\"\n"
+"panic out of printer jams, and you do not have networked printers. (\"%s\"\n"
 "will handle only very simple network cases and is somewhat slow when used\n"
 "within networks.) It's recommended that you use \"pdq\" if this is your\n"
 "first experience with GNU/Linux.\n"
@@ -5281,16 +5339,16 @@ msgid ""
 "\"%s\" includes graphical front-ends for printing or choosing printer\n"
 "options and for managing the printer.\n"
 "\n"
-"If you make a choice now, and later find that you don't like your printing\n"
+"If you make a choice now, and later find that you do not like your printing\n"
 "system you may change it by running PrinterDrake from the Mandrakelinux\n"
 "Control Center and clicking on the \"%s\" button."
 msgstr ""
-"Siin saate valida oma arvutile trükkimissüsteemi. Teised "
+"Siin saate valida oma arvuti trükkimissüsteemi. Teised "
 "operatsioonisüsteemid\n"
 "võivad Teile pakkuda vaid üht süsteemi, kuid Mandrakelinuxi puhul saate\n"
 "valida tervelt kahe seast.\n"
 "\n"
-" * \"%s\" - mis tähendab ``trüki kohe'' (``print, don't queue'') - tuleks "
+" * \"%s\" - mis tähendab \"trüki kohe\" (\"print, do not queue\") - tuleks "
 "valida siis,\n"
 "kui Teil on printeriga otseühendus, Te ei soovi näha mingeid järjekordi ja "
 "Teil\n"
@@ -5299,8 +5357,8 @@ msgstr ""
 "tal võib esineda tegutsemisraskusi. Kui see on Teie esimene retk GNU/Linuxi\n"
 "maailma, valige \"pdq\".\n"
 "\n"
-" * \"%s\" - ``tavaline UNIXi trükkimissüsteem'' (``Common Unix Printing\n"
-"System'') - on hiilgav valik trükkimiseks Teie kohalikul printeril või ka "
+" * \"%s\" - \"tavaline UNIXi trükkimissüsteem\" (\"Common Unix Printing\n"
+"System\") - on hiilgav valik trükkimiseks Teie kohalikul printeril või ka "
 "mõnel teisel pool maakera asuvas\n"
 "printeris. See on lihtne süsteem, mis võib olla nii kliendiks kui serveriks "
 "iidsele\n"
@@ -5312,7 +5370,7 @@ msgstr ""
 "trükkimiseks või printeri seadistamiseks.\n"
 "\n"
 "Kui leiate hiljem, et siinkohal langetatud valik polnud vahest kõige parem,\n"
-"siis saate seda muuta Mandrake juhtimiskeskuses PrinterDrake abil,\n"
+"siis saate seda muuta Mandrakelinuxi juhtimiskeskuses PrinterDrake abil,\n"
 "klõpsates seal nupule \"%s\"."
 
 #: help.pm:765
@@ -5320,7 +5378,7 @@ msgstr ""
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:765 printer/cups.pm:115 printer/data.pm:104
+#: help.pm:765 printer/cups.pm:115 printer/data.pm:118
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
@@ -5328,7 +5386,7 @@ msgstr "CUPS"
 #: help.pm:765
 #, c-format
 msgid "Expert"
-msgstr "Ekspertresiim"
+msgstr "Ekspertrežiim"
 
 #: help.pm:768
 #, c-format
@@ -5360,7 +5418,8 @@ msgstr ""
 "minema, palub DrakX Teil teatada, kas masinas on mõni PCI SCSI-liides.\n"
 "\n"
 "Kui peate oma adapteri käsitsi määrama, küsib DrakX, kas soovite määrata\n"
-"ka selle parameetrid. Siin oleks mõtet lasta tegutseda DrakX-l, mis proovib\n"
+"ka selle parameetrid. Siin oleks mõtet lasta tegutseda DrakX'il, mis "
+"proovib\n"
 "järele liidese spetsiifilised omadused, mida see initsialiseerimiseks "
 "vajab.\n"
 "Tavaliselt õnnestub see edukalt.\n"
@@ -5374,15 +5433,15 @@ msgstr ""
 #, c-format
 msgid ""
 "\"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver."
 msgstr ""
 "\"%s\": kui süsteemis leiti helikaart, näidatakse seda siin.\n"
 "Kui märkate, et näidatav helikaart ei ole mitte see, mis süsteemis\n"
 "Teie teada tegelikult on, klõpsake nuppu ja valige uus draiver."
 
-#: help.pm:788 help.pm:855 install_steps_interactive.pm:1019
-#: install_steps_interactive.pm:1036
+#: help.pm:788 help.pm:855 install_steps_interactive.pm:1005
+#: install_steps_interactive.pm:1022
 #, c-format
 msgid "Sound card"
 msgstr "Helikaart"
@@ -5401,7 +5460,7 @@ msgid ""
 "\n"
 " * \"%s\": check the current country selection. If you're not in this\n"
 "country, click on the \"%s\" button and choose another. If your country\n"
-"isn't in the list shown, click on the \"%s\" button to get the complete\n"
+"is not in the list shown, click on the \"%s\" button to get the complete\n"
 "country list.\n"
 "\n"
 " * \"%s\": by default, DrakX deduces your time zone based on the country\n"
@@ -5417,18 +5476,18 @@ msgid ""
 "presented in our manual is similar to the one used during installation.\n"
 "\n"
 " * \"%s\": if a sound card is detected on your system, it'll be displayed\n"
-"here. If you notice the sound card isn't the one actually present on your\n"
+"here. If you notice the sound card is not the one actually present on your\n"
 "system, you can click on the button and choose a different driver.\n"
 "\n"
 " * \"%s\": if you have a TV card, this is where information about its\n"
-"configuration will be displayed. If you have a TV card and it isn't\n"
+"configuration will be displayed. If you have a TV card and it is not\n"
 "detected, click on \"%s\" to try to configure it manually.\n"
 "\n"
 " * \"%s\": you can click on \"%s\" to change the parameters associated with\n"
 "the card if you feel the configuration is wrong.\n"
 "\n"
 " * \"%s\": by default, DrakX configures your graphical interface in\n"
-"\"800x600\" or \"1024x768\" resolution. If that doesn't suit you, click on\n"
+"\"800x600\" or \"1024x768\" resolution. If that does not suit you, click on\n"
 "\"%s\" to reconfigure your graphical interface.\n"
 "\n"
 " * \"%s\": if you wish to configure your Internet or local network access,\n"
@@ -5456,76 +5515,73 @@ msgid ""
 "on your machine. If you plan to use this machine as a server it's a good\n"
 "idea to review this setup."
 msgstr ""
-"Siin näidatakse mitmeid Teie masinat puudutavaid parameetreid. Sõltuvalt\n"
+"Siin näidatakse mitmeid Teie süsteemi puudutavaid parameetreid. Sõltuvalt\n"
 "riistvarast võite siin näha kõiki või osa järgmistest kirjetest. Iga kirje\n"
 "juures on ära toodud elemendid, mida on võimalik seadistada, ning Teie "
-"masinal\n"
-"praegu kehtiv seadistus. Selle muutmiseks vajutage nupule \"%s\".\n"
+"masinas\n"
+"praegu kehtiv seadistus. Selle muutmiseks klõpsake nupule \"%s\".\n"
 "\n"
-" * \"%s\": võimalus kontrollida klaviatuuritabeli seadistusi\n"
+" * \"%s\": võimaldab kontrollida klaviatuuritabeli seadistusi\n"
 "ja neid vajaduse korral muuta.\n"
 "\n"
-" * \"%s\": võimalus kontrollida oma riigi valikut. Kui Te ei asu\n"
-"vaikimisi määratud maal, vajutage nuppu \"%s\" ja valige uus\n"
-"riik. Kui Teie riiki ei ole ilmuvas nimekirjas, vajutage nupule\n"
+" * \"%s\": võimaldab kontrollida asukohariigi valikut. Kui Te ei asu\n"
+"vaikimisi määratud riigis, klõpsake nupule \"%s\" ja valige uus\n"
+"riik. Kui Teie riiki ei ole ilmuvas nimekirjas, klõpsake nupule\n"
 "\"%s\", mis avab riikide täisnimekirja.\n"
 "\n"
-" * \"%s\": DrakX arvab vaikimisi ajavööndi ära valitud keele põhjal. Kuid\n"
-"nagu klaviatuuri puhul, võib ka siin ette tulla, et Te ei viibi näiteks "
-"maal,\n"
-"millele valitud keel vastab. Sellisel juhul tuleks klõpsata nupul \"%s\",\n"
-"et seada kell selle ajavööndi ajale, kus Te parajasti viibite.\n"
+" * \"%s\": DrakX tuletab ajavööndi valitud riigi põhjal. Kui see ei peaks\n"
+"Teile sobima, klõpsake nupule \"%s\".\n"
 "\n"
-" * \"%s\": võimalus kontrollida hiire seadistusi ja neid vajadusel muuta.\n"
+" * \"%s\": võimaldab kontrollida hiire seadistusi ja neid vajadusel muuta.\n"
 "\n"
-" * \"%s\": klõps nupul \"%s\" avab printeri seadistamise nõustaja.\n"
-"Seda, kuidas uut printerit seadistada, vaadake lähemalt käsiraamatu "
-"vastavast\n"
-"peatükist. Siin nähtav on sarnane paigaldusajal nähtuga.\n"
+" * \"%s\": klõps nupule \"%s\" avab printeri seadistamise nõustaja.\n"
+"Seda, kuidas uut printerit seadistada, vaadake lähemalt \"Põhiteadmiste\n"
+"käsiraamatu\" vastavast peatükist. Siin nähtav on sarnane paigaldamise ajal "
+"nähtuga.\n"
 "\n"
 " * \"%s\": kui süsteemis leiti helikaart, näidatakse seda.\n"
 "Kui märkate, et siintoodud helikaart pole see, mis tegelikult on\n"
-"süsteemi paigaldatud, vajutage nuppu ja valige sobiv draiver.\n"
+"süsteemi paigaldatud, klõpsake nupule ja valige sobiv draiver.\n"
 "\n"
 " * \"%s\": kui süsteemis leiti TV-kaart, näidatakse seda.\n"
-"Kui Teil on TV-kaart, aga seda ei leitud, vajutage nupule \"%s\"\n"
+"Kui Teil on TV-kaart, aga seda ei leitud, klõpsake nupule \"%s\"\n"
 "ning püüdke see käsitsi määrata.\n"
 "\n"
-" * \"%s\": nupule \"%s\" vajutades saab muuta kaardiga seonduvaid\n"
+" * \"%s\": nupule \"%s\" klõpsates saab muuta kaardiga seotud\n"
 "parameetreid, kui arvate, et need pole korrektsed.\n"
 "\n"
 " * \"%s\": vaikimisi määrab DrakX Teie graafilise liidese\n"
-"kuvatiheduseks \"800x600\" või \"1024x768\". Kui see Teile ei sobi,\n"
-"vajutage nupule \"%s\" ja valige mõni muu võimalus.\n"
+"ekraanilahutuseks \"800x600\" või \"1024x768\". Kui see Teile ei sobi,\n"
+"klõpsake nupule \"%s\" ja valige mõni muu võimalus.\n"
 "\n"
 " * \"%s\": Kui soovite kohe seadistada juurdepääsu Internetti või "
 "kohtvõrku,\n"
-"saate seda teha siin nupule vajutades.\n"
+"saate seda teha nupule klõpsates.\n"
 "\n"
-" * \"%s\": siin saab määrata HTTP ja FTP vahendaja aadressid,\n"
-"kui Teie masin asub vahendajaserveri taga.\n"
+" * \"%s\": siin saab määrata HTTP ja FTP puhverserveri aadressid,\n"
+"kui Teie masin asub puhverserveri taga.\n"
 "\n"
-" * \"%s\": see pakub võimaluse määrata ümber eelmisel sammul ()\n"
-"paika pandud turvatase.\n"
+" * \"%s\": see võimaldab muuta eelmisel sammul paika pandud turvataset.\n"
 "\n"
-" * \"%s\": kui kavatsete oma masina Internetti ühendada, kuluks\n"
-"ära enda kaitsmine rünnakute eest tulemüüri paikapanemisega. Vaadake\n"
-"üksikasju, kuidas tulemüüri seadistada, käsiraamatu vastavast peatükist.\n"
+" * \"%s\": kui kavatsete oma süsteemi Internetti ühendada, kuluks\n"
+"ära enda kaitsmine rünnakute eest tulemüüriga. Vaadake\n"
+"üksikasju, kuidas tulemüüri seadistada, \"Põhiteadmiste käsiraamatu\" "
+"vastavast peatükist.\n"
 "\n"
-" * \"%s\": kui soovite muuta alglaaduri seadistusi, vajutage\n"
+" * \"%s\": kui soovite muuta alglaaduri seadistusi, klõpsake\n"
 "sellele nupule. See on mõeldud siiski vaid kogenud kasutajatele.\n"
-"Täpsemat infot leiab käsiraamatust või Mandrakelinuxi juhtimiskeskuses.\n"
+"Täpsemat infot leiab käsiraamatust või Mandrakelinuxi juhtimiskeskusest.\n"
 "\n"
 " * \"%s\": saate täpselt kontrollida, millised teenused Teie\n"
-"masinal töötavad. Kui kavatsete kasutada oma masinat serverina, kuluks\n"
+"süsteemis töötavad. Kui kavatsete kasutada oma masinat serverina, kuluks\n"
 "ära seadistused üle vaadata."
 
-#: help.pm:855 install_steps_interactive.pm:978 standalone/drakclock:101
+#: help.pm:855 install_steps_interactive.pm:964 standalone/drakclock:100
 #, c-format
 msgid "Timezone"
 msgstr "Ajavöönd"
 
-#: help.pm:855 install_steps_interactive.pm:1052
+#: help.pm:855 install_steps_interactive.pm:1038
 #, c-format
 msgid "TV card"
 msgstr "TV kaart"
@@ -5540,32 +5596,33 @@ msgstr "ISDN kaart"
 msgid "Graphical Interface"
 msgstr "Graafiline kasutajaliides"
 
-#: help.pm:855 install_steps_interactive.pm:1070 standalone/drakbackup:2030
+#: help.pm:855 install_any.pm:1528 install_steps_interactive.pm:1056
+#: standalone/drakbackup:2036
 #, c-format
 msgid "Network"
 msgstr "Võrk"
 
-#: help.pm:855 install_steps_interactive.pm:1085
+#: help.pm:855 install_steps_interactive.pm:1071
 #, c-format
 msgid "Proxies"
-msgstr "Vahendajad"
+msgstr "Puhverserverid"
 
-#: help.pm:855 install_steps_interactive.pm:1096
+#: help.pm:855 install_steps_interactive.pm:1082
 #, c-format
 msgid "Security Level"
 msgstr "Turvatase"
 
-#: help.pm:855 install_steps_interactive.pm:1110
+#: help.pm:855 install_steps_interactive.pm:1096
 #, c-format
 msgid "Firewall"
 msgstr "Tulemüür"
 
-#: help.pm:855 install_steps_interactive.pm:1124
+#: help.pm:855 install_steps_interactive.pm:1110
 #, c-format
 msgid "Bootloader"
 msgstr "Alglaadur"
 
-#: help.pm:855 install_steps_interactive.pm:1137 services.pm:195
+#: help.pm:855 install_steps_interactive.pm:1123 services.pm:193
 #, c-format
 msgid "Services"
 msgstr "Teenused"
@@ -5612,7 +5669,7 @@ msgstr "<- Eelmine"
 #: install2.pm:117
 #, c-format
 msgid ""
-"Can't access kernel modules corresponding to your kernel (file %s is "
+"Can not access kernel modules corresponding to your kernel (file %s is "
 "missing), this generally means your boot floppy in not in sync with the "
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
@@ -5625,22 +5682,13 @@ msgstr ""
 msgid "You must also format %s"
 msgstr "Vormindada tuleb ka %s"
 
-#: install_any.pm:390
-#, c-format
-msgid ""
-"The following installation media have been found.\n"
-"If you want to skip some of them, you can unselect them now."
-msgstr ""
-"Leiti järgmised paigaldusandmekandjad.\n"
-"Kui Te ei soovi mõnda neist kasutada, eemaldage need valikust."
-
-#: install_any.pm:411
+#: install_any.pm:376
 #, c-format
 msgid "Do you have further supplementary media?"
 msgstr "Kas Teil on veel paigaldusandmekandjaid?"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:414
+#: install_any.pm:379
 #, c-format
 msgid ""
 "The following media have been found and will be used during install: %s.\n"
@@ -5651,59 +5699,84 @@ msgstr ""
 "Leiti järgmised andmekandjad, mida kasutatakse paigaldamisel: %s.\n"
 "\n"
 "\n"
-"Kas Teil on vaja veel paigaldusandmekandjaid seadistada?"
+"Kas Teil on veel paigaldusandmekandjaid, mida soovite kasutada?"
 
-#: install_any.pm:420 printer/printerdrake.pm:2652
-#: printer/printerdrake.pm:2659 standalone/scannerdrake:176
-#: standalone/scannerdrake:184 standalone/scannerdrake:235
-#: standalone/scannerdrake:242
+#: install_any.pm:388 printer/printerdrake.pm:2929
+#: printer/printerdrake.pm:2936 standalone/scannerdrake:182
+#: standalone/scannerdrake:190 standalone/scannerdrake:241
+#: standalone/scannerdrake:248
 #, c-format
 msgid "CD-ROM"
-msgstr "CD-ROM"
+msgstr "CD"
 
-#: install_any.pm:420
+#: install_any.pm:388
 #, c-format
 msgid "Network (http)"
 msgstr "Võrk (HTTP)"
 
-#: install_any.pm:420
+#: install_any.pm:388
 #, c-format
 msgid "Network (ftp)"
 msgstr "Võrk (FTP)"
 
-#: install_any.pm:464 standalone/drakbackup:112
+#: install_any.pm:436 standalone/drakbackup:112
 #, c-format
 msgid "No device found"
 msgstr "Ühtegi seadet ei leitud!"
 
-#: install_any.pm:468
+#: install_any.pm:440
 #, c-format
 msgid "Insert the CD"
 msgstr "Sisestage CD"
 
-#: install_any.pm:492
+#: install_any.pm:445
+#, c-format
+msgid "Unable to mount CD-ROM"
+msgstr "CD haakimine ebaõnnestus"
+
+#: install_any.pm:468
 #, c-format
 msgid "Insert the CD 1 again"
 msgstr "Sisestage CD 1 uuesti"
 
-#: install_any.pm:502 install_any.pm:506
+#: install_any.pm:478 install_any.pm:482
 #, c-format
 msgid "URL of the mirror?"
 msgstr "Peegli URL?"
 
-#: install_any.pm:532
+#: install_any.pm:515
+#, c-format
+msgid ""
+"Can't find a package list file on this mirror. Make sure the location is "
+"correct."
+msgstr ""
+"Tarkvara nimekirja sisaldava faili leidmine sellelt peeglilt ebaõnnestus. "
+"Kontrollige palun asukohta."
+
+#: install_any.pm:633
 #, c-format
-msgid "Can't find hdlist file on this mirror"
-msgstr "Hdlist-faili leidmine sellelt peeglilt ebaõnnestus"
+msgid ""
+"Change your Cd-Rom!\n"
+"Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
+"done."
+msgstr ""
+"Vahetage CD!\n"
+"\n"
+"Palun sisestage CD nimega \"%s\" CD-seadmesse ja klõpsake nupule \"Olgu\"."
+
+#: install_any.pm:652
+#, c-format
+msgid "Copying in progress"
+msgstr "Käib kopeerimine..."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:713
+#: install_any.pm:783
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
 "\n"
 "\n"
-"These servers are activated by default. They don't have any known security\n"
+"These servers are activated by default. They do not have any known security\n"
 "issues, but some new ones could be found. In that case, you must make sure\n"
 "to upgrade as soon as possible.\n"
 "\n"
@@ -5722,7 +5795,7 @@ msgstr ""
 "Kas tõesti paigaldada need serverid?\n"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: install_any.pm:736
+#: install_any.pm:806
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5735,36 +5808,22 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldada need paketid?\n"
 
-#: install_any.pm:1116
-#, c-format
-msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "Pange FAT-vormingus diskett seadmesse %s"
-
-#: install_any.pm:1120
-#, c-format
-msgid "This floppy is not FAT formatted"
-msgstr "See diskett ei ole FAT-vormingus"
-
-#: install_any.pm:1132
-#, c-format
-msgid ""
-"To use this saved packages selection, boot installation with ``linux "
-"defcfg=floppy''"
-msgstr ""
-"Selle paketivaliku kasutamiseks alustage paigaldamist käsuga \"linux "
-"defcfg=floppy\""
-
-#: install_any.pm:1160 partition_table.pm:595
+#: install_any.pm:1214 partition_table.pm:603
 #, c-format
 msgid "Error reading file %s"
 msgstr "Viga faili %s lugemisel"
 
-#: install_any.pm:1361
+#: install_any.pm:1425
 #, c-format
-msgid "%s (was %s)"
-msgstr "%s (oli %s)"
+msgid "The following disk(s) were renamed:"
+msgstr "Järgmistele ketastele anti uus nimi:"
 
-#: install_any.pm:1396
+#: install_any.pm:1427
+#, c-format
+msgid "%s (previously named as %s)"
+msgstr "%s (varem oli %s)"
+
+#: install_any.pm:1465
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5773,15 +5832,55 @@ msgstr ""
 "Tekkis viga: failisüsteemi loomiseks ei leitud ühtki seadet. Palun "
 "kontrollige oma riistvara."
 
-#: install_gtk.pm:160
+#: install_any.pm:1509
+#, c-format
+msgid "HTTP"
+msgstr "HTTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "FTP"
+msgstr "FTP"
+
+#: install_any.pm:1509
+#, c-format
+msgid "NFS"
+msgstr "NFS"
+
+#: install_any.pm:1532
+#, c-format
+msgid "Please choose a media"
+msgstr "Palun valige andmekandja"
+
+#: install_any.pm:1564
+#, c-format
+msgid "Bad media %s"
+msgstr "Vigane andmekandja %s"
+
+#: install_any.pm:1576
+#, c-format
+msgid "File already exists. Overwrite it?"
+msgstr "Fail on juba olemas. Kas kirjutada see üle?"
+
+#: install_any.pm:1627
+#, c-format
+msgid "Can not make screenshots before partitioning"
+msgstr "Ekraanipilte ei saa teha enne partitsioneerimist"
+
+#: install_any.pm:1634
+#, c-format
+msgid "Screenshots will be available after install in %s"
+msgstr "Ekraanipildid asuvad pärast paigaldamist asukohas %s"
+
+#: install_gtk.pm:136
 #, c-format
 msgid "System installation"
-msgstr "Süsteemi paigaldus"
+msgstr "Süsteemi paigaldamine"
 
-#: install_gtk.pm:163
+#: install_gtk.pm:139
 #, c-format
 msgid "System configuration"
-msgstr "Süsteemi seadistused"
+msgstr "Süsteemi seadistamine"
 
 #: install_interactive.pm:22
 #, c-format
@@ -5801,12 +5900,12 @@ msgid ""
 msgstr ""
 "Teil peab olema juurpartitsioon.\n"
 "Selleks looge uus partitsioon (või valige üks olemasolevatest).\n"
-"Siis valige tegevus \"Haakepunkt\" ja määrake see kui '/'"
+"Siis valige tegevus \"Haakepunkt\" ja määrake see kui \"/\""
 
 #: install_interactive.pm:67
 #, c-format
 msgid ""
-"You don't have a swap partition.\n"
+"You do not have a swap partition.\n"
 "\n"
 "Continue anyway?"
 msgstr ""
@@ -5893,8 +5992,8 @@ msgid ""
 "installation."
 msgstr ""
 "Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
-"alglaadimine, käivitage Windows ja seejärel utiliit 'defrag' ning tulge siis "
-"Mandrakelinuxi paigalduse juurde tagasi."
+"alglaadimine, käivitage Windows ja seejärel utiliit \"defrag\" ning tulge "
+"siis Mandrakelinuxi paigaldamise juurde tagasi."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_interactive.pm:166
@@ -5915,14 +6014,14 @@ msgstr ""
 "\n"
 "DrakX hakkab Teie Windowsi partitsiooni suurust muutma.\n"
 "Olge ettevaatlik: see operatsioon võib olla ohtlik Teie failidele.\n"
-"Palun käivitage enne seda, kui asute paigalduse juurde,\n"
+"Palun käivitage enne seda, kui asute paigaldamise juurde,\n"
 "Windowsis käsurealt \"chkdsk c:\" (arvestage, et graafilisest\n"
 "rakendusest \"scandisk\" ei piisa, seepärast kasutage\n"
 "kindlasti käsurealt käivitatavat \"chkdsk\"!).\n"
 "Lisaks sellele defragmenteerige ketas ja alles siis asuge\n"
-"taas paigalduse kallale. Kasulik oleks juba Windowsis\n"
+"taas paigaldamise kallale. Kasulik oleks juba Windowsis\n"
 "ka oma andmetest tagavarakoopia teha.\n"
-"Kui olete oma otsuses kindel, vajutage \"Olgu\"."
+"Kui olete oma otsuses kindel, klõpsake nupule \"Olgu\"."
 
 #: install_interactive.pm:178
 #, c-format
@@ -5973,15 +6072,15 @@ msgstr "Kasuta fdisk-i"
 #, c-format
 msgid ""
 "You can now partition %s.\n"
-"When you are done, don't forget to save using `w'"
+"When you are done, do not forget to save using `w'"
 msgstr ""
-"Nüüd saate partitsioneerida %s kõvaketta\n"
-"Kui olete valmis, salvestage käsuga 'w'"
+"Nüüd saate jagada %s kõvaketta\n"
+"Kui olete valmis, salvestage käsuga \"w\""
 
 #: install_interactive.pm:271
 #, c-format
-msgid "I can't find any room for installing"
-msgstr "Paigalduseks ei ole üldse ruumi"
+msgid "I can not find any room for installing"
+msgstr "Paigaldamiseks ei ole üldse ruumi"
 
 #: install_interactive.pm:275
 #, c-format
@@ -6303,7 +6402,8 @@ msgstr ""
 "\n"
 "Palun lugege hoolega järgnevat teksti. Kui Te ei ole nõus kõigi "
 "alljärgnevate\n"
-"väidetega, on paigaldamine järgmise CD pealt keelatud. Vajutage 'Keeldun',\n"
+"väidetega, on paigaldamine järgmise CD pealt keelatud. Klõpsake nupule "
+"\"Keeldun\",\n"
 "et jätkata paigaldamist ilma selle CD-ta.\n"
 "\n"
 "\n"
@@ -6358,8 +6458,8 @@ msgstr ""
 "%s\n"
 "\n"
 "\n"
-"Abi süsteemi edasiseks seadistamiseks saab eelkõige dokumendist\n"
-"\"Mandrakelinux User's Guide\"."
+"Abi süsteemi edasiseks seadistamiseks saab eelkõige\n"
+"Mandrakelinuxi kasutaja käsiraamatust."
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
 #: install_messages.pm:144
@@ -6372,19 +6472,19 @@ msgstr "http://www.mandrakelinux.com/en/101errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "Haakepunkt %s on määratud topelt"
 
-#: install_steps.pm:477
+#: install_steps.pm:479
 #, c-format
 msgid ""
-"Some important packages didn't get installed properly.\n"
+"Some important packages did not get installed properly.\n"
 "Either your cdrom drive or your cdrom is defective.\n"
 "Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm"
 "\"\n"
 msgstr ""
 "Mõned tähtsad paketid ei saanud korralikult paika.\n"
-"Teie CD-lugeja või CD on ilmselt vigane.\n"
+"Teie CD-seade või CD on ilmselt vigane.\n"
 "Paketifaile CD-l saate kontrollida käsuga \"rpm -qpl media/main/*.rpm\"\n"
 
-#: install_steps.pm:603
+#: install_steps.pm:599
 #, c-format
 msgid "No floppy drive available"
 msgstr "Disketiseade ei ole kättesaadav"
@@ -6392,9 +6492,9 @@ msgstr "Disketiseade ei ole kättesaadav"
 #: install_steps_auto_install.pm:76 install_steps_stdio.pm:27
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "Järgmine samm: '%s'\n"
+msgstr "Järgmine samm: %s\n"
 
-#: install_steps_gtk.pm:184
+#: install_steps_gtk.pm:177
 #, c-format
 msgid ""
 "Your system is low on resources. You may have some problem installing\n"
@@ -6403,96 +6503,97 @@ msgid ""
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
 "Teie süsteemil napib ressurse ja paigaldamine võib ebaõnnestuda.\n"
-"Kui nii juhtub, proovige palun tekstipõhist paigaldust. Selleks\n"
-"vajutage CDROMilt laadimisel F1 ja sisestage 'text'"
+"Kui nii juhtub, proovige palun tekstipõhist paigaldamist. Selleks\n"
+"vajutage CD-lt laadimisel F1 ja sisestage \"text\""
 
-#: install_steps_gtk.pm:235 install_steps_interactive.pm:628
+#: install_steps_gtk.pm:224 install_steps_interactive.pm:624
 #, c-format
 msgid "Package Group Selection"
 msgstr "Paketigruppide valik"
 
-#: install_steps_gtk.pm:264 install_steps_interactive.pm:567
+#: install_steps_gtk.pm:250 install_steps_interactive.pm:567
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Suurus kokku: %d / %d MB"
 
-#: install_steps_gtk.pm:309
+#: install_steps_gtk.pm:295
 #, c-format
 msgid "Bad package"
 msgstr "Vigane pakett"
 
-#: install_steps_gtk.pm:311
+#: install_steps_gtk.pm:297
 #, c-format
 msgid "Version: "
 msgstr "Versioon: "
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "Size: "
 msgstr "Suurus: "
 
-#: install_steps_gtk.pm:312
+#: install_steps_gtk.pm:298
 #, c-format
 msgid "%d KB\n"
 msgstr "%d KB\n"
 
-#: install_steps_gtk.pm:313
+#: install_steps_gtk.pm:299
 #, c-format
 msgid "Importance: "
 msgstr "Tähtsus: "
 
-#: install_steps_gtk.pm:346
+#: install_steps_gtk.pm:332
 #, c-format
-msgid "You can't select/unselect this package"
+msgid "You can not select/unselect this package"
 msgstr "Seda paketti ei saa valida/valimata jätta"
 
-#: install_steps_gtk.pm:350
+#: install_steps_gtk.pm:336
 #, c-format
 msgid "due to missing %s"
 msgstr "puuduva %s tõttu"
 
-#: install_steps_gtk.pm:351
+#: install_steps_gtk.pm:337
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "rahuldamata %s tõttu"
 
-#: install_steps_gtk.pm:352
+#: install_steps_gtk.pm:338
 #, c-format
 msgid "trying to promote %s"
 msgstr "püüan välja pakkuda %s"
 
-#: install_steps_gtk.pm:353
+#: install_steps_gtk.pm:339
 #, c-format
 msgid "in order to keep %s"
 msgstr "säilitamaks %s"
 
-#: install_steps_gtk.pm:358
+#: install_steps_gtk.pm:344
 #, c-format
 msgid ""
-"You can't select this package as there is not enough space left to install it"
-msgstr "Seda paketti ei saa valida, sest paigalduseks napib kettaruumi"
+"You can not select this package as there is not enough space left to install "
+"it"
+msgstr "Seda paketti ei saa valida, sest paigaldamiseks napib kettaruumi"
 
-#: install_steps_gtk.pm:361
+#: install_steps_gtk.pm:347
 #, c-format
 msgid "The following packages are going to be installed"
 msgstr "Paigaldamiseks on valitud järgmised paketid"
 
-#: install_steps_gtk.pm:362
+#: install_steps_gtk.pm:348
 #, c-format
 msgid "The following packages are going to be removed"
 msgstr "Eemaldamiseks on valitud järgmised paketid"
 
-#: install_steps_gtk.pm:386
+#: install_steps_gtk.pm:372
 #, c-format
-msgid "This is a mandatory package, it can't be unselected"
+msgid "This is a mandatory package, it can not be unselected"
 msgstr "See pakett on kohustuslik"
 
-#: install_steps_gtk.pm:388
+#: install_steps_gtk.pm:374
 #, c-format
-msgid "You can't unselect this package. It is already installed"
+msgid "You can not unselect this package. It is already installed"
 msgstr "See pakett on juba paigaldatud"
 
-#: install_steps_gtk.pm:391
+#: install_steps_gtk.pm:377
 #, c-format
 msgid ""
 "This package must be upgraded.\n"
@@ -6501,242 +6602,273 @@ msgstr ""
 "Selle paketi peaks uuendama.\n"
 "Olete kindel, et Te ei vali seda?"
 
-#: install_steps_gtk.pm:394
+#: install_steps_gtk.pm:380
 #, c-format
-msgid "You can't unselect this package. It must be upgraded"
+msgid "You can not unselect this package. It must be upgraded"
 msgstr "Selle paketi peate valima, sest selle uuendamine on kohustuslik"
 
-#: install_steps_gtk.pm:399
+#: install_steps_gtk.pm:385
 #, c-format
 msgid "Show automatically selected packages"
-msgstr "Näita automaatselt valitud pakette"
+msgstr "Automaatselt valitud pakettide näitamine"
 
-#: install_steps_gtk.pm:404
+#: install_steps_gtk.pm:390
 #, c-format
-msgid "Load/Save on floppy"
-msgstr "Laadi disketilt/Salvesta disketile"
+msgid "Load/Save selection"
+msgstr "Valiku laadimine/salvestamine"
 
-#: install_steps_gtk.pm:405
+#: install_steps_gtk.pm:391
 #, c-format
 msgid "Updating package selection"
 msgstr "Paketivaliku uuendamine"
 
-#: install_steps_gtk.pm:410
+#: install_steps_gtk.pm:396
 #, c-format
 msgid "Minimal install"
 msgstr "Minimaalne paigaldus"
 
-#: install_steps_gtk.pm:424 install_steps_interactive.pm:481
+#: install_steps_gtk.pm:410 install_steps_interactive.pm:483
 #, c-format
 msgid "Choose the packages you want to install"
 msgstr "Valige paketid, mida soovite paigaldada"
 
-#: install_steps_gtk.pm:440 install_steps_interactive.pm:720
+#: install_steps_gtk.pm:426 install_steps_interactive.pm:706
 #, c-format
 msgid "Installing"
 msgstr "Paigaldamine"
 
-#: install_steps_gtk.pm:447
+#: install_steps_gtk.pm:433
 #, c-format
 msgid "Estimating"
 msgstr "Oletan"
 
-#: install_steps_gtk.pm:453
+#: install_steps_gtk.pm:482
+#, c-format
+msgid "No details"
+msgstr "Üksikasjadeta"
+
+#: install_steps_gtk.pm:490
 #, c-format
 msgid "Time remaining "
 msgstr "Aega jäänud "
 
-#: install_steps_gtk.pm:464
+#: install_steps_gtk.pm:497
 #, c-format
 msgid "Please wait, preparing installation..."
-msgstr "Palun oodake, valmistun paigalduseks..."
-
-#: install_steps_gtk.pm:474
-#, c-format
-msgid "No details"
-msgstr "Üksikasjadeta"
+msgstr "Palun oodake, valmistutakse paigaldamiseks..."
 
-#: install_steps_gtk.pm:527
+#: install_steps_gtk.pm:512
 #, c-format
 msgid "%d packages"
 msgstr "%d paketti"
 
-#: install_steps_gtk.pm:532
+#: install_steps_gtk.pm:517
 #, c-format
 msgid "Installing package %s"
 msgstr "Paketi %s paigaldamine"
 
-#: install_steps_gtk.pm:567 install_steps_interactive.pm:94
-#: install_steps_interactive.pm:745
+#: install_steps_gtk.pm:552 install_steps_interactive.pm:92
+#: install_steps_interactive.pm:731
 #, c-format
 msgid "Refuse"
 msgstr "Keeldun"
 
-#: install_steps_gtk.pm:571 install_steps_interactive.pm:749
+#: install_steps_gtk.pm:556 install_steps_interactive.pm:735
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
 "Please insert the Cd-Rom labelled \"%s\" in your drive and press Ok when "
 "done.\n"
-"If you don't have it, press Cancel to avoid installation from this Cd-Rom."
+"If you do not have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
 "Vahetage CD!\n"
 "\n"
-"Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <Olgu>.\n"
-"Kui teil sellist ei ole, vajutage <Loobu>."
+"Palun sisestage CD nimega \"%s\" CD-seadmesse ja klõpsake nupule \"Olgu\".\n"
+"Kui teil sellist ei ole, klõpsake nupule \"Loobu\"."
 
-#: install_steps_gtk.pm:586 install_steps_interactive.pm:760
+#: install_steps_gtk.pm:571 install_steps_interactive.pm:746
 #, c-format
 msgid "There was an error ordering packages:"
 msgstr "Pakettide tellimisel tekkis viga:"
 
-#: install_steps_gtk.pm:586 install_steps_gtk.pm:590
-#: install_steps_interactive.pm:760 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:571 install_steps_gtk.pm:575
+#: install_steps_interactive.pm:746 install_steps_interactive.pm:750
 #, c-format
 msgid "Go on anyway?"
 msgstr "Kas ikkagi jätkata?"
 
-#: install_steps_gtk.pm:590 install_steps_interactive.pm:764
+#: install_steps_gtk.pm:575 install_steps_interactive.pm:750
 #, c-format
 msgid "There was an error installing packages:"
 msgstr "Pakettide paigaldamisel tekkis viga:"
 
-#: install_steps_gtk.pm:632 install_steps_interactive.pm:934
-#: install_steps_interactive.pm:1086
+#: install_steps_gtk.pm:617 install_steps_interactive.pm:920
+#: install_steps_interactive.pm:1072
 #, c-format
 msgid "not configured"
 msgstr "seadistamata"
 
-#: install_steps_interactive.pm:86
+#: install_steps_gtk.pm:680
 #, c-format
-msgid "Do you want to recover your system?"
-msgstr "Kas soovite süsteemi taastada?"
+msgid ""
+"The following installation media have been found.\n"
+"If you want to skip some of them, you can unselect them now."
+msgstr ""
+"Leiti järgmised paigaldusandmekandjad.\n"
+"Kui Te ei soovi mõnda neist kasutada, eemaldage need valikust."
 
-#: install_steps_interactive.pm:87
+#: install_steps_gtk.pm:684
+#, c-format
+msgid ""
+"You have the option to copy the contents of the CDs onto the hard drive "
+"before installation.\n"
+"It will then continue from the hard drive and the packages will remain "
+"available once the system is fully installed."
+msgstr ""
+"Teil on võimalik kopeerida CD-d enne paigaldamist kõvakettale.\n"
+"Seejärel jätkatakse paigaldamist kõvakettalt ning kogu tarkvara on seal "
+"kättesaadav ka pärast süsteemi paigaldamist."
+
+#: install_steps_gtk.pm:686
+#, c-format
+msgid "Copy whole CDs"
+msgstr "Kopeeri kõik CD-d"
+
+#: install_steps_interactive.pm:85
 #, c-format
 msgid "License agreement"
 msgstr "Lõppkasutaja litsentsileping"
 
-#: install_steps_interactive.pm:91
+#: install_steps_interactive.pm:89
 #, c-format
 msgid "Release Notes"
-msgstr "Väljalasketeade"
+msgstr "Info väljalaske kohta"
 
-#: install_steps_interactive.pm:121
+#: install_steps_interactive.pm:119
 #, c-format
 msgid "Please choose your keyboard layout."
 msgstr "Palun valige klaviatuuriasetus."
 
-#: install_steps_interactive.pm:123
+#: install_steps_interactive.pm:121
 #, c-format
 msgid "Here is the full list of available keyboards"
 msgstr "See on saadaolevate klaviatuuriasetuste täielik nimekiri"
 
-#: install_steps_interactive.pm:153
+#: install_steps_interactive.pm:151
 #, c-format
 msgid "Install/Upgrade"
-msgstr "Paigaldus/Uuendamine"
+msgstr "Paigaldamine/Uuendamine"
 
-#: install_steps_interactive.pm:154
+#: install_steps_interactive.pm:152
 #, c-format
 msgid "Is this an install or an upgrade?"
-msgstr "Kas see on paigaldus või uuendamine?"
+msgstr "Kas see on paigaldamine või uuendamine?"
 
-#: install_steps_interactive.pm:160
+#: install_steps_interactive.pm:158
 #, c-format
 msgid "Upgrade %s"
 msgstr "%s uuendus"
 
-#: install_steps_interactive.pm:170
+#: install_steps_interactive.pm:168
 #, c-format
 msgid "Encryption key for %s"
 msgstr "%s krüptovõti"
 
-#: install_steps_interactive.pm:187
+#: install_steps_interactive.pm:185
 #, c-format
 msgid "Please choose your type of mouse."
 msgstr "Palun valige hiire tüüp."
 
-#: install_steps_interactive.pm:196 standalone/mousedrake:46
+#: install_steps_interactive.pm:194 standalone/mousedrake:46
 #, c-format
 msgid "Mouse Port"
 msgstr "Hiire port"
 
-#: install_steps_interactive.pm:197 standalone/mousedrake:47
+#: install_steps_interactive.pm:195 standalone/mousedrake:47
 #, c-format
 msgid "Please choose which serial port your mouse is connected to."
 msgstr "Millisesse jadaporti on Teie hiir ühendatud?"
 
-#: install_steps_interactive.pm:207
+#: install_steps_interactive.pm:205
 #, c-format
 msgid "Buttons emulation"
 msgstr "Nuppude emuleerimine"
 
-#: install_steps_interactive.pm:209
+#: install_steps_interactive.pm:207
 #, c-format
 msgid "Button 2 Emulation"
 msgstr "Emuleeri 2. hiirenuppu"
 
-#: install_steps_interactive.pm:210
+#: install_steps_interactive.pm:208
 #, c-format
 msgid "Button 3 Emulation"
 msgstr "Emuleeri 3. hiirenuppu"
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: install_steps_interactive.pm:231
+#: install_steps_interactive.pm:229
 #, c-format
 msgid "Configuring PCMCIA cards..."
-msgstr "PCMCIA kaartide seadmine..."
+msgstr "PCMCIA kaartide seadistamine..."
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "IDE"
 msgstr "IDE"
 
-#: install_steps_interactive.pm:238
+#: install_steps_interactive.pm:236
 #, c-format
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: install_steps_interactive.pm:258 network/tools.pm:187
+#: install_steps_interactive.pm:256 network/tools.pm:172
 #, c-format
 msgid "No partition available"
 msgstr "Partitsioone ei leitud"
 
-#: install_steps_interactive.pm:261
+#: install_steps_interactive.pm:259
 #, c-format
 msgid "Scanning partitions to find mount points"
 msgstr "Partitsioonidelt haakepunktide otsimine"
 
-#: install_steps_interactive.pm:268
+#: install_steps_interactive.pm:266
 #, c-format
 msgid "Choose the mount points"
 msgstr "Valige haakepunktid"
 
-#: install_steps_interactive.pm:300
+#: install_steps_interactive.pm:312
 #, c-format
 msgid ""
 "No free space for 1MB bootstrap! Install will continue, but to boot your "
 "system, you'll need to create the bootstrap partition in DiskDrake"
 msgstr ""
-"Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldus jätkub, kuid süsteemi "
-"alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala"
+"Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldamine jätkub, kuid "
+"süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
+
+#: install_steps_interactive.pm:317
+#, c-format
+msgid ""
+"You'll need to create a PPC PReP Boot bootstrap! Install will continue, but "
+"to boot your system, you'll need to create the bootstrap partition in "
+"DiskDrake"
+msgstr ""
+"Teil tuleb luua PPC PReP Boot alglaadimisala! Paigaldamine jätkub, kuid "
+"süsteemi alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala."
 
-#: install_steps_interactive.pm:337
+#: install_steps_interactive.pm:353
 #, c-format
 msgid "Choose the partitions you want to format"
 msgstr "Valige partitsioonid, mida soovite vormindada"
 
-#: install_steps_interactive.pm:339
+#: install_steps_interactive.pm:355
 #, c-format
 msgid "Check bad blocks?"
 msgstr "Blokkide kontroll?"
 
-#: install_steps_interactive.pm:371
+#: install_steps_interactive.pm:383
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -6745,85 +6877,69 @@ msgstr ""
 "Failisüsteemi %s kontroll ebaõnnestus. Kas soovite vigu parandada? "
 "(Ettevaatust, võite kaotada andmed!)"
 
-#: install_steps_interactive.pm:374
+#: install_steps_interactive.pm:386
 #, c-format
 msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "Saaleala on paigalduseks liiga väike, palun suurendage seda"
+msgstr "Saaleala on paigaldamiseks liiga väike, palun suurendage seda"
 
-#: install_steps_interactive.pm:381
+#: install_steps_interactive.pm:393
 #, c-format
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "Saadaolevate pakettide otsimine ja rpm andmebaasi taasloomine..."
 
-#: install_steps_interactive.pm:382 install_steps_interactive.pm:442
+#: install_steps_interactive.pm:394 install_steps_interactive.pm:452
 #, c-format
 msgid "Looking for available packages..."
 msgstr "Saadaolevate pakettide otsimine..."
 
-#: install_steps_interactive.pm:385
+#: install_steps_interactive.pm:397
 #, c-format
 msgid "Looking at packages already installed..."
 msgstr "Juba paigaldatud pakettide tuvastamine..."
 
-#: install_steps_interactive.pm:389
+#: install_steps_interactive.pm:401
 #, c-format
 msgid "Finding packages to upgrade..."
 msgstr "Uuendatavate pakettide otsimine..."
 
-#: install_steps_interactive.pm:405 install_steps_interactive.pm:834
-#, c-format
-msgid ""
-"Contacting Mandrakelinux web site to get the list of available mirrors..."
-msgstr ""
-"Mandrakelinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
-
-#: install_steps_interactive.pm:411 install_steps_interactive.pm:839
+#: install_steps_interactive.pm:421 install_steps_interactive.pm:825
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
 
-#: install_steps_interactive.pm:451
+#: install_steps_interactive.pm:461
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
 "> %d)"
 msgstr ""
-"Teie kõvakettal ei ole piisavalt vaba ruumi paigalduseks või uuenduseks (%d "
-"> %d)"
+"Teie kõvakettal ei ole piisavalt vaba ruumi paigaldamiseks või uuendamiseks "
+"(%d > %d)"
 
-#: install_steps_interactive.pm:493
+#: install_steps_interactive.pm:495
 #, c-format
 msgid ""
-"Please choose load or save package selection on floppy.\n"
-"The format is the same as auto_install generated floppies."
+"Please choose load or save package selection.\n"
+"The format is the same as auto_install generated files."
 msgstr ""
-"Valige palun paketivaliku laadimine või salvestamine disketil(t).\n"
-"Vorming on sama, mis automaatpaigaldusega loodud diskettide puhul."
-
-#: install_steps_interactive.pm:495
-#, c-format
-msgid "Load from floppy"
-msgstr "Laadi disketilt"
+"Valige palun paketivaliku laadimine või salvestamine.\n"
+"Vorming on sama, mis automaatpaigaldusega loodud failide puhul."
 
-#: install_steps_interactive.pm:495
+#: install_steps_interactive.pm:497
 #, c-format
-msgid "Save on floppy"
-msgstr "Salvesta disketile"
+msgid "Load"
+msgstr "Laadi"
 
-#: install_steps_interactive.pm:499
+#: install_steps_interactive.pm:497 standalone/drakbackup:3924
+#: standalone/drakbackup:3997 standalone/logdrake:173
 #, c-format
-msgid "Package selection"
-msgstr "Pakettide valik"
-
-#: install_steps_interactive.pm:499
-#, c-format
-msgid "Loading from floppy"
-msgstr "Laadimine disketilt"
+msgid "Save"
+msgstr "Salvesta"
 
-#: install_steps_interactive.pm:504
+#: install_steps_interactive.pm:505
 #, c-format
-msgid "Insert a floppy containing package selection"
-msgstr "Sisestage palun paketivalikut sisaldav diskett"
+msgid "Bad file"
+msgstr "Vigane fail"
 
 #: install_steps_interactive.pm:581
 #, c-format
@@ -6833,12 +6949,12 @@ msgstr "Valiku suurus ületab saadaolevat kettaruumi"
 #: install_steps_interactive.pm:596
 #, c-format
 msgid "Type of install"
-msgstr "Paigalduse tüüp"
+msgstr "Paigaldamise tüüp"
 
 #: install_steps_interactive.pm:597
 #, c-format
 msgid ""
-"You haven't selected any group of packages.\n"
+"You have not selected any group of packages.\n"
 "Please choose the minimal installation you want:"
 msgstr ""
 "Te ei valinud ühtegi paketigruppi.\n"
@@ -6854,12 +6970,12 @@ msgstr "Baasdokumentatsiooniga (soovitatav!)"
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
 
-#: install_steps_interactive.pm:645 standalone/drakxtv:52
+#: install_steps_interactive.pm:641 standalone/drakxtv:52
 #, c-format
 msgid "All"
 msgstr "Kõik"
 
-#: install_steps_interactive.pm:694
+#: install_steps_interactive.pm:680
 #, c-format
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
@@ -6870,17 +6986,17 @@ msgstr ""
 "Kui Teil ei ole ühtki neist, klõpsake <Loobu>.\n"
 "Kui puuduvad mõned CD-d, märkige vaid olemasolevad ja siis <Olgu>."
 
-#: install_steps_interactive.pm:699
+#: install_steps_interactive.pm:685
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
-msgstr "CD pealdisega \"%s\""
+msgstr "CD nimega \"%s\""
 
-#: install_steps_interactive.pm:720
+#: install_steps_interactive.pm:706
 #, c-format
 msgid "Preparing installation"
-msgstr "Paigalduseks valmistumine"
+msgstr "Paigaldamiseks valmistumine"
 
-#: install_steps_interactive.pm:729
+#: install_steps_interactive.pm:715
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -6889,17 +7005,17 @@ msgstr ""
 "Paketi %s paigaldamine\n"
 "%d%%"
 
-#: install_steps_interactive.pm:778
+#: install_steps_interactive.pm:764
 #, c-format
 msgid "Post-install configuration"
-msgstr "Paigaldusjärgsed seadistused"
+msgstr "Paigaldamisjärgne seadistamine"
 
-#: install_steps_interactive.pm:784
+#: install_steps_interactive.pm:770
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Pange palun moodulite uuendamise diskett seadmesse %s"
 
-#: install_steps_interactive.pm:813
+#: install_steps_interactive.pm:799
 #, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
@@ -6919,183 +7035,170 @@ msgstr ""
 "\n"
 "Kas soovite uuendusi paigaldada?"
 
-#: install_steps_interactive.pm:853
+#: install_steps_interactive.pm:820
+#, c-format
+msgid ""
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
+msgstr ""
+"Mandrakelinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
+
+#: install_steps_interactive.pm:839
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Peeglilt pakettide nimekirja lugemine..."
 
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Ühendust peegliga %s ei saadud"
 
-#: install_steps_interactive.pm:857
+#: install_steps_interactive.pm:843
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Kas soovite uuesti proovida?"
 
-#: install_steps_interactive.pm:883 standalone/drakclock:46
+#: install_steps_interactive.pm:869 standalone/drakclock:45
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Millises ajavöötmes asute?"
 
-#: install_steps_interactive.pm:888
+#: install_steps_interactive.pm:874
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Aja automaatne sünkroniseerimine (NTP abil)"
 
-#: install_steps_interactive.pm:896
+#: install_steps_interactive.pm:882
 #, c-format
 msgid "NTP Server"
 msgstr "NTP server"
 
-#: install_steps_interactive.pm:938 steps.pm:30
+#: install_steps_interactive.pm:924 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: install_steps_interactive.pm:951 install_steps_interactive.pm:959
-#: install_steps_interactive.pm:977 install_steps_interactive.pm:984
-#: install_steps_interactive.pm:1136 services.pm:135
-#: standalone/drakbackup:1593
+#: install_steps_interactive.pm:937 install_steps_interactive.pm:945
+#: install_steps_interactive.pm:963 install_steps_interactive.pm:970
+#: install_steps_interactive.pm:1122 services.pm:133
+#: standalone/drakbackup:1599
 #, c-format
 msgid "System"
 msgstr "Süsteem"
 
-#: install_steps_interactive.pm:991 install_steps_interactive.pm:1018
-#: install_steps_interactive.pm:1035 install_steps_interactive.pm:1051
-#: install_steps_interactive.pm:1062
+#: install_steps_interactive.pm:977 install_steps_interactive.pm:1004
+#: install_steps_interactive.pm:1021 install_steps_interactive.pm:1037
+#: install_steps_interactive.pm:1048
 #, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: install_steps_interactive.pm:997 install_steps_interactive.pm:1006
+#: install_steps_interactive.pm:983 install_steps_interactive.pm:992
 #, c-format
 msgid "Remote CUPS server"
-msgstr "CUPS printserver"
+msgstr "CUPS-võrguserver"
 
-#: install_steps_interactive.pm:997
+#: install_steps_interactive.pm:983
 #, c-format
 msgid "No printer"
 msgstr "Printer puudub"
 
-#: install_steps_interactive.pm:1039
+#: install_steps_interactive.pm:1025
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Kas Teil on ISA helikaart?"
 
-#: install_steps_interactive.pm:1041
+#: install_steps_interactive.pm:1027
 #, c-format
 msgid ""
 "Run \"alsaconf\" or \"sndconfig\" after installation to configure your sound "
 "card"
 msgstr ""
-"Helikaardi seadistamiseks käivitage pärast paigaldust \"alsaconf\" või "
+"Helikaardi seadistamiseks käivitage pärast paigaldamist \"alsaconf\" või "
 "\"sndconfig\""
 
-#: install_steps_interactive.pm:1043
+#: install_steps_interactive.pm:1029
 #, c-format
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
-"Helikaarti ei leitud. Proovige see leida pärast paigaldust \"harddrake\" abil"
+"Helikaarti ei leitud. Proovige see leida pärast paigaldamist \"harddrake\" "
+"abil"
 
-#: install_steps_interactive.pm:1063
+#: install_steps_interactive.pm:1049
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafiline kasutajaliides"
 
-#: install_steps_interactive.pm:1069 install_steps_interactive.pm:1084
+#: install_steps_interactive.pm:1055 install_steps_interactive.pm:1070
 #, c-format
 msgid "Network & Internet"
 msgstr "Kohtvõrk ja Internet"
 
-#: install_steps_interactive.pm:1086
+#: install_steps_interactive.pm:1072
 #, c-format
 msgid "configured"
 msgstr "seadistatud"
 
-#: install_steps_interactive.pm:1095 install_steps_interactive.pm:1109
+#: install_steps_interactive.pm:1081 install_steps_interactive.pm:1095
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Turvalisus"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
 #, c-format
 msgid "activated"
 msgstr "aktiveeritud"
 
-#: install_steps_interactive.pm:1114
+#: install_steps_interactive.pm:1100
 #, c-format
 msgid "disabled"
 msgstr "keelatud"
 
-#: install_steps_interactive.pm:1123
+#: install_steps_interactive.pm:1109
 #, c-format
 msgid "Boot"
 msgstr "Alglaadimine"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1127
+#: install_steps_interactive.pm:1113
 #, c-format
 msgid "%s on %s"
 msgstr "%s asukohas %s"
 
-#: install_steps_interactive.pm:1141 services.pm:177
+#: install_steps_interactive.pm:1127 services.pm:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "Teenused: %d aktiveeritud, kokku %d"
 
-#: install_steps_interactive.pm:1151
+#: install_steps_interactive.pm:1137
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
-msgstr "Te ei ole seadistanud X-i. Kas Te tõesti ei taha seda teha?"
-
-#: install_steps_interactive.pm:1205
-#, c-format
-msgid "Set root password and network authentication methods"
-msgstr "Administraatori salasõna ja võrguautentimismeetodite määramine"
-
-#: install_steps_interactive.pm:1206
-#, c-format
-msgid "Set root password"
-msgstr "Juurkasutaja salasõna"
+msgstr "Te ei ole seadistanud X'i. Kas Te tõesti ei taha seda teha?"
 
 #: install_steps_interactive.pm:1217
 #, c-format
-msgid "This password is too short (it must be at least %d characters long)"
-msgstr "Salasõna on liiga lühike (peaks olema vähemalt %d tähemärki)"
-
-#: install_steps_interactive.pm:1222 network/netconnect.pm:596
-#: standalone/drakauth:25 standalone/drakauth:27 standalone/drakconnect:457
-#, c-format
-msgid "Authentication"
-msgstr "Autentimisviis"
-
-#: install_steps_interactive.pm:1254
-#, c-format
 msgid "Preparing bootloader..."
 msgstr "Alglaaduri ettevalmistamine..."
 
-#: install_steps_interactive.pm:1264
+#: install_steps_interactive.pm:1227
 #, c-format
 msgid ""
-"You appear to have an OldWorld or Unknown\n"
-" machine, the yaboot bootloader will not work for you.\n"
-"The install will continue, but you'll\n"
-" need to use BootX or some other means to boot your machine"
+"You appear to have an OldWorld or Unknown machine, the yaboot bootloader "
+"will not work for you. The install will continue, but you'll need to use "
+"BootX or some other means to boot your machine. The kernel argument for the "
+"root fs is: root=%s"
 msgstr ""
-"Paistab, et Teil on OldWorld-i või hoopis tundmatu\n"
-" masin, igatahes alglaadur yaboot siin ei tööta.\n"
-"Paigaldus küll jätkub, aga masina käivitamiseks\n"
-" tuleb Teil kasutada BootX-i või mingit muud nippi"
+"Paistab, et Teil on OldWorld-i või hoopis tundmatu masin, igatahes alglaadur "
+"yaboot siin ei tööta. Paigaldamine küll jätkub, aga masina käivitamiseks "
+"tuleb Teil kasutada BootX'i või mingit muud nippi. Kerneli argument "
+"juurfailisüsteemi jaoks on root=%s"
 
-#: install_steps_interactive.pm:1270
+#: install_steps_interactive.pm:1233
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Kas soovite kasutada aboot-i?"
 
-#: install_steps_interactive.pm:1273
+#: install_steps_interactive.pm:1236
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7104,7 +7207,7 @@ msgstr ""
 "Viga aboot-i paigaldamisel, \n"
 "kas sundida peale, riskides esimese partitsiooni hävinguga?"
 
-#: install_steps_interactive.pm:1294
+#: install_steps_interactive.pm:1257
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
@@ -7113,22 +7216,22 @@ msgstr ""
 "Sellel turvatasemel pääseb Windowsi partitsioonil asuvatele failidele ligi "
 "ainult administraator."
 
-#: install_steps_interactive.pm:1322 standalone/drakautoinst:76
+#: install_steps_interactive.pm:1286 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Pange palun tühi diskett seadmesse %s"
 
-#: install_steps_interactive.pm:1327
+#: install_steps_interactive.pm:1291
 #, c-format
 msgid "Please insert another floppy for drivers disk"
 msgstr "Pange palun draiverite jaoks seadmesse uus diskett"
 
-#: install_steps_interactive.pm:1329
+#: install_steps_interactive.pm:1293
 #, c-format
 msgid "Creating auto install floppy..."
 msgstr "Kiirpaigaldusdisketi loomine..."
 
-#: install_steps_interactive.pm:1341
+#: install_steps_interactive.pm:1305
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7139,12 +7242,12 @@ msgstr ""
 "\n"
 "Kas soovite tõesti praegu lõpetada ja väljuda?"
 
-#: install_steps_interactive.pm:1356
+#: install_steps_interactive.pm:1321
 #, c-format
 msgid "Generate auto install floppy"
 msgstr "Loo kiirpaigaldusdiskett"
 
-#: install_steps_interactive.pm:1358
+#: install_steps_interactive.pm:1323
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7153,10 +7256,10 @@ msgid ""
 "\n"
 "You may prefer to replay the installation.\n"
 msgstr ""
-"Automaatne paigaldus võib olla ka sedavõrd tegija,\n"
+"Automaatne paigaldamine võib olla ka sedavõrd tegija,\n"
 "et kasutab ära kogu kõvaketta !!\n"
 "\n"
-"Võite valida ka lihtsalt paigalduse kordamise.\n"
+"Võite valida ka lihtsalt paigaldamise kordamise.\n"
 
 #: install_steps_newt.pm:20
 #, c-format
@@ -7171,37 +7274,37 @@ msgid ""
 msgstr ""
 "  <Tab>/<Alt-Tab> väljade vahel  | <Space> valib | <F12> järgmine samm "
 
-#: interactive.pm:170
+#: interactive.pm:184
 #, c-format
 msgid "Choose a file"
 msgstr "Valige fail"
 
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakbackup:1534
-#: standalone/drakfont:592 standalone/drakfont:659 standalone/drakups:297
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakbackup:1540
+#: standalone/drakfont:593 standalone/drakfont:660 standalone/drakups:297
 #: standalone/drakups:357 standalone/drakups:377 standalone/drakvpn:333
 #: standalone/drakvpn:694
 #, c-format
 msgid "Add"
 msgstr "Lisa"
 
-#: interactive.pm:295 interactive/gtk.pm:482
+#: interactive.pm:309 interactive/gtk.pm:489
 #, c-format
 msgid "Modify"
 msgstr "Muuda"
 
-#: interactive.pm:295 interactive/gtk.pm:482 standalone/drakups:299
+#: interactive.pm:309 interactive/gtk.pm:489 standalone/drakups:299
 #: standalone/drakups:359 standalone/drakups:379 standalone/drakvpn:333
 #: standalone/drakvpn:694
 #, c-format
 msgid "Remove"
 msgstr "Eemalda"
 
-#: interactive.pm:372
+#: interactive.pm:386
 #, c-format
 msgid "Basic"
 msgstr "Põhiline"
 
-#: interactive.pm:403 interactive/newt.pm:317 ugtk2.pm:515
+#: interactive.pm:424 interactive/newt.pm:317 ugtk2.pm:506
 #, c-format
 msgid "Finish"
 msgstr "Lõpeta"
@@ -7233,12 +7336,12 @@ msgstr ""
 #: interactive/stdio.pm:70
 #, c-format
 msgid "Your choice? (0/1, default `%s') "
-msgstr "Teie valik? (0/1, vaikimisi '%s')"
+msgstr "Teie valik? (0/1, vaikimisi \"%s\")"
 
 #: interactive/stdio.pm:94
 #, c-format
 msgid "Button `%s': %s"
-msgstr "Nupp '%s': %s"
+msgstr "Nupp \"%s\": %s"
 
 #: interactive/stdio.pm:95
 #, c-format
@@ -7248,12 +7351,12 @@ msgstr "Kas soovite sellel nupul klõpsata?"
 #: interactive/stdio.pm:104
 #, c-format
 msgid "Your choice? (default `%s'%s) "
-msgstr "Teie valik? (vaikimisi '%s'%s)"
+msgstr "Teie valik? (vaikimisi \"%s\"%s)"
 
 #: interactive/stdio.pm:104
 #, c-format
 msgid " enter `void' for void entry"
-msgstr " kirjutage tühja kirje puhul 'void'"
+msgstr " kirjutage tühja kirje puhul \"void\""
 
 #: interactive/stdio.pm:122
 #, c-format
@@ -7277,7 +7380,7 @@ msgid ""
 "=> Notice, a label changed:\n"
 "%s"
 msgstr ""
-"=> Pange tähele, et pealdis on muutunud:\n"
+"=> Pange tähele, et nimi on muutunud:\n"
 "%s"
 
 #: interactive/stdio.pm:145
@@ -7285,765 +7388,870 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Uuestisaatmine"
 
-#: keyboard.pm:163 keyboard.pm:194
+#: keyboard.pm:170 keyboard.pm:204
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTZ)"
 msgstr "Tšehhi (QWERTZ)"
 
-#: keyboard.pm:164 keyboard.pm:196
+#: keyboard.pm:171 keyboard.pm:206
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German"
 msgstr "Saksa"
 
-#: keyboard.pm:165
+#: keyboard.pm:172
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak"
 msgstr "Dvorak"
 
-#: keyboard.pm:166 keyboard.pm:206
+#: keyboard.pm:173 keyboard.pm:223
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Spanish"
 msgstr "Hispaania"
 
-#: keyboard.pm:167 keyboard.pm:207
+#: keyboard.pm:174 keyboard.pm:224
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Finnish"
 msgstr "Soome"
 
-#: keyboard.pm:168 keyboard.pm:208
+#: keyboard.pm:175 keyboard.pm:227
 #, c-format
 msgid ""
 "_: keyboard\n"
 "French"
 msgstr "Prantsuse"
 
-#: keyboard.pm:169 keyboard.pm:254
+#: keyboard.pm:176 keyboard.pm:275
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Norwegian"
 msgstr "Norra"
 
-#: keyboard.pm:170
+#: keyboard.pm:177
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish"
 msgstr "Poola"
 
-#: keyboard.pm:171 keyboard.pm:264
+#: keyboard.pm:178 keyboard.pm:287
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian"
 msgstr "Vene"
 
-#: keyboard.pm:173 keyboard.pm:268
+#: keyboard.pm:180 keyboard.pm:293
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swedish"
 msgstr "Rootsi"
 
-#: keyboard.pm:174 keyboard.pm:287
+#: keyboard.pm:181 keyboard.pm:320
 #, c-format
 msgid "UK keyboard"
 msgstr "Briti"
 
-#: keyboard.pm:175 keyboard.pm:288
+#: keyboard.pm:182 keyboard.pm:323
 #, c-format
 msgid "US keyboard"
 msgstr "USA"
 
-#: keyboard.pm:177
+#: keyboard.pm:184
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Albanian"
 msgstr "Albaania"
 
-#: keyboard.pm:178
+#: keyboard.pm:185
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (old)"
 msgstr "Armeenia (vanem)"
 
-#: keyboard.pm:179
+#: keyboard.pm:186
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (typewriter)"
 msgstr "Armeenia (trükimasin)"
 
-#: keyboard.pm:180
+#: keyboard.pm:187
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Armenian (phonetic)"
 msgstr "Armeenia (foneetiline)"
 
-#: keyboard.pm:181
+#: keyboard.pm:188
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Arabic"
 msgstr "Araabia"
 
-#: keyboard.pm:182
+#: keyboard.pm:189
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Azerbaidjani (latin)"
 msgstr "Aserbaidžaani (ladina)"
 
-#: keyboard.pm:183
+#: keyboard.pm:190
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belgian"
 msgstr "Belgia"
 
-#: keyboard.pm:184
+#: keyboard.pm:191
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Bengali"
-msgstr "Bengali"
+"Bengali (Inscript-layout)"
+msgstr "Bengali (Inscript asetus)"
 
-#: keyboard.pm:185
+#: keyboard.pm:192
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Bengali (Probhat)"
+msgstr "Bengali (Probhat asetus)"
+
+#: keyboard.pm:193
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (phonetic)"
 msgstr "Bulgaaria (foneetiline)"
 
-#: keyboard.pm:186
+#: keyboard.pm:194
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bulgarian (BDS)"
 msgstr "Bulgaaria (BDS)"
 
-#: keyboard.pm:187
+#: keyboard.pm:195
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Brazilian (ABNT-2)"
 msgstr "Brasiilia (ABNT-2)"
 
-#: keyboard.pm:188
+#: keyboard.pm:196
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Bosnian"
 msgstr "Bosnia"
 
-#: keyboard.pm:189
+#: keyboard.pm:197
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Belarusian"
 msgstr "Valgevene"
 
-#: keyboard.pm:191
+#: keyboard.pm:199
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (German layout)"
 msgstr "Šveitsi (Saksa asetus)"
 
-#: keyboard.pm:193
+#: keyboard.pm:201
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Swiss (French layout)"
 msgstr "Šveitsi (Prantsuse asetus)"
 
-#: keyboard.pm:195
+#: keyboard.pm:203
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Cherokee syllabics"
+msgstr "Šerokii silpkiri"
+
+#: keyboard.pm:205
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Czech (QWERTY)"
 msgstr "Tšehhi (QWERTY)"
 
-#: keyboard.pm:197
+#: keyboard.pm:207
 #, c-format
 msgid ""
 "_: keyboard\n"
 "German (no dead keys)"
 msgstr "Saksa (ilma sammuta)"
 
-#: keyboard.pm:198
+#: keyboard.pm:208
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Devanagari"
 msgstr "Devanaagari"
 
-#: keyboard.pm:199
+#: keyboard.pm:209
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Danish"
 msgstr "Taani"
 
-#: keyboard.pm:200
+#: keyboard.pm:210
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: keyboard.pm:201
+#: keyboard.pm:212
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Esperanto)"
 msgstr "Dvorak (Esperanto)"
 
-#: keyboard.pm:202
+#: keyboard.pm:214
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (French)"
+msgstr "Dvorak (Prantsuse)"
+
+#: keyboard.pm:216
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (UK)"
+msgstr "Dvorak (Briti)"
+
+#: keyboard.pm:217
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Norwegian)"
 msgstr "Dvorak (Norra)"
 
-#: keyboard.pm:203
+#: keyboard.pm:219
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dvorak (Polish)"
+msgstr "Dvorak (Poola)"
+
+#: keyboard.pm:220
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dvorak (Swedish)"
 msgstr "Dvorak (Rootsi)"
 
-#: keyboard.pm:205
+#: keyboard.pm:221
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Dzongkha/Tibetan"
+msgstr "Dzongkha/tiibeti"
+
+#: keyboard.pm:222
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Estonian"
 msgstr "Eesti"
 
-#: keyboard.pm:209
+#: keyboard.pm:226
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Faroese"
+msgstr "Fääri"
+
+#: keyboard.pm:228
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Russian\" layout)"
 msgstr "Gruusia (\"vene\" asetus)"
 
-#: keyboard.pm:210
+#: keyboard.pm:229
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Georgian (\"Latin\" layout)"
 msgstr "Gruusia (\"ladina\" asetus)"
 
-#: keyboard.pm:211
+#: keyboard.pm:230
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek"
 msgstr "Kreeka"
 
-#: keyboard.pm:212
+#: keyboard.pm:231
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Greek (polytonic)"
 msgstr "Kreeka (polütoonne)"
 
-#: keyboard.pm:213
+#: keyboard.pm:232
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gujarati"
 msgstr "Gudžarati"
 
-#: keyboard.pm:214
+#: keyboard.pm:233
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: keyboard.pm:216
+#: keyboard.pm:235
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Hungarian"
 msgstr "Ungari"
 
-#: keyboard.pm:217
+#: keyboard.pm:236
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Croatian"
 msgstr "Horvaadi"
 
-#: keyboard.pm:218
+#: keyboard.pm:237
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Irish"
 msgstr "Iiri"
 
-#: keyboard.pm:219
+#: keyboard.pm:238
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli"
 msgstr "Iisraeli"
 
-#: keyboard.pm:220
+#: keyboard.pm:239
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Israeli (phonetic)"
 msgstr "Iisraeli (foneetiline)"
 
-#: keyboard.pm:221
+#: keyboard.pm:240
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Iranian"
 msgstr "Iraani"
 
-#: keyboard.pm:222
+#: keyboard.pm:241
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Icelandic"
 msgstr "Islandi"
 
-#: keyboard.pm:223
+#: keyboard.pm:242
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Italian"
 msgstr "Itaalia"
 
-#: keyboard.pm:224
+#: keyboard.pm:243
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Inuktitut"
 msgstr "Inuktituti"
 
-#: keyboard.pm:229
+#: keyboard.pm:248
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Japanese 106 keys"
 msgstr "Jaapani 106 klahviga"
 
-#: keyboard.pm:230
+#: keyboard.pm:249
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kannada"
 msgstr "Kannada"
 
-#: keyboard.pm:233
+#: keyboard.pm:252
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Korean"
 msgstr "Korea"
 
-#: keyboard.pm:234
+#: keyboard.pm:254
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Kurdish (arabic script)"
+msgstr "Kurdi (araabia kiri)"
+
+#: keyboard.pm:255
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Kyrgyz"
 msgstr "Kirgiisi"
 
-#: keyboard.pm:235
+#: keyboard.pm:256
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latin American"
 msgstr "Ladina-Ameerika"
 
-#: keyboard.pm:236
+#: keyboard.pm:257
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Laotian"
 msgstr "Laose"
 
-#: keyboard.pm:238
+#: keyboard.pm:259
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (old)"
 msgstr "Leedu AZERTY (vanem)"
 
-#: keyboard.pm:241
+#: keyboard.pm:262
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian AZERTY (new)"
 msgstr "Leedu AZERTY (uuem)"
 
-#: keyboard.pm:243
+#: keyboard.pm:264
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"number row\" QWERTY"
 msgstr "Leedu \"numbrireaga\" QWERTY"
 
-#: keyboard.pm:245
+#: keyboard.pm:266
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Lithuanian \"phonetic\" QWERTY"
 msgstr "Leedu \"foneetiline\" QWERTY"
 
-#: keyboard.pm:246
+#: keyboard.pm:267
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Latvian"
 msgstr "Läti"
 
-#: keyboard.pm:247
+#: keyboard.pm:268
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Malayalam"
 msgstr "Malajalami"
 
-#: keyboard.pm:248
+#: keyboard.pm:269
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Macedonian"
 msgstr "Makedoonia"
 
-#: keyboard.pm:249
+#: keyboard.pm:270
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Myanmar (Burmese)"
 msgstr "Myanmari (Birma)"
 
-#: keyboard.pm:250
+#: keyboard.pm:271
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Mongolian (cyrillic)"
 msgstr "Mongoli (kirillitsa)"
 
-#: keyboard.pm:251
+#: keyboard.pm:272
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (UK)"
 msgstr "Malta (briti)"
 
-#: keyboard.pm:252
+#: keyboard.pm:273
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Maltese (US)"
 msgstr "Malta (USA)"
 
-#: keyboard.pm:253
+#: keyboard.pm:274
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Dutch"
 msgstr "Hollandi"
 
-#: keyboard.pm:255
+#: keyboard.pm:276
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Oriya"
 msgstr "Oria"
 
-#: keyboard.pm:256
+#: keyboard.pm:277
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwerty layout)"
 msgstr "Poola (QWERTY)"
 
-#: keyboard.pm:257
+#: keyboard.pm:278
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Polish (qwertz layout)"
 msgstr "Poola (QWERTZ)"
 
-#: keyboard.pm:258
+#: keyboard.pm:280
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Pashto"
+msgstr "Puštu"
+
+#: keyboard.pm:281
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Portuguese"
 msgstr "Portugali"
 
-#: keyboard.pm:260
+#: keyboard.pm:283
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: keyboard.pm:262
+#: keyboard.pm:285
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwertz)"
 msgstr "Rumeenia (QWERTZ)"
 
-#: keyboard.pm:263
+#: keyboard.pm:286
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Romanian (qwerty)"
 msgstr "Rumeenia (QWERTY)"
 
-#: keyboard.pm:265
+#: keyboard.pm:288
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Russian (phonetic)"
 msgstr "Vene (foneetiline)"
 
-#: keyboard.pm:266
+#: keyboard.pm:289
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (norwegian)"
 msgstr "Saami (Norra)"
 
-#: keyboard.pm:267
+#: keyboard.pm:290
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Saami (swedish/finnish)"
 msgstr "Saami (Rootsi/Soome)"
 
-#: keyboard.pm:269
+#: keyboard.pm:292
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Sindhi"
+msgstr "Sindhi"
+
+#: keyboard.pm:294
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovenian"
 msgstr "Sloveenia"
 
-#: keyboard.pm:270
+#: keyboard.pm:295
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTZ)"
 msgstr "Slovaki (QWERTZ)"
 
-#: keyboard.pm:271
+#: keyboard.pm:296
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Slovakian (QWERTY)"
 msgstr "Slovaki (QWERTY)"
 
-#: keyboard.pm:273
+#: keyboard.pm:298
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Serbian (cyrillic)"
 msgstr "Serbia (kirillitsa)"
 
-#: keyboard.pm:274
+#: keyboard.pm:299
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac"
 msgstr "Süüria"
 
-#: keyboard.pm:275
+#: keyboard.pm:300
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Syriac (phonetic)"
 msgstr "Süüria (foneetiline)"
 
-#: keyboard.pm:276
+#: keyboard.pm:301
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Telugu"
 msgstr "Telugu"
 
-#: keyboard.pm:278
+#: keyboard.pm:303
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (ISCII-layout)"
 msgstr "Tamili (ISCII)"
 
-#: keyboard.pm:279
+#: keyboard.pm:304
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tamil (Typewriter-layout)"
 msgstr "Tamili (kirjutusmasin)"
 
-#: keyboard.pm:280
+#: keyboard.pm:305
 #, c-format
 msgid ""
 "_: keyboard\n"
-"Thai"
-msgstr "Tai"
+"Thai (Kedmanee)"
+msgstr "Tai (Kedmanee)"
 
-#: keyboard.pm:282
+#: keyboard.pm:306
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (TIS-820)"
+msgstr "Tai (TIS-820)"
+
+#: keyboard.pm:308
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Thai (Pattachote)"
+msgstr "Tai (Pattachote)"
+
+#: keyboard.pm:311
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Tifinagh (+latin/arabic)"
+msgstr "Tifinaghi (+ladina/araabia)"
+
+#: keyboard.pm:313
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Tajik"
 msgstr "Tadžiki"
 
-#: keyboard.pm:283
+#: keyboard.pm:315
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Turkmen"
+msgstr "Türkmeeni"
+
+#: keyboard.pm:316
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (traditional \"F\" model)"
 msgstr "Türgi (traditsiooniline \"F\" mudel)"
 
-#: keyboard.pm:284
+#: keyboard.pm:317
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Turkish (modern \"Q\" model)"
 msgstr "Türgi (modernne \"Q\" mudel)"
 
-#: keyboard.pm:286
+#: keyboard.pm:319
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Ukrainian"
 msgstr "Ukraina"
 
-#: keyboard.pm:289
+#: keyboard.pm:322
+#, c-format
+msgid ""
+"_: keyboard\n"
+"Urdu keyboard"
+msgstr "Urdu"
+
+#: keyboard.pm:324
 #, c-format
 msgid "US keyboard (international)"
 msgstr "USA (rahvusvaheline)"
 
-#: keyboard.pm:290
+#: keyboard.pm:325
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Uzbek (cyrillic)"
 msgstr "Usbeki (kirillitsa)"
 
-#: keyboard.pm:292
+#: keyboard.pm:327
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnami \"numbrireaga\" QWERTY"
 
-#: keyboard.pm:293
+#: keyboard.pm:328
 #, c-format
 msgid ""
 "_: keyboard\n"
 "Yugoslavian (latin)"
 msgstr "Jugoslaavia (ladina)"
 
-#: keyboard.pm:300
+#: keyboard.pm:335
 #, c-format
 msgid "Right Alt key"
 msgstr "Parempoolne Alt-klahv"
 
-#: keyboard.pm:301
+#: keyboard.pm:336
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Mõlemad Shift-klahvid korraga"
 
-#: keyboard.pm:302
+#: keyboard.pm:337
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl- ja Shift-klahvid korraga"
 
-#: keyboard.pm:303
+#: keyboard.pm:338
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock-klahv"
 
-#: keyboard.pm:304
+#: keyboard.pm:339
 #, c-format
 msgid "Shift and CapsLock keys simultaneously"
 msgstr "Shift- ja CapsLock-klahvid korraga"
 
-#: keyboard.pm:305
+#: keyboard.pm:340
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- ja Alt-klahvid korraga"
 
-#: keyboard.pm:306
+#: keyboard.pm:341
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt- ja Shift-klahvid korraga"
 
-#: keyboard.pm:307
+#: keyboard.pm:342
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menüü\"-klahv"
 
-#: keyboard.pm:308
+#: keyboard.pm:343
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Vasakpoolne \"Windows\"-klahv"
 
-#: keyboard.pm:309
+#: keyboard.pm:344
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Parempoolne \"Windows\"-klahv"
 
-#: keyboard.pm:310
+#: keyboard.pm:345
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Mõlemad Ctrl-klahvid korraga"
 
-#: keyboard.pm:311
+#: keyboard.pm:346
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Mõlemad Alt-klahvid korraga"
 
-#: keyboard.pm:312
+#: keyboard.pm:347
 #, c-format
 msgid "Left Shift key"
 msgstr "Vasakpoolne Shift-klahv"
 
-#: keyboard.pm:313
+#: keyboard.pm:348
 #, c-format
 msgid "Right Shift key"
 msgstr "Parempoolne Shift-klahv"
 
-#: keyboard.pm:314
+#: keyboard.pm:349
 #, c-format
 msgid "Left Alt key"
 msgstr "Vasakpoolne Alt-klahv"
 
-#: keyboard.pm:315
+#: keyboard.pm:350
 #, c-format
 msgid "Left Control key"
 msgstr "Vasakpoolne Ctrl-klahv"
 
-#: keyboard.pm:316
+#: keyboard.pm:351
 #, c-format
 msgid "Right Control key"
 msgstr "Parempoolne Ctrl-klahv"
 
-#: keyboard.pm:347
+#: keyboard.pm:387
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -8053,1179 +8261,1159 @@ msgstr ""
 "Siin saab valida klahvi või klahvikombinatsiooni, mis laseb\n"
 "vahetada klaviatuuri (nt. ladina ja mitte-ladina tähestikuga)"
 
-#: keyboard.pm:352
+#: keyboard.pm:392
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
 "During installation, you will need to use the Right Control\n"
 "key to switch between the different keyboard layouts."
 msgstr ""
-"See aktiveeritakse pärast paigaldust.\n"
-"Paigalduse ajal tuleb erinevate klaviatuuripaigutuste\n"
+"See aktiveeritakse pärast paigaldamist.\n"
+"Paigaldamise ajal tuleb erinevate klaviatuuripaigutuste\n"
 "vahel liikumiseks kasutada parempoolset Ctrl-klahvi."
 
 #. -PO: the string "default:LTR" can be translated *ONLY* as "default:LTR"
 #. -PO: or as "default:RTL", depending if your language is written from
 #. -PO: left to right, or from right to left; any other string is wrong.
-#: lang.pm:165
+#: lang.pm:173
 #, c-format
 msgid "default:LTR"
 msgstr "default:LTR"
 
-#: lang.pm:182
+#: lang.pm:190
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:183
+#: lang.pm:191 network/adsl_consts.pm:826
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Araabia Ühendemiraadid"
 
-#: lang.pm:184
+#: lang.pm:192
 #, c-format
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: lang.pm:185
+#: lang.pm:193
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: lang.pm:186
+#: lang.pm:194
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:187
+#: lang.pm:195
 #, c-format
 msgid "Albania"
 msgstr "Albaania"
 
-#: lang.pm:188
+#: lang.pm:196
 #, c-format
 msgid "Armenia"
 msgstr "Armeenia"
 
-#: lang.pm:189
+#: lang.pm:197
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
-#: lang.pm:190
+#: lang.pm:198
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:191
+#: lang.pm:199
 #, c-format
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: lang.pm:192 network/adsl_consts.pm:28 standalone/drakxtv:50
+#: lang.pm:200 network/adsl_consts.pm:40 standalone/drakxtv:50
 #, c-format
 msgid "Argentina"
 msgstr "Argentina"
 
-#: lang.pm:193
+#: lang.pm:201
 #, c-format
 msgid "American Samoa"
 msgstr "Ameerika Samoa"
 
-#: lang.pm:195 standalone/drakxtv:48
+#: lang.pm:203 standalone/drakxtv:48
 #, c-format
 msgid "Australia"
 msgstr "Austraalia"
 
-#: lang.pm:196
+#: lang.pm:204
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:197
+#: lang.pm:205
 #, c-format
 msgid "Azerbaijan"
 msgstr "Aserbaidžaan"
 
-#: lang.pm:198
+#: lang.pm:206
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia ja Hertsegoviina"
 
-#: lang.pm:199
+#: lang.pm:207
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:200
+#: lang.pm:208
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:202
+#: lang.pm:210
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:203 network/adsl_consts.pm:126 network/adsl_consts.pm:134
+#: lang.pm:211 network/adsl_consts.pm:143 network/adsl_consts.pm:151
 #, c-format
 msgid "Bulgaria"
 msgstr "Bulgaaria"
 
-#: lang.pm:204
+#: lang.pm:212
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: lang.pm:205
+#: lang.pm:213
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:206
+#: lang.pm:214
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:207
+#: lang.pm:215
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:208
+#: lang.pm:216
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: lang.pm:209
+#: lang.pm:217
 #, c-format
 msgid "Bolivia"
 msgstr "Boliivia"
 
-#: lang.pm:210 network/adsl_consts.pm:92 network/adsl_consts.pm:102
-#: network/adsl_consts.pm:110 network/adsl_consts.pm:118
+#: lang.pm:218 network/adsl_consts.pm:109 network/adsl_consts.pm:119
+#: network/adsl_consts.pm:127 network/adsl_consts.pm:135
 #, c-format
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: lang.pm:211
+#: lang.pm:219
 #, c-format
 msgid "Bahamas"
 msgstr "Bahama saared"
 
-#: lang.pm:212
+#: lang.pm:220
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:213
+#: lang.pm:221
 #, c-format
 msgid "Bouvet Island"
 msgstr "Bouvet' saar"
 
-#: lang.pm:214
+#: lang.pm:222
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:215
+#: lang.pm:223
 #, c-format
 msgid "Belarus"
 msgstr "Valgevene"
 
-#: lang.pm:216
+#: lang.pm:224
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:217
+#: lang.pm:225
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: lang.pm:218
+#: lang.pm:226
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookosesaared"
 
-#: lang.pm:219
+#: lang.pm:227
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Kongo (Kinshasa)"
 
-#: lang.pm:220
+#: lang.pm:228
 #, c-format
 msgid "Central African Republic"
 msgstr "Kesk-Aafrika Vabariik"
 
-#: lang.pm:221
+#: lang.pm:229
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Kongo (Brazzaville)"
 
-#: lang.pm:222 network/adsl_consts.pm:568 network/adsl_consts.pm:575
-#, c-format
-msgid "Switzerland"
-msgstr "Šveits"
-
-#: lang.pm:223
+#: lang.pm:231
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: lang.pm:224
+#: lang.pm:232
 #, c-format
 msgid "Cook Islands"
 msgstr "Cooki saared"
 
-#: lang.pm:225
+#: lang.pm:233
 #, c-format
 msgid "Chile"
 msgstr "Tšiili"
 
-#: lang.pm:226
+#: lang.pm:234
 #, c-format
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: lang.pm:227 network/adsl_consts.pm:142 network/adsl_consts.pm:150
-#: network/adsl_consts.pm:158 network/adsl_consts.pm:166
-#: network/adsl_consts.pm:174 network/adsl_consts.pm:182
-#: network/adsl_consts.pm:190 network/adsl_consts.pm:198
-#: network/adsl_consts.pm:206 network/adsl_consts.pm:214
-#: network/adsl_consts.pm:222 network/adsl_consts.pm:230
-#: network/adsl_consts.pm:238 network/adsl_consts.pm:246
-#: network/adsl_consts.pm:254 network/adsl_consts.pm:262
-#: network/adsl_consts.pm:270 network/adsl_consts.pm:278
-#: network/adsl_consts.pm:286 network/adsl_consts.pm:294
+#: lang.pm:235 network/adsl_consts.pm:159 network/adsl_consts.pm:167
+#: network/adsl_consts.pm:175 network/adsl_consts.pm:183
+#: network/adsl_consts.pm:191 network/adsl_consts.pm:199
+#: network/adsl_consts.pm:207 network/adsl_consts.pm:215
+#: network/adsl_consts.pm:223 network/adsl_consts.pm:231
+#: network/adsl_consts.pm:239 network/adsl_consts.pm:247
+#: network/adsl_consts.pm:255 network/adsl_consts.pm:263
+#: network/adsl_consts.pm:271 network/adsl_consts.pm:279
+#: network/adsl_consts.pm:287 network/adsl_consts.pm:295
+#: network/adsl_consts.pm:303 network/adsl_consts.pm:311
 #, c-format
 msgid "China"
 msgstr "Hiina"
 
-#: lang.pm:228
+#: lang.pm:236
 #, c-format
 msgid "Colombia"
 msgstr "Colombia"
 
-#: lang.pm:230
+#: lang.pm:238
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr "Serbia ja Tšernogooria"
 
-#: lang.pm:231
+#: lang.pm:239
 #, c-format
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: lang.pm:232
+#: lang.pm:240
 #, c-format
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: lang.pm:233
+#: lang.pm:241
 #, c-format
 msgid "Christmas Island"
 msgstr "Jõulusaar"
 
-#: lang.pm:234
+#: lang.pm:242
 #, c-format
 msgid "Cyprus"
 msgstr "Küpros"
 
-#: lang.pm:237
+#: lang.pm:245
 #, c-format
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:238 network/adsl_consts.pm:302
+#: lang.pm:246 network/adsl_consts.pm:327
 #, c-format
 msgid "Denmark"
 msgstr "Taani"
 
-#: lang.pm:239
+#: lang.pm:247
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:240
+#: lang.pm:248
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominikaani Vabariik"
 
-#: lang.pm:241
+#: lang.pm:249 network/adsl_consts.pm:30
 #, c-format
 msgid "Algeria"
 msgstr "Alžeeria"
 
-#: lang.pm:242
+#: lang.pm:250
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:243
+#: lang.pm:251
 #, c-format
 msgid "Estonia"
 msgstr "Eesti"
 
-#: lang.pm:244
+#: lang.pm:252
 #, c-format
 msgid "Egypt"
 msgstr "Egiptus"
 
-#: lang.pm:245
+#: lang.pm:253
 #, c-format
 msgid "Western Sahara"
 msgstr "Lääne-Sahara"
 
-#: lang.pm:246
+#: lang.pm:254
 #, c-format
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: lang.pm:247 network/adsl_consts.pm:531 network/adsl_consts.pm:540
-#: network/adsl_consts.pm:551
+#: lang.pm:255 network/adsl_consts.pm:663 network/adsl_consts.pm:672
+#: network/adsl_consts.pm:682 network/adsl_consts.pm:692
+#: network/adsl_consts.pm:700 network/adsl_consts.pm:708
+#: network/adsl_consts.pm:716 network/adsl_consts.pm:724
+#: network/adsl_consts.pm:732 network/adsl_consts.pm:740
+#: network/adsl_consts.pm:748 network/adsl_consts.pm:756
+#: network/adsl_consts.pm:764
 #, c-format
 msgid "Spain"
 msgstr "Hispaania"
 
-#: lang.pm:248
+#: lang.pm:256
 #, c-format
 msgid "Ethiopia"
 msgstr "Etioopia"
 
-#: lang.pm:249 network/adsl_consts.pm:402
+#: lang.pm:257 network/adsl_consts.pm:335
 #, c-format
 msgid "Finland"
 msgstr "Soome"
 
-#: lang.pm:250
+#: lang.pm:258
 #, c-format
 msgid "Fiji"
 msgstr "Fidži"
 
-#: lang.pm:251
+#: lang.pm:259
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandi saared (Malviinid)"
 
-#: lang.pm:252
+#: lang.pm:260
 #, c-format
 msgid "Micronesia"
 msgstr "Mikroneesia"
 
-#: lang.pm:253
+#: lang.pm:261
 #, c-format
 msgid "Faroe Islands"
 msgstr "Fääri saared"
 
-#: lang.pm:255
+#: lang.pm:263
 #, c-format
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:256 network/adsl_consts.pm:593 network/adsl_consts.pm:601
+#: lang.pm:264 network/adsl_consts.pm:836 network/adsl_consts.pm:846
 #: network/netconnect.pm:52
 #, c-format
 msgid "United Kingdom"
 msgstr "Suurbritannia"
 
-#: lang.pm:257
+#: lang.pm:265
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:258
+#: lang.pm:266
 #, c-format
 msgid "Georgia"
 msgstr "Gruusia"
 
-#: lang.pm:259
+#: lang.pm:267
 #, c-format
 msgid "French Guiana"
 msgstr "Prantsuse Guajaana"
 
-#: lang.pm:260
+#: lang.pm:268
 #, c-format
 msgid "Ghana"
 msgstr "Ghana"
 
-#: lang.pm:261
+#: lang.pm:269
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:262
+#: lang.pm:270
 #, c-format
 msgid "Greenland"
 msgstr "Gröönimaa"
 
-#: lang.pm:263
+#: lang.pm:271
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:264
+#: lang.pm:272
 #, c-format
 msgid "Guinea"
 msgstr "Guinea"
 
-#: lang.pm:265
+#: lang.pm:273
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:266
+#: lang.pm:274
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriaal-Guinea"
 
-#: lang.pm:268
+#: lang.pm:276
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Lõuna-Georgia ja Lõuna-Sandwichi saared"
 
-#: lang.pm:269
+#: lang.pm:277
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: lang.pm:270
+#: lang.pm:278
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:271
+#: lang.pm:279
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: lang.pm:272
+#: lang.pm:280
 #, c-format
 msgid "Guyana"
 msgstr "Guyana"
 
-#: lang.pm:273
+#: lang.pm:281
 #, c-format
 msgid "Hong Kong SAR (China)"
 msgstr "Hiina (Hongkong)"
 
-#: lang.pm:274
+#: lang.pm:282
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard ja McDonald"
 
-#: lang.pm:275
+#: lang.pm:283
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:276
+#: lang.pm:284
 #, c-format
 msgid "Croatia"
 msgstr "Horvaatia"
 
-#: lang.pm:277
+#: lang.pm:285
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:278 network/adsl_consts.pm:436
-#, c-format
-msgid "Hungary"
-msgstr "Ungari"
-
-#: lang.pm:279
+#: lang.pm:287
 #, c-format
 msgid "Indonesia"
 msgstr "Indoneesia"
 
-#: lang.pm:280 network/adsl_consts.pm:444 standalone/drakxtv:47
+#: lang.pm:288 network/adsl_consts.pm:471 standalone/drakxtv:47
 #, c-format
 msgid "Ireland"
 msgstr "Iirimaa"
 
-#: lang.pm:281
+#: lang.pm:289 network/adsl_consts.pm:479
 #, c-format
 msgid "Israel"
 msgstr "Iisrael"
 
-#: lang.pm:282
+#: lang.pm:290
 #, c-format
 msgid "India"
 msgstr "India"
 
-#: lang.pm:283
+#: lang.pm:291
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Briti India ookeani ala"
 
-#: lang.pm:284
+#: lang.pm:292
 #, c-format
 msgid "Iraq"
 msgstr "Iraak"
 
-#: lang.pm:285
+#: lang.pm:293
 #, c-format
 msgid "Iran"
 msgstr "Iraan"
 
-#: lang.pm:286
+#: lang.pm:294
 #, c-format
 msgid "Iceland"
 msgstr "Island"
 
-#: lang.pm:288
+#: lang.pm:296
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:289
+#: lang.pm:297
 #, c-format
 msgid "Jordan"
 msgstr "Jordaania"
 
-#: lang.pm:290
+#: lang.pm:298
 #, c-format
 msgid "Japan"
 msgstr "Jaapan"
 
-#: lang.pm:291
+#: lang.pm:299
 #, c-format
 msgid "Kenya"
 msgstr "Keenia"
 
-#: lang.pm:292
+#: lang.pm:300
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kõrgõzstan"
 
-#: lang.pm:293
+#: lang.pm:301
 #, c-format
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: lang.pm:294
+#: lang.pm:302
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:295
+#: lang.pm:303
 #, c-format
 msgid "Comoros"
 msgstr "Komoorid"
 
-#: lang.pm:296
+#: lang.pm:304
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: lang.pm:297
+#: lang.pm:305
 #, c-format
 msgid "Korea (North)"
 msgstr "Põhja-Korea"
 
-#: lang.pm:298
+#: lang.pm:306
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: lang.pm:299
+#: lang.pm:307
 #, c-format
 msgid "Kuwait"
 msgstr "Kuveit"
 
-#: lang.pm:300
+#: lang.pm:308
 #, c-format
 msgid "Cayman Islands"
 msgstr "Kaimanisaared"
 
-#: lang.pm:301
+#: lang.pm:309
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kasahstan"
 
-#: lang.pm:302
+#: lang.pm:310
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:303
+#: lang.pm:311
 #, c-format
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#: lang.pm:304
+#: lang.pm:312
 #, c-format
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: lang.pm:305
+#: lang.pm:313
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:306
+#: lang.pm:314
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:307
+#: lang.pm:315
 #, c-format
 msgid "Liberia"
 msgstr "Libeeria"
 
-#: lang.pm:308
+#: lang.pm:316
 #, c-format
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:309 network/adsl_consts.pm:479
+#: lang.pm:317 network/adsl_consts.pm:527
 #, c-format
 msgid "Lithuania"
 msgstr "Leedu"
 
-#: lang.pm:310
+#: lang.pm:318
 #, c-format
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: lang.pm:311
+#: lang.pm:319
 #, c-format
 msgid "Latvia"
 msgstr "Läti"
 
-#: lang.pm:312
+#: lang.pm:320
 #, c-format
 msgid "Libya"
 msgstr "Liibüa"
 
-#: lang.pm:313 network/adsl_consts.pm:487
+#: lang.pm:321 network/adsl_consts.pm:535
 #, c-format
 msgid "Morocco"
 msgstr "Maroko"
 
-#: lang.pm:314
+#: lang.pm:322
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:315
+#: lang.pm:323
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:316
+#: lang.pm:324
 #, c-format
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: lang.pm:317
+#: lang.pm:325
 #, c-format
 msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
-#: lang.pm:318
+#: lang.pm:326
 #, c-format
 msgid "Macedonia"
 msgstr "Makedoonia"
 
-#: lang.pm:319
+#: lang.pm:327
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:320
+#: lang.pm:328
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:321
+#: lang.pm:329
 #, c-format
 msgid "Mongolia"
 msgstr "Mongoolia"
 
-#: lang.pm:322
+#: lang.pm:330
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Põhja-Mariaani saared"
 
-#: lang.pm:323
+#: lang.pm:331
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:324
+#: lang.pm:332
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritaania"
 
-#: lang.pm:325
+#: lang.pm:333
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:326
+#: lang.pm:334
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:327
+#: lang.pm:335
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:328
+#: lang.pm:336
 #, c-format
 msgid "Maldives"
 msgstr "Maldiivid"
 
-#: lang.pm:329
+#: lang.pm:337
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:330
+#: lang.pm:338
 #, c-format
 msgid "Mexico"
 msgstr "Mehhiko"
 
-#: lang.pm:331
+#: lang.pm:339
 #, c-format
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: lang.pm:332
+#: lang.pm:340
 #, c-format
 msgid "Mozambique"
 msgstr "Mosambiik"
 
-#: lang.pm:333
+#: lang.pm:341
 #, c-format
 msgid "Namibia"
 msgstr "Namiibia"
 
-#: lang.pm:334
+#: lang.pm:342
 #, c-format
 msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
-#: lang.pm:335
+#: lang.pm:343
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:336
+#: lang.pm:344
 #, c-format
 msgid "Norfolk Island"
 msgstr "Norfolki saar"
 
-#: lang.pm:337
+#: lang.pm:345
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeeria"
 
-#: lang.pm:338
+#: lang.pm:346
 #, c-format
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:341
+#: lang.pm:349
 #, c-format
 msgid "Nepal"
 msgstr "Nepal"
 
-#: lang.pm:342
+#: lang.pm:350
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:343
+#: lang.pm:351
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:344
+#: lang.pm:352
 #, c-format
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
-#: lang.pm:345
+#: lang.pm:353
 #, c-format
 msgid "Oman"
 msgstr "Omaan"
 
-#: lang.pm:346
+#: lang.pm:354
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:347
+#: lang.pm:355
 #, c-format
 msgid "Peru"
 msgstr "Peruu"
 
-#: lang.pm:348
+#: lang.pm:356
 #, c-format
 msgid "French Polynesia"
 msgstr "Prantsuse Polüneesia"
 
-#: lang.pm:349
+#: lang.pm:357
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Paapua Uus-Guinea"
 
-#: lang.pm:350
+#: lang.pm:358
 #, c-format
 msgid "Philippines"
 msgstr "Filipiinid"
 
-#: lang.pm:351
+#: lang.pm:359
 #, c-format
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: lang.pm:352 network/adsl_consts.pm:503
-#, c-format
-msgid "Poland"
-msgstr "Poola"
-
-#: lang.pm:353
+#: lang.pm:361
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre ja Miquelon"
 
-#: lang.pm:354
+#: lang.pm:362
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:355
+#: lang.pm:363
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:356
+#: lang.pm:364
 #, c-format
 msgid "Palestine"
 msgstr "Palestiina"
 
-#: lang.pm:357 network/adsl_consts.pm:513
+#: lang.pm:365 network/adsl_consts.pm:634
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: lang.pm:358
+#: lang.pm:366
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:359
+#: lang.pm:367
 #, c-format
 msgid "Palau"
 msgstr "Belau"
 
-#: lang.pm:360
+#: lang.pm:368
 #, c-format
 msgid "Qatar"
 msgstr "Katar"
 
-#: lang.pm:361
+#: lang.pm:369
 #, c-format
 msgid "Reunion"
 msgstr "Réunion"
 
-#: lang.pm:362
+#: lang.pm:370
 #, c-format
 msgid "Romania"
 msgstr "Rumeenia"
 
-#: lang.pm:363
+#: lang.pm:371 network/adsl_consts.pm:642
 #, c-format
 msgid "Russia"
 msgstr "Venemaa"
 
-#: lang.pm:364
+#: lang.pm:372
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:365
+#: lang.pm:373
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
-#: lang.pm:366
+#: lang.pm:374
 #, c-format
 msgid "Solomon Islands"
 msgstr "Saalomoni saared"
 
-#: lang.pm:367
+#: lang.pm:375
 #, c-format
 msgid "Seychelles"
 msgstr "Seišellid"
 
-#: lang.pm:368
+#: lang.pm:376
 #, c-format
 msgid "Sudan"
 msgstr "Sudaan"
 
-#: lang.pm:370
+#: lang.pm:378
 #, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: lang.pm:371
+#: lang.pm:379
 #, c-format
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: lang.pm:372 network/adsl_consts.pm:520
+#: lang.pm:380 network/adsl_consts.pm:652
 #, c-format
 msgid "Slovenia"
 msgstr "Sloveenia"
 
-#: lang.pm:373
+#: lang.pm:381
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbard ja Jan Mayen"
 
-#: lang.pm:374
-#, c-format
-msgid "Slovakia"
-msgstr "Slovakkia"
-
-#: lang.pm:375
+#: lang.pm:383
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: lang.pm:376
+#: lang.pm:384
 #, c-format
 msgid "San Marino"
 msgstr "San Marino"
 
-#: lang.pm:377
+#: lang.pm:385
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:378
+#: lang.pm:386
 #, c-format
 msgid "Somalia"
 msgstr "Somaalia"
 
-#: lang.pm:379
+#: lang.pm:387
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:380
+#: lang.pm:388
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tomé ja Principe"
 
-#: lang.pm:381
+#: lang.pm:389
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:382
+#: lang.pm:390
 #, c-format
 msgid "Syria"
 msgstr "Süüria"
 
-#: lang.pm:383
+#: lang.pm:391
 #, c-format
 msgid "Swaziland"
 msgstr "Svaasimaa"
 
-#: lang.pm:384
+#: lang.pm:392
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Turks ja Caicos"
 
-#: lang.pm:385
+#: lang.pm:393
 #, c-format
 msgid "Chad"
 msgstr "Tšaad"
 
-#: lang.pm:386
+#: lang.pm:394
 #, c-format
 msgid "French Southern Territories"
 msgstr "Prantsuse Lõunaalad"
 
-#: lang.pm:387
+#: lang.pm:395
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:388 network/adsl_consts.pm:585
+#: lang.pm:396 network/adsl_consts.pm:806
 #, c-format
 msgid "Thailand"
 msgstr "Tai"
 
-#: lang.pm:389
+#: lang.pm:397
 #, c-format
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: lang.pm:390
+#: lang.pm:398
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:391
+#: lang.pm:399
 #, c-format
 msgid "East Timor"
 msgstr "Ida-Timor"
 
-#: lang.pm:392
+#: lang.pm:400
 #, c-format
 msgid "Turkmenistan"
 msgstr "Türkmenistan"
 
-#: lang.pm:393
+#: lang.pm:401 network/adsl_consts.pm:816
 #, c-format
 msgid "Tunisia"
 msgstr "Tuneesia"
 
-#: lang.pm:394
+#: lang.pm:402
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:395
+#: lang.pm:403
 #, c-format
 msgid "Turkey"
 msgstr "Türgi"
 
-#: lang.pm:396
+#: lang.pm:404
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: lang.pm:397
+#: lang.pm:405
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:398
-#, c-format
-msgid "Taiwan"
-msgstr "Taiwan"
-
-#: lang.pm:399
+#: lang.pm:407
 #, c-format
 msgid "Tanzania"
 msgstr "Tansaania"
 
-#: lang.pm:400
+#: lang.pm:408
 #, c-format
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: lang.pm:401
+#: lang.pm:409
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:402
+#: lang.pm:410
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Ühendriikide hajasaared"
 
-#: lang.pm:404
+#: lang.pm:412
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:405
+#: lang.pm:413
 #, c-format
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: lang.pm:406
+#: lang.pm:414
 #, c-format
 msgid "Vatican"
 msgstr "Vatikan"
 
-#: lang.pm:407
+#: lang.pm:415
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent ja Grenadiinid"
 
-#: lang.pm:408
+#: lang.pm:416
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:409
+#: lang.pm:417
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Neitsisaared (Briti)"
 
-#: lang.pm:410
+#: lang.pm:418
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Neitsisaared (USA)"
 
-#: lang.pm:411
+#: lang.pm:419
 #, c-format
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: lang.pm:412
+#: lang.pm:420
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:413
+#: lang.pm:421
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis ja Futuna"
 
-#: lang.pm:414
+#: lang.pm:422
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:415
+#: lang.pm:423
 #, c-format
 msgid "Yemen"
 msgstr "Jeemen"
 
-#: lang.pm:416
+#: lang.pm:424
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:417 standalone/drakxtv:49
+#: lang.pm:425 standalone/drakxtv:49
 #, c-format
 msgid "South Africa"
 msgstr "Lõuna-Aafrika"
 
-#: lang.pm:418
+#: lang.pm:426
 #, c-format
 msgid "Zambia"
 msgstr "Sambia"
 
-#: lang.pm:419
+#: lang.pm:427
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:1047
+#: lang.pm:1040
 #, c-format
 msgid "You should install the following packages: %s"
 msgstr "Te peaksite paigaldama järgmised paketid: %s"
 
 #. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
-#: lang.pm:1050 standalone/scannerdrake:135
+#: lang.pm:1043 standalone/scannerdrake:135
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: lang.pm:1101
+#: lang.pm:1094
 #, c-format
 msgid "Welcome to %s"
 msgstr "See ongi %s"
@@ -9235,12 +9423,12 @@ msgstr "See ongi %s"
 msgid "Circular mounts %s\n"
 msgstr "Ringühendus %s\n"
 
-#: lvm.pm:116
+#: lvm.pm:111
 #, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Eemaldage esmalt kettarühmad (logical volumes)\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:1033
+#: modules/interactive.pm:21 standalone/drakconnect:1032
 #, c-format
 msgid "Parameters"
 msgstr "Parameetrid"
@@ -9248,7 +9436,7 @@ msgstr "Parameetrid"
 #: modules/interactive.pm:21 standalone/draksec:51
 #, c-format
 msgid "NONE"
-msgstr "MITTE KEEGI"
+msgstr "PUUDUB"
 
 #: modules/interactive.pm:22
 #, c-format
@@ -9280,28 +9468,48 @@ msgstr "Kas Teil on ikka mõni %s liides?"
 msgid "See hardware info"
 msgstr "Info riistvara kohta"
 
+#: modules/interactive.pm:82
+#, c-format
+msgid "Installing driver for USB controller"
+msgstr "USB-kontrolleri draiveri paigaldamine"
+
+#: modules/interactive.pm:83
+#, c-format
+msgid "Installing driver for firewire controller %s"
+msgstr "FireWire-kontrolleri %s draiveri paigaldamine"
+
+#: modules/interactive.pm:84
+#, c-format
+msgid "Installing driver for hard drive controller %s"
+msgstr "Kõvakettakontrolleri %s draiveri paigaldamine"
+
+#: modules/interactive.pm:85
+#, c-format
+msgid "Installing driver for ethernet controller %s"
+msgstr "Ethernet-kontrolleri %s draiveri paigaldamine"
+
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: modules/interactive.pm:87
+#: modules/interactive.pm:96
 #, c-format
 msgid "Installing driver for %s card %s"
-msgstr "Draiveri %s paigaldamine kaardile %s"
+msgstr "%s draiveri paigaldamine kaardile %s"
 
-#: modules/interactive.pm:87
+#: modules/interactive.pm:99
 #, c-format
 msgid "(module %s)"
 msgstr "(moodul %s)"
 
-#: modules/interactive.pm:98
+#: modules/interactive.pm:109
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
 "Note that any address should be entered with the prefix 0x like '0x123'"
 msgstr ""
-"Nüüd võite määrata oma parameetrid moodulile %s.\n"
-"Pange tähele, et iga aadress tuleb sisestada prefiksiga 0x, nt '0x123'"
+"Nüüd võite moodulile %s parameetrid määrata.\n"
+"Pange tähele, et aadress tuleb sisestada prefiksiga 0x, nt \"0x123\""
 
-#: modules/interactive.pm:104
+#: modules/interactive.pm:115
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
@@ -9312,18 +9520,18 @@ msgstr ""
 "Parameetrid on vormingus \"nimi=väärtus nimi2=väärtus2 ...\".\n"
 "Näiteks: \"io=0x300 irq=7\""
 
-#: modules/interactive.pm:106
+#: modules/interactive.pm:117
 #, c-format
 msgid "Module options:"
 msgstr "Mooduli parameetrid:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: modules/interactive.pm:119
+#: modules/interactive.pm:130
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Millist %s draiverit peaks proovima?"
 
-#: modules/interactive.pm:128
+#: modules/interactive.pm:139
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -9334,22 +9542,24 @@ msgid ""
 "should\n"
 "not cause any damage."
 msgstr ""
-"Mõnel juhul vajab %s draiver tööks lisainformatsiooni,\n"
-"kuigi tavaliselt saab ka ilma hakkama. Kas soovite eraldi parameetreid\n"
-"määrata või lasta draiveril ise Teie arvutit kompida? Võib juhtuda,\n"
-"et see viib arvuti segadusse, kuid ei tohiks mingit jäävat kahju teha."
+"Mõnel juhul vajab %s draiver tööks lisainformatsiooni, kuigi tavaliselt saab "
+"ka ilma hakkama.\n"
+"Kas soovite eraldi parameetreid määrata või lasta draiveril ise Teie "
+"arvutist vajalik info hankida?\n"
+"Võib juhtuda, et see viib arvuti segadusse, kuid ei tohiks mingit jäävat "
+"kahju teha."
 
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
 #, c-format
 msgid "Autoprobe"
-msgstr "Proovida niisama"
+msgstr "Automaatne otsing"
 
-#: modules/interactive.pm:132
+#: modules/interactive.pm:143
 #, c-format
 msgid "Specify options"
-msgstr "Määrata parameetrid"
+msgstr "Parameetrite määramine"
 
-#: modules/interactive.pm:144
+#: modules/interactive.pm:155
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -9408,11 +9618,11 @@ msgstr "Tavaline PS2 rattaga hiir"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
-#: network/modem.pm:84 network/modem.pm:98 network/modem.pm:103
-#: network/modem.pm:136 network/netconnect.pm:607 network/netconnect.pm:612
-#: network/netconnect.pm:624 network/netconnect.pm:629
-#: network/netconnect.pm:645 network/netconnect.pm:647
+#: mouse.pm:36 network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/modem.pm:85 network/modem.pm:99 network/modem.pm:104
+#: network/modem.pm:137 network/netconnect.pm:645 network/netconnect.pm:650
+#: network/netconnect.pm:662 network/netconnect.pm:667
+#: network/netconnect.pm:683 network/netconnect.pm:685
 #, c-format
 msgid "Automatic"
 msgstr "Automaatne"
@@ -9562,7 +9772,7 @@ msgstr "Suvaline PS/2 ja USB hiir"
 msgid "Synaptics Touchpad"
 msgstr "Synaptics Touchpad"
 
-#: mouse.pm:93 standalone/drakconnect:358 standalone/drakvpn:1140
+#: mouse.pm:93 standalone/drakconnect:360 standalone/drakvpn:1140
 #, c-format
 msgid "none"
 msgstr "puudub"
@@ -9622,23 +9832,23 @@ msgstr "Sagem (PPPoA vahendusel) USB"
 msgid "Sagem (using DHCP) USB"
 msgstr "Sagem (DHCP vahendusel) USB"
 
-#: network/adsl.pm:35 network/netconnect.pm:799
+#: network/adsl.pm:35 network/netconnect.pm:839
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Loo internetiühendus"
 
-#: network/adsl.pm:36 network/netconnect.pm:800
+#: network/adsl.pm:36 network/netconnect.pm:840
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
 "Some connections use PPTP, a few use DHCP.\n"
-"If you don't know, choose 'use PPPoE'"
+"If you do not know, choose 'use PPPoE'"
 msgstr ""
 "Kõige tavalisem ühendusviis ADSL jaoks on pppoe.\n"
 "Mõnel juhul aga kasutatakse PPTP-d, harva dhcp-d.\n"
 "Kui Te ei tea, kasutage PPPoE-d"
 
-#: network/adsl.pm:41 network/netconnect.pm:804
+#: network/adsl.pm:41 network/netconnect.pm:844
 #, c-format
 msgid "ADSL connection type:"
 msgstr "ADSL ühenduse tüüp:"
@@ -9680,13 +9890,13 @@ msgstr "Telneti server"
 
 #: network/drakfirewall.pm:48
 #, c-format
-msgid "Samba server"
-msgstr "Samba server"
+msgid "Windows Files Sharing (SMB)"
+msgstr "Windowsi failide jagamine (SMB)"
 
 #: network/drakfirewall.pm:54
 #, c-format
 msgid "CUPS server"
-msgstr "CUPS server"
+msgstr "CUPS-server"
 
 #: network/drakfirewall.pm:60
 #, c-format
@@ -9714,7 +9924,7 @@ msgid ""
 msgstr ""
 "drakfirewalli seadistaja\n"
 "\n"
-"Selle vahendiga saate luua lihtsa kaitse Interneti ohtude vastu.\n"
+"Selle tööriistaga saate luua lihtsa kaitse Interneti ohtude vastu.\n"
 "Kui vajate võimsat tulemüüri, vaadake palun\n"
 "spetsiaalset MandrakeSecurity Firewall distributsiooni."
 
@@ -9773,107 +9983,107 @@ msgstr "Kõik (tulemüür puudub)"
 msgid "Other ports"
 msgstr "Muud pordid"
 
-#: network/isdn.pm:125 network/netconnect.pm:456 network/netconnect.pm:564
-#: network/netconnect.pm:567
+#: network/isdn.pm:125 network/netconnect.pm:490 network/netconnect.pm:602
+#: network/netconnect.pm:605
 #, c-format
 msgid "Unlisted - edit manually"
 msgstr "Puudub nimekirjast - käsitsimääramine"
 
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:168 network/netconnect.pm:388
+#: network/isdn.pm:168 network/netconnect.pm:422
 #, c-format
-msgid "I don't know"
+msgid "I do not know"
 msgstr "Ei tea"
 
-#: network/isdn.pm:169 network/netconnect.pm:388
+#: network/isdn.pm:169 network/netconnect.pm:422
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:170 network/netconnect.pm:388
+#: network/isdn.pm:170 network/netconnect.pm:422
 #, c-format
 msgid "USB"
 msgstr "USB"
 
-#: network/modem.pm:57 network/modem.pm:58 network/modem.pm:59
-#: network/netconnect.pm:612 network/netconnect.pm:629
-#: network/netconnect.pm:645
+#: network/modem.pm:58 network/modem.pm:59 network/modem.pm:60
+#: network/netconnect.pm:650 network/netconnect.pm:667
+#: network/netconnect.pm:683
 #, c-format
 msgid "Manual"
 msgstr "käsitsi"
 
-#: network/netconnect.pm:89 network/netconnect.pm:485
-#: network/netconnect.pm:489
+#: network/netconnect.pm:90 network/netconnect.pm:519
+#: network/netconnect.pm:523
 #, c-format
 msgid "Manual choice"
 msgstr "Käsitsivalik"
 
-#: network/netconnect.pm:89
+#: network/netconnect.pm:90
 #, c-format
 msgid "Internal ISDN card"
 msgstr "Sisemine ISDN kaart"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, c-format
 msgid "Managed"
 msgstr "Määratud"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, c-format
 msgid "Master"
 msgstr "Esmane"
 
-#: network/netconnect.pm:101
+#: network/netconnect.pm:103
 #, c-format
 msgid "Repeater"
 msgstr "Repiiter"
 
-#: network/netconnect.pm:102
+#: network/netconnect.pm:104
 #, c-format
 msgid "Secondary"
 msgstr "Teisene"
 
-#: network/netconnect.pm:103
+#: network/netconnect.pm:105
 #, c-format
 msgid "Auto"
 msgstr "Automaatne"
 
-#: network/netconnect.pm:106 printer/printerdrake.pm:1248
+#: network/netconnect.pm:108 printer/printerdrake.pm:1354
 #: standalone/drakups:75
 #, c-format
 msgid "Manual configuration"
 msgstr "Käsitsiseadistamine"
 
-#: network/netconnect.pm:107
+#: network/netconnect.pm:109
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Automaatne IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:109
+#: network/netconnect.pm:111
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "Automaatne IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:112
+#: network/netconnect.pm:114
 #, c-format
 msgid "Protocol for the rest of the world"
 msgstr "Protokoll ülejäänud maailma tarbeks"
 
-#: network/netconnect.pm:114 standalone/drakconnect:539
+#: network/netconnect.pm:116 standalone/drakconnect:541
 #, c-format
 msgid "European protocol (EDSS1)"
 msgstr "Euroopa protokoll (EDSS1)"
 
-#: network/netconnect.pm:115 standalone/drakconnect:540
+#: network/netconnect.pm:117 standalone/drakconnect:542
 #, c-format
 msgid ""
 "Protocol for the rest of the world\n"
@@ -9882,168 +10092,168 @@ msgstr ""
 "Protokoll ülejäänud maailma tarbeks\n"
 "Ilma D-kanalita (liisitud liinid)"
 
-#: network/netconnect.pm:151
+#: network/netconnect.pm:153
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB modem"
 
-#: network/netconnect.pm:152
+#: network/netconnect.pm:154
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB modem"
 
-#: network/netconnect.pm:153
+#: network/netconnect.pm:155
 #, c-format
 msgid "Bewan modem"
 msgstr "Bewan modem"
 
-#: network/netconnect.pm:154
+#: network/netconnect.pm:156
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus modem"
 
-#: network/netconnect.pm:158
+#: network/netconnect.pm:160
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "DHCP"
 
-#: network/netconnect.pm:159
+#: network/netconnect.pm:161
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "TCP/IP käsitsiseadistamine"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:162
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "PPTP (Point-to-Point tunneldusprotokoll)"
 
-#: network/netconnect.pm:161
+#: network/netconnect.pm:163
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPPoE (PPP over Ethernet)"
 
-#: network/netconnect.pm:162
+#: network/netconnect.pm:164
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPPoA (PPP over ATM)"
 
-#: network/netconnect.pm:163
+#: network/netconnect.pm:165
 #, c-format
 msgid "DSL over CAPI"
 msgstr "DSL üle CAPI"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:169
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Sillatud Ethernet LLC"
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:170
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Sillatud Ethernet VC"
 
-#: network/netconnect.pm:169
+#: network/netconnect.pm:171
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Marsruuditud IP LLC"
 
-#: network/netconnect.pm:170
+#: network/netconnect.pm:172
 #, c-format
 msgid "Routed IP VC"
 msgstr "Marsruuditud IP VC"
 
-#: network/netconnect.pm:171
+#: network/netconnect.pm:173
 #, c-format
 msgid "PPPoA LLC"
 msgstr "PPPoA LLC"
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:174
 #, c-format
 msgid "PPPoA VC"
 msgstr "PPPoA VC"
 
-#: network/netconnect.pm:176 standalone/drakconnect:474
+#: network/netconnect.pm:178 standalone/drakconnect:476
 #, c-format
 msgid "Script-based"
 msgstr "Skriptipõhine"
 
-#: network/netconnect.pm:177 standalone/drakconnect:474
+#: network/netconnect.pm:179 standalone/drakconnect:476
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:178 standalone/drakconnect:474
+#: network/netconnect.pm:180 standalone/drakconnect:476
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalipõhine"
 
-#: network/netconnect.pm:179 standalone/drakconnect:474
+#: network/netconnect.pm:181 standalone/drakconnect:476
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:180 standalone/drakconnect:474
+#: network/netconnect.pm:182 standalone/drakconnect:476
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:236 standalone/drakconnect:59
+#: network/netconnect.pm:238 standalone/drakconnect:59
 #, c-format
 msgid "Network & Internet Configuration"
-msgstr "Interneti ja kohtvõrgu seadistused"
+msgstr "Interneti ja kohtvõrgu seadistamine"
 
-#: network/netconnect.pm:242
+#: network/netconnect.pm:244
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(tuvastati pordis %s)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
 #, c-format
 msgid "(detected %s)"
 msgstr "(tuvastati %s)"
 
-#: network/netconnect.pm:244
+#: network/netconnect.pm:246
 #, c-format
 msgid "(detected)"
 msgstr "(tuvastati)"
 
-#: network/netconnect.pm:246
+#: network/netconnect.pm:248
 #, c-format
 msgid "Modem connection"
 msgstr "Modemiühendus"
 
-#: network/netconnect.pm:247
+#: network/netconnect.pm:249
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN ühendus"
 
-#: network/netconnect.pm:248
+#: network/netconnect.pm:250
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL ühendus"
 
-#: network/netconnect.pm:249
+#: network/netconnect.pm:251
 #, c-format
 msgid "Cable connection"
 msgstr "Kaabliühendus"
 
-#: network/netconnect.pm:250
+#: network/netconnect.pm:252
 #, c-format
 msgid "LAN connection"
 msgstr "LAN ühendus"
 
-#: network/netconnect.pm:251 network/netconnect.pm:265
+#: network/netconnect.pm:253 network/netconnect.pm:267
 #, c-format
 msgid "Wireless connection"
 msgstr "Traadita ühendus"
 
-#: network/netconnect.pm:261
+#: network/netconnect.pm:263
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Valige ühendus, mida seadistada"
 
-#: network/netconnect.pm:279
+#: network/netconnect.pm:277
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -10054,132 +10264,143 @@ msgstr ""
 "Nüüd on aeg seadistada %s ühendus.\n"
 "\n"
 "\n"
-"Vajutage jätkamiseks \"%s\"."
+"Klõpsake jätkamiseks nupule \"%s\"."
 
-#: network/netconnect.pm:287 network/netconnect.pm:839
+#: network/netconnect.pm:285 network/netconnect.pm:879
 #, c-format
 msgid "Connection Configuration"
-msgstr "Internetiühenduse seadistused"
+msgstr "Internetiühenduse seadistamine"
 
-#: network/netconnect.pm:288 network/netconnect.pm:840
+#: network/netconnect.pm:286 network/netconnect.pm:880
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Palun täitke allpool olev väli"
 
-#: network/netconnect.pm:295 standalone/drakconnect:530
+#: network/netconnect.pm:293 standalone/drakconnect:532
 #, c-format
 msgid "Card IRQ"
 msgstr "Kaardi IRQ"
 
-#: network/netconnect.pm:296 standalone/drakconnect:531
+#: network/netconnect.pm:294 standalone/drakconnect:533
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Kaardi mälu (DMA)"
 
-#: network/netconnect.pm:297 standalone/drakconnect:532
+#: network/netconnect.pm:295 standalone/drakconnect:534
 #, c-format
 msgid "Card IO"
 msgstr "Kaardi IO"
 
-#: network/netconnect.pm:298 standalone/drakconnect:533
+#: network/netconnect.pm:296 standalone/drakconnect:535
 #, c-format
 msgid "Card IO_0"
 msgstr "Kaardi IO_0"
 
-#: network/netconnect.pm:299
+#: network/netconnect.pm:297
 #, c-format
 msgid "Card IO_1"
 msgstr "Kaardi IO_1"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:298
 #, c-format
 msgid "Your personal phone number"
 msgstr "Teie telefoninumber"
 
-#: network/netconnect.pm:301 network/netconnect.pm:843
+#: network/netconnect.pm:299 network/netconnect.pm:883
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Teenusepakkuja tunnus (näiteks minuisp.ee)"
 
-#: network/netconnect.pm:302 standalone/drakconnect:469
+#: network/netconnect.pm:300 standalone/drakconnect:471
 #, c-format
 msgid "Provider phone number"
 msgstr "Sissehelistamiskeskuse number"
 
-#: network/netconnect.pm:303
+#: network/netconnect.pm:301
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "DNS 1 (võib jätta tühjaks)"
 
-#: network/netconnect.pm:304
+#: network/netconnect.pm:302
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 (võib jätta tühjaks)"
 
-#: network/netconnect.pm:305 standalone/drakconnect:420
+#: network/netconnect.pm:303 standalone/drakconnect:422
 #, c-format
 msgid "Dialing mode"
 msgstr "Valimisviis"
 
-#: network/netconnect.pm:306 standalone/drakconnect:425
-#: standalone/drakconnect:493
+#: network/netconnect.pm:304 standalone/drakconnect:427
+#: standalone/drakconnect:495
 #, c-format
 msgid "Connection speed"
 msgstr "Ühenduse kiirus"
 
-#: network/netconnect.pm:307 standalone/drakconnect:430
+#: network/netconnect.pm:305 standalone/drakconnect:432
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Ühenduse aegumine (sekundites)"
 
-#: network/netconnect.pm:310 network/netconnect.pm:846
-#: standalone/drakconnect:467
+#: network/netconnect.pm:308 network/netconnect.pm:329
+#: network/netconnect.pm:886 standalone/drakconnect:469
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Kasutajatunnus"
 
-#: network/netconnect.pm:311 network/netconnect.pm:847
-#: standalone/drakconnect:468
+#: network/netconnect.pm:309 network/netconnect.pm:330
+#: network/netconnect.pm:887 standalone/drakconnect:470
 #, c-format
 msgid "Account Password"
-msgstr "Salasõna"
+msgstr "Parool"
+
+#: network/netconnect.pm:325
+#, c-format
+msgid "Cable: account options"
+msgstr "Kaabliühendus: konto valikud"
 
-#: network/netconnect.pm:328 network/netconnect.pm:677
-#: network/netconnect.pm:880
+#: network/netconnect.pm:328
+#, c-format
+msgid "Use BPALogin (needed for Telstra)"
+msgstr "BPALogin'i kasutamine (vajalik Telstrale)"
+
+#: network/netconnect.pm:362 network/netconnect.pm:715
+#: network/netconnect.pm:920
 #, c-format
 msgid "Select the network interface to configure:"
 msgstr "Valige seadistatav võrguliides:"
 
-#: network/netconnect.pm:330 network/netconnect.pm:378
-#: network/netconnect.pm:678 network/netconnect.pm:882 network/shorewall.pm:85
-#: standalone/drakconnect:683 standalone/drakgw:227 standalone/drakvpn:221
+#: network/netconnect.pm:364 network/netconnect.pm:412
+#: network/netconnect.pm:716 network/netconnect.pm:922
+#: network/netconnect.pm:1091 network/shorewall.pm:98
+#: standalone/drakconnect:684 standalone/drakgw:224 standalone/drakvpn:221
 #, c-format
 msgid "Net Device"
 msgstr "Võrguseade"
 
-#: network/netconnect.pm:331 network/netconnect.pm:339
+#: network/netconnect.pm:365 network/netconnect.pm:373
 #, c-format
 msgid "External ISDN modem"
 msgstr "Väline ISDN modem"
 
-#: network/netconnect.pm:377 standalone/harddrake2:192
+#: network/netconnect.pm:411 standalone/harddrake2:210
 #, c-format
 msgid "Select a device!"
 msgstr "Valige seade!"
 
-#: network/netconnect.pm:386 network/netconnect.pm:396
-#: network/netconnect.pm:406 network/netconnect.pm:439
-#: network/netconnect.pm:453
+#: network/netconnect.pm:420 network/netconnect.pm:430
+#: network/netconnect.pm:440 network/netconnect.pm:473
+#: network/netconnect.pm:487
 #, c-format
 msgid "ISDN Configuration"
-msgstr "ISDN seadistused"
+msgstr "ISDN seadistamine"
 
-#: network/netconnect.pm:387
+#: network/netconnect.pm:421
 #, c-format
 msgid "What kind of card do you have?"
 msgstr "Millist tüüpi kaart Teil on?"
 
-#: network/netconnect.pm:397
+#: network/netconnect.pm:431
 #, c-format
 msgid ""
 "\n"
@@ -10193,22 +10414,22 @@ msgstr ""
 "\n"
 "Kui Teil on PCMCIA kaart, peate ise teadma selle IRQ ning IO väärtusi.\n"
 
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
 #, c-format
 msgid "Continue"
 msgstr "Jätka"
 
-#: network/netconnect.pm:401
+#: network/netconnect.pm:435
 #, c-format
 msgid "Abort"
 msgstr "Katkesta"
 
-#: network/netconnect.pm:407
+#: network/netconnect.pm:441
 #, c-format
 msgid "Which of the following is your ISDN card?"
 msgstr "Milline on Teie ISDN kaart?"
 
-#: network/netconnect.pm:425
+#: network/netconnect.pm:459
 #, c-format
 msgid ""
 "A CAPI driver is available for this modem. This CAPI driver can offer more "
@@ -10219,159 +10440,159 @@ msgstr ""
 "kui vaba draiver (näiteks fakside saatmine). Millist draiverit soovite "
 "kasutada?"
 
-#: network/netconnect.pm:427 standalone/drakconnect:116 standalone/drakups:247
-#: standalone/harddrake2:117
+#: network/netconnect.pm:461 standalone/drakconnect:116 standalone/drakups:247
+#: standalone/harddrake2:131
 #, c-format
 msgid "Driver"
 msgstr "Draiver"
 
-#: network/netconnect.pm:439
+#: network/netconnect.pm:473
 #, c-format
 msgid "Which protocol do you want to use?"
 msgstr "Millist protokolli soovite kasutada?"
 
-#: network/netconnect.pm:441 standalone/drakconnect:116
-#: standalone/drakconnect:309 standalone/drakconnect:538
+#: network/netconnect.pm:475 standalone/drakconnect:116
+#: standalone/drakconnect:309 standalone/drakconnect:540
 #: standalone/drakvpn:1142
 #, c-format
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: network/netconnect.pm:453
+#: network/netconnect.pm:487
 #, c-format
 msgid ""
 "Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+"If it is not listed, choose Unlisted."
 msgstr ""
 "Valige oma teenusepakkuja.\n"
-"Kui see ei ole nimekirjas, valige 'Tundmatu'."
+"Kui see ei ole nimekirjas, valige \"Tundmatu\"."
 
-#: network/netconnect.pm:455 network/netconnect.pm:563
-#: network/netconnect.pm:719
+#: network/netconnect.pm:489 network/netconnect.pm:601
+#: network/netconnect.pm:757
 #, c-format
 msgid "Provider:"
 msgstr "Teenusepakkuja:"
 
-#: network/netconnect.pm:470
+#: network/netconnect.pm:504
 #, c-format
 msgid ""
-"Your modem isn't supported by the system.\n"
+"Your modem is not supported by the system.\n"
 "Take a look at http://www.linmodems.org"
 msgstr ""
 "Teie modem ei ole toetatud.\n"
 "Ehk saate abi aadressilt http://www.linmodems.org"
 
-#: network/netconnect.pm:482
+#: network/netconnect.pm:516
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Valige seadistatav modem:"
 
-#: network/netconnect.pm:530
+#: network/netconnect.pm:568
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Millisesse jadaporti on Teie modem ühendatud?"
 
-#: network/netconnect.pm:561
+#: network/netconnect.pm:599
 #, c-format
 msgid "Select your provider:"
 msgstr "Valige teenusepakkuja:"
 
-#: network/netconnect.pm:589
+#: network/netconnect.pm:627
 #, c-format
 msgid "Dialup: account options"
 msgstr "Sissehelistamine (dial-up): konto valikud"
 
-#: network/netconnect.pm:592
+#: network/netconnect.pm:630
 #, c-format
 msgid "Connection name"
 msgstr "Ühenduse nimi"
 
-#: network/netconnect.pm:593
+#: network/netconnect.pm:631
 #, c-format
 msgid "Phone number"
 msgstr "Sissehelistamiskeskuse number"
 
-#: network/netconnect.pm:594
+#: network/netconnect.pm:632
 #, c-format
 msgid "Login ID"
 msgstr "Kasutajakonto"
 
-#: network/netconnect.pm:609 network/netconnect.pm:642
+#: network/netconnect.pm:647 network/netconnect.pm:680
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Sissehelistamine (dial-up): IP parameetrid"
 
-#: network/netconnect.pm:612
+#: network/netconnect.pm:650
 #, c-format
 msgid "IP parameters"
 msgstr "IP parameetrid"
 
-#: network/netconnect.pm:613 network/netconnect.pm:976
+#: network/netconnect.pm:651 network/netconnect.pm:1018
 #: printer/printerdrake.pm:454 standalone/drakconnect:116
-#: standalone/drakconnect:323 standalone/drakconnect:880
+#: standalone/drakconnect:325 standalone/drakconnect:879
 #: standalone/drakups:282
 #, c-format
 msgid "IP address"
-msgstr "IP aadress"
+msgstr "IP-aadress"
 
-#: network/netconnect.pm:614
+#: network/netconnect.pm:652
 #, c-format
 msgid "Subnet mask"
 msgstr "Alamvõrgu mask"
 
-#: network/netconnect.pm:626
+#: network/netconnect.pm:664
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Sissehelistamine (dial-up): DNS parameetrid"
 
-#: network/netconnect.pm:629
+#: network/netconnect.pm:667
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:630
+#: network/netconnect.pm:668
 #, c-format
 msgid "Domain name"
 msgstr "Domeeninimi"
 
-#: network/netconnect.pm:631 network/netconnect.pm:844
-#: standalone/drakconnect:998
+#: network/netconnect.pm:669 network/netconnect.pm:884
+#: standalone/drakconnect:997
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Esimene nimeserver (pole kohustuslik)"
 
-#: network/netconnect.pm:632 network/netconnect.pm:845
-#: standalone/drakconnect:999
+#: network/netconnect.pm:670 network/netconnect.pm:885
+#: standalone/drakconnect:998
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Teine nimeserver (pole kohustuslik)"
 
-#: network/netconnect.pm:633
+#: network/netconnect.pm:671
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Masinanimi IP järgi"
 
-#: network/netconnect.pm:645 standalone/drakconnect:334
+#: network/netconnect.pm:683 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "Vaikelüüs"
 
-#: network/netconnect.pm:646
+#: network/netconnect.pm:684
 #, c-format
 msgid "Gateway IP address"
-msgstr "Lüüsi IP aadress"
+msgstr "Lüüsi IP-aadress"
 
-#: network/netconnect.pm:677
+#: network/netconnect.pm:715
 #, c-format
 msgid "ADSL configuration"
-msgstr "ADSL seadistused"
+msgstr "ADSL seadistamine"
 
-#: network/netconnect.pm:717
+#: network/netconnect.pm:755
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Palun valige oma ADSL ühenduse pakkuja."
 
-#: network/netconnect.pm:735
+#: network/netconnect.pm:773
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10382,32 +10603,32 @@ msgstr ""
 "Te võite nüüd selle paigaldada disketilt või Windowsi partitsioonilt\n"
 "või ka sammu vahele jätta ja hoopis hiljem paigaldamise ette võtta."
 
-#: network/netconnect.pm:739 network/netconnect.pm:744
+#: network/netconnect.pm:777 network/netconnect.pm:782
 #, c-format
 msgid "Use a floppy"
 msgstr "Disketi kasutamine"
 
-#: network/netconnect.pm:739 network/netconnect.pm:748
+#: network/netconnect.pm:777 network/netconnect.pm:786
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Windowsi partitsiooni kasutamine"
 
-#: network/netconnect.pm:739 network/netconnect.pm:751
+#: network/netconnect.pm:777 network/netconnect.pm:789
 #, c-format
 msgid "Do it later"
 msgstr "Tee seda hiljem"
 
-#: network/netconnect.pm:758
+#: network/netconnect.pm:796
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Püsivara kopeerimine ebaõnnestus, faili %s ei leitud"
 
-#: network/netconnect.pm:765
+#: network/netconnect.pm:803
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Püsivara kopeerimine õnnestus"
 
-#: network/netconnect.pm:780
+#: network/netconnect.pm:818
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10418,24 +10639,24 @@ msgstr ""
 "Selleks vajate Alcateli Microcode'i.\n"
 "Seda saate alla laadida võrgust\n"
 "%s\n"
-"ja saadud 'mgmt.o' kopeerige kataloogi /usr/share/speedtouch"
+"ja saadud \"mgmt.o\" kopeerige kataloogi /usr/share/speedtouch"
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:889
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:850
+#: network/netconnect.pm:890
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:853
+#: network/netconnect.pm:893
 #, c-format
 msgid "Encapsulation:"
 msgstr "Kapseldus: "
 
-#: network/netconnect.pm:870
+#: network/netconnect.pm:910
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10448,12 +10669,17 @@ msgstr ""
 "\n"
 "Te leiate draiveri aadressil http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:882
+#: network/netconnect.pm:922
 #, c-format
 msgid "Manually load a driver"
 msgstr "Draiveri käsitsilaadimine"
 
-#: network/netconnect.pm:898
+#: network/netconnect.pm:922
+#, c-format
+msgid "Use a Windows driver (with ndiswrapper)"
+msgstr "Windowsi draiveri kasutamine (ndiswrapper'iga)"
+
+#: network/netconnect.pm:940
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -10465,7 +10691,7 @@ msgstr ""
 "Allolevate väljade muutmine tühistab varasema seadistuse.\n"
 "Kas soovite kindlasti seadet uuesti seadistada?"
 
-#: network/netconnect.pm:912 network/netconnect.pm:1340
+#: network/netconnect.pm:954 network/netconnect.pm:1436
 #, c-format
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
@@ -10474,17 +10700,17 @@ msgstr ""
 "Õnnitleme, võrk ja Internetiühendus on seadistatud.\n"
 "\n"
 
-#: network/netconnect.pm:929
+#: network/netconnect.pm:971
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf masina nimi"
 
-#: network/netconnect.pm:930 network/netconnect.pm:963
+#: network/netconnect.pm:972 network/netconnect.pm:1005
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Võrgukaardi %s (draiver %s) seadistamine"
 
-#: network/netconnect.pm:931
+#: network/netconnect.pm:973
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10493,7 +10719,7 @@ msgstr ""
 "Ethernet-ühenduse seadistamiseks saab kasutada järgmisi protokolle. Palun "
 "valige, millist soovite kasutada"
 
-#: network/netconnect.pm:964
+#: network/netconnect.pm:1006
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10504,95 +10730,120 @@ msgstr ""
 "Kõik read tuleb sisestada IP-aadressi kujul\n"
 "(näiteks 12.34.56.78)"
 
-#: network/netconnect.pm:971
+#: network/netconnect.pm:1013
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Masinanimi omistatakse DHCP aadressist"
 
-#: network/netconnect.pm:972
+#: network/netconnect.pm:1014
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP masinanimi"
 
-#: network/netconnect.pm:977 standalone/drakconnect:328
-#: standalone/drakconnect:881 standalone/drakgw:323
+#: network/netconnect.pm:1019 standalone/drakconnect:330
+#: standalone/drakconnect:880 standalone/drakgw:320
 #, c-format
 msgid "Netmask"
 msgstr "Võrgumask"
 
-#: network/netconnect.pm:979 standalone/drakconnect:413
+#: network/netconnect.pm:1021 standalone/drakconnect:415
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "Võrgukaadi ID tuvastus (kasulik sülearvutite puhul)"
 
-#: network/netconnect.pm:980 standalone/drakconnect:414
+#: network/netconnect.pm:1022 standalone/drakconnect:416
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Võrgu kohene valmidus (hotplugging)"
 
-#: network/netconnect.pm:982 standalone/drakconnect:408
+#: network/netconnect.pm:1024 standalone/drakconnect:410
 #, c-format
 msgid "Start at boot"
 msgstr "Käivitub alglaadimisel"
 
-#: network/netconnect.pm:985 standalone/drakconnect:884
+#: network/netconnect.pm:1027 standalone/drakconnect:883
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klient"
 
-#: network/netconnect.pm:995 printer/printerdrake.pm:1498
-#: standalone/drakconnect:648
+#: network/netconnect.pm:1037 printer/printerdrake.pm:1605
+#: standalone/drakconnect:649
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
-msgstr "IP aadress peab olema kujul 1.2.3.4"
+msgstr "IP-aadress peab olema kujul 1.2.3.4"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1041
 #, c-format
 msgid "Warning: IP address %s is usually reserved!"
-msgstr "Hoiatus : IP aadress %s on tavaliselt reserveeritud!"
+msgstr "Hoiatus : IP-aadress %s on tavaliselt reserveeritud!"
 
-#: network/netconnect.pm:1004 standalone/drakTermServ:1690
-#: standalone/drakTermServ:1691 standalone/drakTermServ:1692
+#: network/netconnect.pm:1046 standalone/drakTermServ:1742
+#: standalone/drakTermServ:1743 standalone/drakTermServ:1744
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s on juba kasutusel\n"
 
-#: network/netconnect.pm:1030 network/netconnect.pm:1059
+#: network/netconnect.pm:1067
+#, c-format
+msgid "Choose an ndiswrapper driver"
+msgstr "Ndiswrapper-draiveri valimine"
+
+#: network/netconnect.pm:1068 network/netconnect.pm:1075
+#, c-format
+msgid "Install a new driver"
+msgstr "Uue draiveri paigaldamine"
+
+#: network/netconnect.pm:1068
+#, c-format
+msgid "Use already installed driver (%s)"
+msgstr "Juba paigaldatud draiveri (%s) kasutamine"
+
+#: network/netconnect.pm:1072 printer/printerdrake.pm:3644
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "Ei õnnestunud paigaldada %s paketti!"
+
+#: network/netconnect.pm:1076
+#, c-format
+msgid "Please select the Windows driver (.inf file)"
+msgstr "Palun valige Windowsi draiver (.inf-fail)"
+
+#: network/netconnect.pm:1126 network/netconnect.pm:1155
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Palun sisestage selle traadita võrgu kaardi parameetrid:"
 
-#: network/netconnect.pm:1033 standalone/drakconnect:380
+#: network/netconnect.pm:1129 standalone/drakconnect:382
 #, c-format
 msgid "Operating Mode"
-msgstr "Tööresiim"
+msgstr "Töörežiim"
 
-#: network/netconnect.pm:1035 standalone/drakconnect:381
+#: network/netconnect.pm:1131 standalone/drakconnect:383
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Võrgu nimi (ESSID)"
 
-#: network/netconnect.pm:1036 standalone/drakconnect:382
+#: network/netconnect.pm:1132 standalone/drakconnect:384
 #, c-format
 msgid "Network ID"
 msgstr "Võrgu ID"
 
-#: network/netconnect.pm:1037 standalone/drakconnect:383
+#: network/netconnect.pm:1133 standalone/drakconnect:385
 #, c-format
 msgid "Operating frequency"
 msgstr "Töösagedus"
 
-#: network/netconnect.pm:1038 standalone/drakconnect:384
+#: network/netconnect.pm:1134 standalone/drakconnect:386
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Tundlikkuslävi"
 
-#: network/netconnect.pm:1039 standalone/drakconnect:385
+#: network/netconnect.pm:1135 standalone/drakconnect:387
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitikiirus (b/s)"
 
-#: network/netconnect.pm:1045
+#: network/netconnect.pm:1141
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10601,7 +10852,7 @@ msgstr ""
 "Sagedus peab sisaldama sufiksit k, M või G (näiteks \"2.46G\" - 2,46 GHz "
 "sagedusel) või tuleb lisada piisavalt nulle."
 
-#: network/netconnect.pm:1049
+#: network/netconnect.pm:1145
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10610,12 +10861,12 @@ msgstr ""
 "Kiirus peab sisaldama sufiksit k, M või G (näiteks \"11M\") või tuleb lisada "
 "piisavalt nulle."
 
-#: network/netconnect.pm:1062 standalone/drakconnect:396
+#: network/netconnect.pm:1158 standalone/drakconnect:398
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:1063
+#: network/netconnect.pm:1159
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10635,17 +10886,17 @@ 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."
 
-#: network/netconnect.pm:1070 standalone/drakconnect:397
+#: network/netconnect.pm:1166 standalone/drakconnect:399
 #, c-format
 msgid "Fragmentation"
 msgstr "Killustus"
 
-#: network/netconnect.pm:1071 standalone/drakconnect:398
+#: network/netconnect.pm:1167 standalone/drakconnect:400
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Käsu iwconfig lisaargumendid"
 
-#: network/netconnect.pm:1072
+#: network/netconnect.pm:1168
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10661,12 +10912,12 @@ msgstr ""
 "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
-#: network/netconnect.pm:1079 standalone/drakconnect:399
+#: network/netconnect.pm:1175 standalone/drakconnect:401
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "Käsu iwspy lisaargumendid"
 
-#: network/netconnect.pm:1080
+#: network/netconnect.pm:1176
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10677,7 +10928,7 @@ msgid ""
 "\n"
 "See iwpspy(8) man page for further information."
 msgstr ""
-"Käsku iwspy kasutatakse aadresside loendi määramiseks traadita\n"
+"Käsku iwspy kasutatakse aadresside nimekirja määramiseks traadita\n"
 "võrgu kaardil ning kõigi nende kvaliteedi teadaandmiseks.\n"
 "\n"
 "See on sama info, mida pakub /proc/net/wireless:\n"
@@ -10685,12 +10936,12 @@ msgstr ""
 "\n"
 "Täpsemat infot annab man-lehekülg iwspy(8)."
 
-#: network/netconnect.pm:1088 standalone/drakconnect:400
+#: network/netconnect.pm:1184 standalone/drakconnect:402
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Käsu iwpriv lisaargumendid"
 
-#: network/netconnect.pm:1089
+#: network/netconnect.pm:1185
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10717,7 +10968,7 @@ msgstr ""
 "\n"
 "Täpsemat infot annab man-lehekülg iwpriv(8)."
 
-#: network/netconnect.pm:1163
+#: network/netconnect.pm:1259
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10727,72 +10978,72 @@ msgid ""
 msgstr ""
 "Palun sisestage oma masina nimi.\n"
 "Masina nimi peab olema esitatud täiskujul,\n"
-"näiteks ``minumasin.minufirma.ee''.\n"
-"Kui Teil on vaikelüüs, siis sisestage ka selle IP aadress."
+"näiteks \"minumasin.minufirma.ee\".\n"
+"Kui Teil on vaikelüüs, siis sisestage ka selle IP-aadress."
 
-#: network/netconnect.pm:1167
+#: network/netconnect.pm:1263
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr "Ja lõpuks tuleks määrata ka nimeserveri IP aadressid."
+msgstr "Ja lõpuks tuleks määrata ka nimeserveri IP-aadressid."
 
-#: network/netconnect.pm:1169 standalone/drakconnect:997
+#: network/netconnect.pm:1265 standalone/drakconnect:996
 #, c-format
 msgid "Host name (optional)"
 msgstr "Masinanimi (pole kohustuslik)"
 
-#: network/netconnect.pm:1169
+#: network/netconnect.pm:1265
 #, c-format
 msgid "Host name"
 msgstr "Masinanimi"
 
-#: network/netconnect.pm:1171
+#: network/netconnect.pm:1267
 #, c-format
 msgid "DNS server 1"
 msgstr "Nimeserver 1"
 
-#: network/netconnect.pm:1172
+#: network/netconnect.pm:1268
 #, c-format
 msgid "DNS server 2"
 msgstr "Nimeserver 2"
 
-#: network/netconnect.pm:1173
+#: network/netconnect.pm:1269
 #, c-format
 msgid "DNS server 3"
 msgstr "Nimeserver 3"
 
-#: network/netconnect.pm:1174
+#: network/netconnect.pm:1270
 #, c-format
 msgid "Search domain"
 msgstr "Otsingudomeen"
 
-#: network/netconnect.pm:1175
+#: network/netconnect.pm:1271
 #, 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"
 
-#: network/netconnect.pm:1176
+#: network/netconnect.pm:1272
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Vaikelüüs (nt %s)"
 
-#: network/netconnect.pm:1178
+#: network/netconnect.pm:1274
 #, c-format
 msgid "Gateway device"
 msgstr "Lüüsipoolne seade"
 
-#: network/netconnect.pm:1187
+#: network/netconnect.pm:1283
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Nimeserveri aadress peab olema kujul 1.2.3.4"
 
-#: network/netconnect.pm:1192 standalone/drakconnect:651
+#: network/netconnect.pm:1288 standalone/drakconnect:652
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Lüüsi aadress peab olema kujul 1.2.3.4"
 
-#: network/netconnect.pm:1203
+#: network/netconnect.pm:1299
 #, c-format
 msgid ""
 "If desired, enter a Zeroconf hostname.\n"
@@ -10800,22 +11051,23 @@ msgid ""
 "its shared resources that are not managed by the network.\n"
 "It is not necessary on most networks."
 msgstr ""
-"Soovi korral sisestage Zeroconf masina nimi.\n"
-"See on Teie masina nimi, mida kasutatakse kõigi\n"
-"selliste jagatud ressursside teatamiseks, mida võrk ei halda.\n"
+"Soovi korral sisestage Zeroconfi masinanimi.\n"
+"See on Teie masina nimi, mida kasutatakse kõigist\n"
+"sellistest jagatud ressurssidest teatamiseks,\n"
+"mida ei hallata tavapäraste võrguseadistustega.\n"
 "Enamikus võrkudes pole see vajalik."
 
-#: network/netconnect.pm:1207
+#: network/netconnect.pm:1303
 #, c-format
 msgid "Zeroconf Host name"
-msgstr "Zeroconf masina nimi"
+msgstr "Zeroconfi masinanimi"
 
-#: network/netconnect.pm:1210
+#: network/netconnect.pm:1306
 #, c-format
 msgid "Zeroconf host name must not contain a ."
-msgstr "Zeroconfi masina nimi ei tohi sisaldada punkti (.)"
+msgstr "Zeroconfi masinanimi ei tohi sisaldada punkti (.)"
 
-#: network/netconnect.pm:1220
+#: network/netconnect.pm:1316
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10826,52 +11078,52 @@ msgstr ""
 "Valige palun see, mida soovite kasutada.\n"
 "\n"
 
-#: network/netconnect.pm:1222
+#: network/netconnect.pm:1318
 #, c-format
 msgid "Internet connection"
 msgstr "Internetiühendus"
 
-#: network/netconnect.pm:1230
+#: network/netconnect.pm:1326
 #, c-format
 msgid "Configuration is complete, do you want to apply settings?"
 msgstr "Seadistamine on lõpetatud. Kas soovite seda nüüd rakendada?"
 
-#: network/netconnect.pm:1240
+#: network/netconnect.pm:1336
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Kas soovite luua ühenduse juba alglaadimisel?"
 
-#: network/netconnect.pm:1258
+#: network/netconnect.pm:1354
 #, c-format
 msgid "Automatically at boot"
 msgstr "Automaatselt alglaadimisel"
 
-#: network/netconnect.pm:1260
+#: network/netconnect.pm:1356
 #, c-format
 msgid "By using Net Applet in the system tray"
 msgstr "Võrguapleti kasutamisel paneelil"
 
-#: network/netconnect.pm:1262
+#: network/netconnect.pm:1358
 #, c-format
 msgid "Manually (the interface would still be activated at boot)"
 msgstr "Käsitsi (liides tuleb siiski alglaadimisel aktiveerida)"
 
-#: network/netconnect.pm:1271
+#: network/netconnect.pm:1367
 #, c-format
 msgid "How do you want to dial this connection?"
 msgstr "Kuidas soovite ühenduse luua?"
 
-#: network/netconnect.pm:1284
+#: network/netconnect.pm:1380
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it?"
 msgstr "Võrk tuleb uuesti käivitada. Kas soovite seda teha?"
 
-#: network/netconnect.pm:1291 network/netconnect.pm:1356
+#: network/netconnect.pm:1387 network/netconnect.pm:1452
 #, c-format
 msgid "Network Configuration"
-msgstr "Võrgu seadistused"
+msgstr "Võrgu seadistamine"
 
-#: network/netconnect.pm:1292
+#: network/netconnect.pm:1388
 #, c-format
 msgid ""
 "A problem occurred while restarting the network: \n"
@@ -10882,36 +11134,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1300
+#: network/netconnect.pm:1396
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Kas soovite oma Internetiühendust proovida?"
 
-#: network/netconnect.pm:1308 standalone/drakconnect:1029
+#: network/netconnect.pm:1404 standalone/drakconnect:1028
 #, c-format
 msgid "Testing your connection..."
 msgstr "Testime Teie ühendust..."
 
-#: network/netconnect.pm:1324
+#: network/netconnect.pm:1420
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Süsteem on nüüd Internetti ühendatud."
 
-#: network/netconnect.pm:1325
+#: network/netconnect.pm:1421
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Turvakaalutlusel katkestatakse nüüd ühendus."
 
-#: network/netconnect.pm:1326
+#: network/netconnect.pm:1422
 #, c-format
 msgid ""
-"The system doesn't seem to be connected to the Internet.\n"
+"The system does not seem to be connected to the Internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
 "Paistab, et süsteem ei ole Internetti ühendatud.\n"
 "Palun seadistage ühendus uuesti."
 
-#: network/netconnect.pm:1343
+#: network/netconnect.pm:1439
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10920,18 +11172,18 @@ msgstr ""
 "Soovitame uuesti käivitada ka X keskkonna, et vältida võimalikke\n"
 "masinanime muutmisest tingitud probleeme."
 
-#: network/netconnect.pm:1344
+#: network/netconnect.pm:1440
 #, c-format
 msgid ""
 "Problems occurred during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection doesn't "
+"Test your connection via net_monitor or mcc. If your connection does not "
 "work, you might want to relaunch the configuration."
 msgstr ""
 "Seadistamisel esines probleeme.\n"
 "Kontrollige oma ühendust net_monitor või mcc abil. Kui ühendus ei tööta, "
 "tuleks see uuesti seadistada."
 
-#: network/netconnect.pm:1357
+#: network/netconnect.pm:1453
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10940,10 +11192,10 @@ msgid ""
 "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"
 
-#: network/netconnect.pm:1393
+#: network/netconnect.pm:1491
 #, c-format
 msgid ""
 "An unexpected error has happened:\n"
@@ -10952,38 +11204,38 @@ msgstr ""
 "Tekkis ootamatu viga:\n"
 "%s"
 
-#: network/network.pm:316
+#: network/network.pm:319
 #, c-format
 msgid "Proxies configuration"
-msgstr "Vahendajate seadistused"
+msgstr "Puhverserverite seadistamine"
 
-#: network/network.pm:317
+#: network/network.pm:320
 #, c-format
 msgid "HTTP proxy"
-msgstr "HTTP vahendaja"
+msgstr "HTTP puhverserver"
 
-#: network/network.pm:318
+#: network/network.pm:321
 #, c-format
 msgid "FTP proxy"
-msgstr "FTP vahendaja"
+msgstr "FTP puhverserver"
 
-#: network/network.pm:321
+#: network/network.pm:324
 #, c-format
 msgid "Proxy should be http://..."
-msgstr "Vahendaja peab olema kujul http://..."
+msgstr "Puhverserver peab olema kujul http://..."
 
-#: network/network.pm:322
+#: network/network.pm:325
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
-msgstr "URLi alguses peab olema 'ftp:' või 'http:'"
+msgstr "URLi alguses peab olema \"ftp:\" või \"http:\""
 
 #
-#: network/shorewall.pm:28
+#: network/shorewall.pm:25
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Leiti tulemüüri seadistused!"
 
-#: network/shorewall.pm:29
+#: network/shorewall.pm:26
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10992,7 +11244,7 @@ msgstr ""
 "Hoiatus! Leiti olemasolevad tulemüüri seadistused. Tõenäoliselt peaksite "
 "need hiljem üle vaatama."
 
-#: network/shorewall.pm:78 standalone/drakgw:220 standalone/drakvpn:214
+#: network/shorewall.pm:91 standalone/drakgw:217 standalone/drakvpn:214
 #, c-format
 msgid ""
 "Please enter the name of the interface connected to the internet.\n"
@@ -11009,39 +11261,39 @@ msgstr ""
 "\t\teth0 või eth1 kaabliühenduse korral, \n"
 "\t\tippp+ ISDN ühenduse korral.\n"
 
-#: network/tools.pm:197
+#: network/tools.pm:181
 #, c-format
 msgid "Insert floppy"
 msgstr "Sisestage diskett"
 
-#: network/tools.pm:198
+#: network/tools.pm:182
 #, 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 vajutage %s"
+"ning klõpsakse nupule \"%s\""
 
-#: network/tools.pm:199
+#: network/tools.pm:187
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
 msgstr "Disketile ei õnnestunud ligi pääseda ega haakida seadet %s"
 
-#: partition_table.pm:393
+#: partition_table.pm:397
 #, c-format
 msgid "mount failed: "
 msgstr "haakimine ebaõnnestus: "
 
-#: partition_table.pm:498
+#: partition_table.pm:502
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Sellel platvormil ei saa laiendatud partitsiooni luua"
 
-#: partition_table.pm:516
+#: partition_table.pm:520
 #, c-format
 msgid ""
-"You have a hole in your partition table but I can't use it.\n"
+"You have a hole in your partition table but I can not use it.\n"
 "The only solution is to move your primary partitions to have the hole next "
 "to the extended partitions."
 msgstr ""
@@ -11049,22 +11301,22 @@ msgstr ""
 "Ainuke lahendus on nihutada primaarset partitsiooni, et \"auk\" satuks "
 "laiendatud partitsioonide kõrvale."
 
-#: partition_table.pm:602
+#: partition_table.pm:611
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Taastamine failist %s ebaõnnestus: %s"
 
-#: partition_table.pm:604
+#: partition_table.pm:613
 #, c-format
 msgid "Bad backup file"
 msgstr "Kõlbmatu varukoopia"
 
-#: partition_table.pm:624
+#: partition_table.pm:633
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Viga faili %s kirjutamisel"
 
-#: partition_table/raw.pm:238
+#: partition_table/raw.pm:240
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -11104,77 +11356,77 @@ msgstr "võib olla"
 #: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
-msgstr "(masinal %s)"
+msgstr "(masinas %s)"
 
 #: printer/cups.pm:103
 #, c-format
 msgid "(on this machine)"
-msgstr "(sellel masinal)"
+msgstr "(selles masinas)"
 
-#: printer/cups.pm:115 standalone/printerdrake:203
+#: printer/cups.pm:115 standalone/printerdrake:187
 #, c-format
 msgid "Configured on other machines"
-msgstr "Seadistatud muudel masinatel"
+msgstr "Seadistatud muudes masinates"
 
 #: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
-msgstr "CUPS serveril \"%s\""
+msgstr "CUPS-serveris \"%s\""
 
-#: printer/cups.pm:117 printer/printerdrake.pm:4290
-#: printer/printerdrake.pm:4300 printer/printerdrake.pm:4445
-#: printer/printerdrake.pm:4456 printer/printerdrake.pm:4651
+#: printer/cups.pm:117 printer/printerdrake.pm:4650
+#: printer/printerdrake.pm:4660 printer/printerdrake.pm:4805
+#: printer/printerdrake.pm:4816 printer/printerdrake.pm:5011
 #, c-format
 msgid " (Default)"
 msgstr " (Vaikimisi)"
 
-#: printer/data.pm:40
+#: printer/data.pm:56
 #, c-format
-msgid "PDQ - Print, Don't Queue"
+msgid "PDQ - Print, Do not Queue"
 msgstr "PDQ - Trüki kohe"
 
-#: printer/data.pm:41
+#: printer/data.pm:57
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:53
+#: printer/data.pm:69
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LDP - Otsetrükkimisdeemon"
 
-#: printer/data.pm:54
+#: printer/data.pm:70
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:76
+#: printer/data.pm:91
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR, uus põlvkond"
 
-#: printer/data.pm:77
+#: printer/data.pm:92
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:103
+#: printer/data.pm:117
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Tavaline UNIXi trükkimissüsteem"
 
-#: printer/data.pm:132
+#: printer/data.pm:147
 #, c-format
 msgid "CUPS - Common Unix Printing System (remote server)"
-msgstr "CUPS - Tavaline UNIXi trükkimissüsteem (kaugserver)"
+msgstr "CUPS - Tavaline UNIXi trükkimissüsteem (võrguserver)"
 
-#: printer/data.pm:133
+#: printer/data.pm:148
 #, c-format
 msgid "Remote CUPS"
-msgstr "CUPS kaugserver"
+msgstr "CUPS-võrguserver"
 
-#: printer/detect.pm:149 printer/detect.pm:227 printer/detect.pm:429
-#: printer/detect.pm:466
+#: printer/detect.pm:153 printer/detect.pm:236 printer/detect.pm:438
+#: printer/detect.pm:475
 #, c-format
 msgid "Unknown Model"
 msgstr "Tundmatu mudel"
@@ -11192,12 +11444,12 @@ msgstr "Võrguprinter"
 #: printer/main.pm:29
 #, c-format
 msgid "Printer on remote CUPS server"
-msgstr "CUPS printserver"
+msgstr "CUPS-serveri printer"
 
-#: printer/main.pm:30 printer/printerdrake.pm:1521
+#: printer/main.pm:30 printer/printerdrake.pm:1628
 #, c-format
 msgid "Printer on remote lpd server"
-msgstr "lpd printserver"
+msgstr "Lpd-serveri printer"
 
 #: printer/main.pm:31
 #, c-format
@@ -11207,14 +11459,14 @@ msgstr "Võrguprinter (TCP/Socket)"
 #: printer/main.pm:32
 #, c-format
 msgid "Printer on SMB/Windows 95/98/NT server"
-msgstr "SMB/Windows 95/98/NT printserver"
+msgstr "SMB/Windows 95/98/NT serveri printer"
 
 #: printer/main.pm:33
 #, c-format
 msgid "Printer on NetWare server"
 msgstr "NetWare printserver"
 
-#: printer/main.pm:34 printer/printerdrake.pm:1525
+#: printer/main.pm:34 printer/printerdrake.pm:1632
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "Printeri seadme URI"
@@ -11224,192 +11476,238 @@ msgstr "Printeri seadme URI"
 msgid "Pipe job into a command"
 msgstr "Töö toru kaudu käsuks"
 
-#: printer/main.pm:321 printer/main.pm:604 printer/main.pm:1635
-#: printer/main.pm:2331 printer/main.pm:2340 printer/printerdrake.pm:874
-#: printer/printerdrake.pm:1981 printer/printerdrake.pm:4688
+#. Translation of the "(recommended)" in printer driver entries
+#: printer/main.pm:45
+#, c-format
+msgid "recommended"
+msgstr "soovitatav"
+
+#: printer/main.pm:324 printer/main.pm:629 printer/main.pm:1664
+#: printer/main.pm:2699 printer/main.pm:2708 printer/printerdrake.pm:903
+#: printer/printerdrake.pm:2094 printer/printerdrake.pm:5048
 #, c-format
 msgid "Unknown model"
 msgstr "Tundmatu mudel"
 
-#: printer/main.pm:346 standalone/printerdrake:202
+#: printer/main.pm:349 standalone/printerdrake:186
 #, c-format
 msgid "Configured on this machine"
-msgstr "Seadistatud sellel masinal"
+msgstr "Seadistatud selles masinas"
 
-#: printer/main.pm:352 printer/printerdrake.pm:1069
+#: printer/main.pm:355 printer/printerdrake.pm:1175
 #, c-format
 msgid " on parallel port #%s"
 msgstr " paralleelpordis #%s"
 
-#: printer/main.pm:355 printer/printerdrake.pm:1072
+#: printer/main.pm:358 printer/printerdrake.pm:1178
 #, c-format
 msgid ", USB printer #%s"
-msgstr ", USB printer #%s"
+msgstr ", USB-printer #%s"
 
-#: printer/main.pm:357
+#: printer/main.pm:360
 #, c-format
 msgid ", USB printer"
-msgstr ", USB printer"
+msgstr ", USB-printer"
+
+#: printer/main.pm:364
+#, c-format
+msgid ", HP printer on a parallel port"
+msgstr ", HP printer paralleelpordis"
 
-#: printer/main.pm:362
+#: printer/main.pm:366
+#, c-format
+msgid ", HP printer on USB"
+msgstr ", HP USB-printer"
+
+#: printer/main.pm:368
+#, c-format
+msgid ", HP printer on HP JetDirect"
+msgstr ", HP printer HP JetDirectil"
+
+#: printer/main.pm:370
+#, c-format
+msgid ", HP printer"
+msgstr ", HP printer"
+
+#: printer/main.pm:376
 #, c-format
 msgid ", multi-function device on parallel port #%s"
 msgstr ", mitme funktsiooniga seade paralleelpordis #%s"
 
-#: printer/main.pm:365
+#: printer/main.pm:379
 #, c-format
 msgid ", multi-function device on a parallel port"
 msgstr ", mitme funktsiooniga seade paralleelpordis"
 
-#: printer/main.pm:367
+#: printer/main.pm:381
 #, c-format
 msgid ", multi-function device on USB"
 msgstr ", mitme funktsiooniga seade USB-l"
 
-#: printer/main.pm:369
+#: printer/main.pm:383
 #, c-format
 msgid ", multi-function device on HP JetDirect"
 msgstr ", mitme funktsiooniga seade HP JetDirectil"
 
-#: printer/main.pm:371
+#: printer/main.pm:385
 #, c-format
 msgid ", multi-function device"
 msgstr ", mitme funktsiooniga seade"
 
-#: printer/main.pm:375
+#: printer/main.pm:389
 #, c-format
 msgid ", printing to %s"
-msgstr ", trükkimine masinal %s"
+msgstr ", trükkimine masinas %s"
 
-#: printer/main.pm:378
+#: printer/main.pm:392
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
-msgstr " LPD serveril \"%s\", printer \"%s\""
+msgstr " LPD-serveris \"%s\", printer \"%s\""
 
-#: printer/main.pm:381
+#: printer/main.pm:395
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
-msgstr ", TCP/IP masinal \"%s\", port %s"
+msgstr ", TCP/IP masinas \"%s\", port %s"
 
-#: printer/main.pm:386
+#: printer/main.pm:400
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
-msgstr " SMB/Windowsi serveril \"%s\", jagatud printer \"%s\""
+msgstr " SMB/Windowsi serveris \"%s\", jagatud printer \"%s\""
 
-#: printer/main.pm:391
+#: printer/main.pm:405
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
-msgstr " Novelli serveril \"%s\", printer \"%s\""
+msgstr " Novelli serveris \"%s\", printer \"%s\""
 
-#: printer/main.pm:394
+#: printer/main.pm:408
 #, c-format
 msgid ", using command %s"
 msgstr ", kasutades käsku %s"
 
-#: printer/main.pm:409
+#: printer/main.pm:423
 #, c-format
 msgid "Parallel port #%s"
 msgstr "Paralleelpordis #%s"
 
-#: printer/main.pm:412 printer/printerdrake.pm:1090
-#: printer/printerdrake.pm:1117 printer/printerdrake.pm:1135
+#: printer/main.pm:426 printer/printerdrake.pm:1196
+#: printer/printerdrake.pm:1223 printer/printerdrake.pm:1241
 #, c-format
 msgid "USB printer #%s"
-msgstr "USB printer #%s"
+msgstr "USB-printer #%s"
 
-#: printer/main.pm:414
+#: printer/main.pm:428
 #, c-format
 msgid "USB printer"
-msgstr "USB printer"
+msgstr "USB-printer"
 
-#: printer/main.pm:419
+#: printer/main.pm:432
+#, c-format
+msgid "HP printer on a parallel port"
+msgstr "HP printer paralleelpordis"
+
+#: printer/main.pm:434
+#, c-format
+msgid "HP printer on USB"
+msgstr "HP USB-printer"
+
+#: printer/main.pm:436
+#, c-format
+msgid "HP printer on HP JetDirect"
+msgstr "HP printer HP JetDirectil"
+
+#: printer/main.pm:438
+#, c-format
+msgid "HP printer"
+msgstr "HP printer"
+
+#: printer/main.pm:444
 #, c-format
 msgid "Multi-function device on parallel port #%s"
 msgstr "Mitme funktsiooniga seade paralleelpordis #%s"
 
-#: printer/main.pm:422
+#: printer/main.pm:447
 #, c-format
 msgid "Multi-function device on a parallel port"
 msgstr "Mitme funktsiooniga seade paralleelpordis"
 
-#: printer/main.pm:424
+#: printer/main.pm:449
 #, c-format
 msgid "Multi-function device on USB"
 msgstr "Mitme funktsiooniga seade USB-l"
 
-#: printer/main.pm:426
+#: printer/main.pm:451
 #, c-format
 msgid "Multi-function device on HP JetDirect"
 msgstr "Mitme funktsiooniga seade HP JetDirectil"
 
-#: printer/main.pm:428
+#: printer/main.pm:453
 #, c-format
 msgid "Multi-function device"
 msgstr "Mitme funktsiooniga seade"
 
-#: printer/main.pm:432
+#: printer/main.pm:457
 #, c-format
 msgid "Prints into %s"
-msgstr "Trükkimine masinal %s"
+msgstr "Trükkimine masinas %s"
 
-#: printer/main.pm:435
+#: printer/main.pm:460
 #, c-format
 msgid "LPD server \"%s\", printer \"%s\""
-msgstr "LPD serveril \"%s\", printer \"%s\""
+msgstr "LPD-serveris \"%s\", printer \"%s\""
 
-#: printer/main.pm:438
+#: printer/main.pm:463
 #, c-format
 msgid "TCP/IP host \"%s\", port %s"
-msgstr "TCP/IP masinal \"%s\", port %s"
+msgstr "TCP/IP masinas \"%s\", port %s"
 
-#: printer/main.pm:443
+#: printer/main.pm:468
 #, c-format
 msgid "SMB/Windows server \"%s\", share \"%s\""
-msgstr "SMB/Windowsi serveril \"%s\", jagatud printer \"%s\""
+msgstr "SMB/Windowsi serveris \"%s\", jagatud printer \"%s\""
 
-#: printer/main.pm:448
+#: printer/main.pm:473
 #, c-format
 msgid "Novell server \"%s\", printer \"%s\""
-msgstr "Novelli serveril \"%s\", printer \"%s\""
+msgstr "Novelli serveris \"%s\", printer \"%s\""
 
-#: printer/main.pm:451
+#: printer/main.pm:476
 #, c-format
 msgid "Uses command %s"
 msgstr "Kasutades käsku %s"
 
-#: printer/main.pm:453
+#: printer/main.pm:478
 #, c-format
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:601 printer/printerdrake.pm:820
-#: printer/printerdrake.pm:2584
+#: printer/main.pm:626 printer/printerdrake.pm:849
+#: printer/printerdrake.pm:2861
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "Toorprinter (draiverita)"
 
-#: printer/main.pm:1147 printer/printerdrake.pm:205
+#: printer/main.pm:1176 printer/printerdrake.pm:205
 #: printer/printerdrake.pm:217
 #, c-format
 msgid "Local network(s)"
 msgstr "Kohalik võrk"
 
-#: printer/main.pm:1149 printer/printerdrake.pm:221
+#: printer/main.pm:1178 printer/printerdrake.pm:221
 #, c-format
 msgid "Interface \"%s\""
 msgstr "Liides \"%s\""
 
-#: printer/main.pm:1151
+#: printer/main.pm:1180
 #, c-format
 msgid "Network %s"
 msgstr "Võrk %s"
 
-#: printer/main.pm:1153
+#: printer/main.pm:1182
 #, c-format
 msgid "Host %s"
 msgstr "Masin %s"
 
-#: printer/main.pm:1182
+#: printer/main.pm:1211
 #, c-format
 msgid "%s (Port %s)"
 msgstr "%s (port %s)"
@@ -11427,15 +11725,15 @@ msgid ""
 msgstr ""
 "HP LaserJet 1000 vajab pärast sisselülitamist püsivara laadimist. Laadige HP "
 "veebileheküljelt alla Windowsi draiveripakett (püsivara printeri CD-l ei "
-"toimi) ning pakkige püsivarafail lahti, kasutades 'unzip' utiliiti ning "
-"otsides faili 'sihp1000.img'. Kopeerige fail kataloogi '/etc/printer'. Seal "
+"toimi) ning pakkige püsivarafail lahti, kasutades programmi \"unzip\" ning "
+"otsides faili \"sihp1000.img\". Kopeerige fail kataloogi /etc/printer. Seal "
 "suudab automaatne laadimisskript selle üles leida ja laadida iga kord, kui "
 "printer on ühendatud ja sisse lülitatud.\n"
 
 #: printer/printerdrake.pm:61
 #, c-format
 msgid "CUPS printer configuration"
-msgstr "CUPS printeri seadistused"
+msgstr "CUPS-printeri seadistamine"
 
 #: printer/printerdrake.pm:62
 #, c-format
@@ -11443,9 +11741,8 @@ msgid ""
 "Here you can choose whether the printers connected to this machine should be "
 "accessible by remote machines and by which remote machines."
 msgstr ""
-"Siin saate valida, millised selle arvuti külge kinnitatud printerid peaksid "
-"olema kättesaadavad ka teistele kohtvõrgu arvutitele ja millistele nende "
-"hulgast."
+"Siin saate valida, millised selle arvutiga ühendatud printerid peaksid olema "
+"kättesaadavad ka teistele kohtvõrgu arvutitele ja millistele nende hulgast. "
 
 #: printer/printerdrake.pm:63
 #, c-format
@@ -11469,23 +11766,23 @@ msgstr "Otsitakse automaatselt kõiki kättesaadavaid võrguprintereid"
 #: printer/printerdrake.pm:76
 #, c-format
 msgid "Printer sharing on hosts/networks: "
-msgstr "Printeri jagamine masinal/võrgus:"
+msgstr "Printeri jagamine masinas/võrgus: "
 
 #: printer/printerdrake.pm:78
 #, c-format
 msgid "Custom configuration"
 msgstr "Kohandatud seadistused"
 
-#: printer/printerdrake.pm:83 standalone/scannerdrake:562
-#: standalone/scannerdrake:579
+#: printer/printerdrake.pm:83 standalone/scannerdrake:593
+#: standalone/scannerdrake:610
 #, c-format
 msgid "No remote machines"
-msgstr "Ainult sellel masinal"
+msgstr "Ainult selles masinas"
 
 #: printer/printerdrake.pm:94
 #, c-format
 msgid "Additional CUPS servers: "
-msgstr "Täiendavad CUPS serverid: "
+msgstr "Täiendavad CUPS-serverid: "
 
 #: printer/printerdrake.pm:101
 #, c-format
@@ -11499,18 +11796,18 @@ msgid ""
 "address(es) and optionally the port number(s) here to get the printer "
 "information from the server(s)."
 msgstr ""
-"Juurdepääsu saamiseks CUPS serverite printeritele Teie kohtvõrgus tuleb vaid "
-"ära märkida võimalus \"Otsi automaatselt kõiki kättesaadavaid võrguprintereid"
-"\". CUPS serverid annavad Teie masinale automaatselt teada oma printeritest. "
-"Kõik Teie masinale parajasti kättesaadavad printerid on näidatud "
-"Printerdrake peaakna sektsioonis \"Võrguprinterid\". Kui CUPS server(id) ei "
-"asu kohtvõrgus, tuleb nende kohta info hankimiseks sisestada IP aadress(id) "
-"ning võimaluse/vajaduse korral ka pordi number."
+"Juurdepääsu saamiseks CUPS-serverite printeritele Teie kohtvõrgus tuleb vaid "
+"ära märkida võimalus \"Otsitakse automaatselt kõiki kättesaadavaid "
+"võrguprintereid\". CUPS-serverid annavad Teie masinale automaatselt teada "
+"oma printeritest. Kõik Teie masinale parajasti kättesaadavad printerid on "
+"näidatud Printerdrake'i peaakna sektsioonis \"Võrguprinterid\". Kui CUPS-"
+"server(id) ei asu kohtvõrgus, tuleb nende kohta info hankimiseks sisestada "
+"IP-aadress(id) ning võimaluse/vajaduse korral ka pordi number."
 
 #: printer/printerdrake.pm:109
 #, c-format
 msgid "Japanese text printing mode"
-msgstr "Jaapani teksti trükkimisresiim"
+msgstr "Jaapani teksti trükkimisrežiim"
 
 #: printer/printerdrake.pm:110
 #, c-format
@@ -11529,7 +11826,7 @@ msgstr ""
 "diakriitiliste märkidega tähti ega kohandada veeriseid, märgisuurust jne. "
 "See puudutab ainult käesoleva masinaga ühendatud printereid. Kui soovite "
 "trükkida jaapanikeelset teksti võrgus asuva masinaga ühendatud printeril, "
-"tuleb see funktsioon tollel masinal sisse lülitada."
+"tuleb see funktsioon tolles masinas sisse lülitada."
 
 #: printer/printerdrake.pm:117
 #, c-format
@@ -11552,7 +11849,7 @@ msgid ""
 "If some of these measures lead to problems for you, turn this option off, "
 "but then you have to take care of these points."
 msgstr ""
-"Kui see on sisse lülitatud, konrollitakse CUPSi igal käivitamisel "
+"Kui see on sisse lülitatud, kontrollitakse CUPS-i igal käivitamisel "
 "automaatselt, et\n"
 "\n"
 "- kui LPD/LPRng on paigaldatud, ei kirjutaks CUPS üle faili /etc/printcap\n"
@@ -11566,10 +11863,10 @@ msgstr ""
 "siis peate nende eest ise hoolt kandma."
 
 #: printer/printerdrake.pm:132 printer/printerdrake.pm:500
-#: printer/printerdrake.pm:3933
+#: printer/printerdrake.pm:4292
 #, c-format
 msgid "Remote CUPS server and no local CUPS daemon"
-msgstr "CUPS kaugserver ilma kohaliku CUPS deemonita"
+msgstr "CUPS-võrguserver ilma kohaliku CUPS-deemonita"
 
 #: printer/printerdrake.pm:135
 #, c-format
@@ -11590,9 +11887,9 @@ msgid ""
 "define local print queues then and if the specified server is down it cannot "
 "be printed at all from this machine."
 msgstr ""
-"Selles resiimis peatatakse kohalik CUPS deemon ja kõik trükkimissoovid "
-"saadetakse otse allpool määratavale serverile. Pange tähele, et sel juhul ei "
-"ole võimalik määrata kohalikke trükkimisjärjekordi ja kui määratud server ei "
+"Selles režiimis peatatakse kohalik CUPS-deemon ja kõik trükkimissoovid "
+"saadetakse otse siin määratud serverisse. Pange tähele, et sel juhul ei ole "
+"võimalik määrata kohalikke trükkimisjärjekordi ja kui määratud server ei "
 "peaks töötama, ei saa Teie masinast üldse midagi trükkida."
 
 #: printer/printerdrake.pm:155 printer/printerdrake.pm:230
@@ -11629,7 +11926,7 @@ msgstr "Eemalda valitud masin/võrk"
 #: printer/printerdrake.pm:273 printer/printerdrake.pm:291
 #, c-format
 msgid "IP address of host/network:"
-msgstr "Masina/võrgu IP aadress:"
+msgstr "Masina/võrgu IP-aadress:"
 
 #: printer/printerdrake.pm:231
 #, c-format
@@ -11643,17 +11940,17 @@ msgstr ""
 #: printer/printerdrake.pm:238
 #, c-format
 msgid "Host/network IP address missing."
-msgstr "Masina/võrgu IP aadress puudub."
+msgstr "Masina/võrgu IP-aadress puudub."
 
 #: printer/printerdrake.pm:246
 #, c-format
 msgid "The entered host/network IP is not correct.\n"
-msgstr "Sisestatud masina/võrgu IP aadress ei ole korrektne.\n"
+msgstr "Sisestatud masina/võrgu IP-aadress ei ole korrektne.\n"
 
 #: printer/printerdrake.pm:247 printer/printerdrake.pm:423
 #, c-format
 msgid "Examples for correct IPs:\n"
-msgstr "Korrektne IP aadress on näiteks:\n"
+msgstr "Korrektne IP-aadress on näiteks:\n"
 
 #: printer/printerdrake.pm:271
 #, c-format
@@ -11664,7 +11961,7 @@ msgstr ""
 #: printer/printerdrake.pm:340 printer/printerdrake.pm:410
 #, c-format
 msgid "Accessing printers on remote CUPS servers"
-msgstr "Ligipääs printeritele CUPS printserveril"
+msgstr "Ligipääs CUPS-serveri printeritele"
 
 #: printer/printerdrake.pm:341
 #, c-format
@@ -11673,7 +11970,7 @@ msgid ""
 "do this if the servers do not broadcast their printer information into the "
 "local network."
 msgstr ""
-"Lisage siia CUPS serverid, mille printereid soovite kasutada. Seda tuleb "
+"Lisage siia CUPS-serverid, mille printereid soovite kasutada. Seda tuleb "
 "teha ainult siis, kui serverid ei saada oma printeri(te) infot üldleviga "
 "kohtvõrku."
 
@@ -11696,7 +11993,7 @@ msgstr "Valitud serveri eemaldamine"
 #, c-format
 msgid "Enter IP address and port of the host whose printers you want to use."
 msgstr ""
-"Sisestage serveri IP aadress ja port, mille printereid soovite kasutada."
+"Sisestage serveri IP-aadress ja port, mille printereid soovite kasutada."
 
 #: printer/printerdrake.pm:412
 #, c-format
@@ -11711,9 +12008,9 @@ msgstr "Serveri IP puudub!"
 #: printer/printerdrake.pm:422
 #, c-format
 msgid "The entered IP is not correct.\n"
-msgstr "Sisestatud IP aadress ei ole korrektne.\n"
+msgstr "Sisestatud IP-aadress ei ole korrektne.\n"
 
-#: printer/printerdrake.pm:434 printer/printerdrake.pm:1744
+#: printer/printerdrake.pm:434 printer/printerdrake.pm:1852
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "Pordi number peab olema täisarv!"
@@ -11723,8 +12020,8 @@ msgstr "Pordi number peab olema täisarv!"
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "See server on juba nimekirjas ja seda ei ole võimalik uuesti lisada.\n"
 
-#: printer/printerdrake.pm:456 printer/printerdrake.pm:1765
-#: standalone/drakups:247 standalone/harddrake2:47
+#: printer/printerdrake.pm:456 printer/printerdrake.pm:1873
+#: standalone/drakups:247 standalone/harddrake2:50
 #, c-format
 msgid "Port"
 msgstr "Port"
@@ -11734,42 +12031,43 @@ msgstr "Port"
 #: printer/printerdrake.pm:530
 #, c-format
 msgid "On, Name or IP of remote server:"
-msgstr "Sees, kaugserveri nimi või IP:"
+msgstr "Sees, võrguserveri nimi või IP:"
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3942
-#: printer/printerdrake.pm:4007
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4301
+#: printer/printerdrake.pm:4366
 #, c-format
 msgid "CUPS server name or IP address missing."
-msgstr "CUPS serveri nimi või IP aadress puudub."
+msgstr "CUPS-serveri nimi või IP-aadress puudub."
 
 #: printer/printerdrake.pm:560 printer/printerdrake.pm:580
-#: printer/printerdrake.pm:649 printer/printerdrake.pm:714
-#: printer/printerdrake.pm:741 printer/printerdrake.pm:796
-#: printer/printerdrake.pm:838 printer/printerdrake.pm:848
-#: printer/printerdrake.pm:1818 printer/printerdrake.pm:2004
-#: printer/printerdrake.pm:2021 printer/printerdrake.pm:2064
-#: printer/printerdrake.pm:2104 printer/printerdrake.pm:2147
-#: printer/printerdrake.pm:2184 printer/printerdrake.pm:2194
-#: printer/printerdrake.pm:2437 printer/printerdrake.pm:2442
-#: printer/printerdrake.pm:2579 printer/printerdrake.pm:2689
-#: printer/printerdrake.pm:3247 printer/printerdrake.pm:3312
-#: printer/printerdrake.pm:3361 printer/printerdrake.pm:3364
-#: printer/printerdrake.pm:3484 printer/printerdrake.pm:3549
-#: printer/printerdrake.pm:3621 printer/printerdrake.pm:3642
-#: printer/printerdrake.pm:3651 printer/printerdrake.pm:3745
-#: printer/printerdrake.pm:3837 printer/printerdrake.pm:3843
-#: printer/printerdrake.pm:3863 printer/printerdrake.pm:3969
-#: printer/printerdrake.pm:4076 printer/printerdrake.pm:4095
-#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4117
-#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4749
-#: printer/printerdrake.pm:4826 standalone/printerdrake:64
-#: standalone/printerdrake:84 standalone/printerdrake:566
+#: printer/printerdrake.pm:673 printer/printerdrake.pm:739
+#: printer/printerdrake.pm:766 printer/printerdrake.pm:825
+#: printer/printerdrake.pm:867 printer/printerdrake.pm:877
+#: printer/printerdrake.pm:1926 printer/printerdrake.pm:2137
+#: printer/printerdrake.pm:2169 printer/printerdrake.pm:2217
+#: printer/printerdrake.pm:2269 printer/printerdrake.pm:2286
+#: printer/printerdrake.pm:2330 printer/printerdrake.pm:2370
+#: printer/printerdrake.pm:2420 printer/printerdrake.pm:2454
+#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2714
+#: printer/printerdrake.pm:2719 printer/printerdrake.pm:2856
+#: printer/printerdrake.pm:2966 printer/printerdrake.pm:3560
+#: printer/printerdrake.pm:3625 printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3677 printer/printerdrake.pm:3808
+#: printer/printerdrake.pm:3908 printer/printerdrake.pm:3980
+#: printer/printerdrake.pm:4001 printer/printerdrake.pm:4010
+#: printer/printerdrake.pm:4104 printer/printerdrake.pm:4196
+#: printer/printerdrake.pm:4202 printer/printerdrake.pm:4222
+#: printer/printerdrake.pm:4328 printer/printerdrake.pm:4435
+#: printer/printerdrake.pm:4454 printer/printerdrake.pm:4463
+#: printer/printerdrake.pm:4477 printer/printerdrake.pm:4673
+#: printer/printerdrake.pm:5109 printer/printerdrake.pm:5186
+#: standalone/printerdrake:67 standalone/printerdrake:554
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
 
-#: printer/printerdrake.pm:561 printer/printerdrake.pm:3550
-#: printer/printerdrake.pm:4077
+#: printer/printerdrake.pm:561 printer/printerdrake.pm:3909
+#: printer/printerdrake.pm:4436
 #, c-format
 msgid "Reading printer data..."
 msgstr "Printeri andmete lugemine..."
@@ -11777,19 +12075,19 @@ msgstr "Printeri andmete lugemine..."
 #: printer/printerdrake.pm:581
 #, c-format
 msgid "Restarting CUPS..."
-msgstr "CUPSi taaskäivitamine..."
+msgstr "CUPS-i taaskäivitamine..."
 
-#: printer/printerdrake.pm:606
+#: printer/printerdrake.pm:608 printer/printerdrake.pm:628
 #, c-format
 msgid "Select Printer Connection"
-msgstr "Valige printeri ühendusviis"
+msgstr "Printeri ühendusviisi valimine"
 
-#: printer/printerdrake.pm:607
+#: printer/printerdrake.pm:609
 #, c-format
 msgid "How is the printer connected?"
 msgstr "Kuidas on see printer ühendatud?"
 
-#: printer/printerdrake.pm:609
+#: printer/printerdrake.pm:611
 #, c-format
 msgid ""
 "\n"
@@ -11797,10 +12095,10 @@ msgid ""
 "printers will be automatically detected."
 msgstr ""
 "\n"
-"Kui võrgus on CUPS server, siis ei ole Teil vaja siin printereid seadistada, "
+"Kui võrgus on CUPS-server, siis ei ole Teil vaja siin printereid seadistada, "
 "need leitakse automaatselt."
 
-#: printer/printerdrake.pm:612 printer/printerdrake.pm:4315
+#: printer/printerdrake.pm:614 printer/printerdrake.pm:4675
 #, c-format
 msgid ""
 "\n"
@@ -11808,10 +12106,10 @@ msgid ""
 "detected nor tested!"
 msgstr ""
 "\n"
-"HOIATUS: kohtvõrk pole käivitatud, võrguprintereid ei saa seepärast ei "
+"HOIATUS: ühendus kohtvõrguga puudub, võrguprintereid ei saa seepärast ei "
 "tuvastada ega testida!"
 
-#: printer/printerdrake.pm:619
+#: printer/printerdrake.pm:621
 #, c-format
 msgid ""
 "Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
@@ -11819,22 +12117,48 @@ msgstr ""
 "Printeri automaattuvastus (kohalikud, TCP/Socketi, SMB printerid ja seadme "
 "URI)"
 
-#: printer/printerdrake.pm:649
+#: printer/printerdrake.pm:623
+#, c-format
+msgid "Modify timeout for network printer auto-detection"
+msgstr "Võrguprinteri automaatse tuvastamise aegumise muutmine"
+
+#: printer/printerdrake.pm:629
+#, c-format
+msgid "Enter the timeout for network printer auto-detection (in msec) here. "
+msgstr "Määrake siin võrguprinteri automaatse tuvastamise aegumine (msek)."
+
+#: printer/printerdrake.pm:631
+#, c-format
+msgid ""
+"The longer you choose the timeout, the more reliable the detections of "
+"network printers will be, but the scan can take longer then, especially if "
+"there are many machines with local firewalls in the network. "
+msgstr ""
+"Mida pikem aegumine valida, seda tõenäolisem on võrguprinteri tuvastamine, "
+"kuid seda kauem kulub võrgu uurimiseks aega, eriti kui kohalike "
+"tulemüüridega võrgus peaks olema palju masinaid."
+
+#: printer/printerdrake.pm:635
+#, c-format
+msgid "The timeout must be a positive integer number!"
+msgstr "Aegumine peab olema positiivne täisarv!"
+
+#: printer/printerdrake.pm:673
 #, c-format
 msgid "Checking your system..."
 msgstr "Süsteemi kontrollimine..."
 
-#: printer/printerdrake.pm:665
+#: printer/printerdrake.pm:690
 #, c-format
 msgid "and one unknown printer"
 msgstr "ja üks tundmatu printer"
 
-#: printer/printerdrake.pm:667
+#: printer/printerdrake.pm:692
 #, c-format
 msgid "and %d unknown printers"
 msgstr "ja %d tundmatut printerit"
 
-#: printer/printerdrake.pm:671
+#: printer/printerdrake.pm:696
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11847,7 +12171,7 @@ msgstr ""
 "%s%s\n"
 "printerid"
 
-#: printer/printerdrake.pm:673
+#: printer/printerdrake.pm:698
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11860,7 +12184,7 @@ msgstr ""
 "%s%s\n"
 "printer(id)"
 
-#: printer/printerdrake.pm:674
+#: printer/printerdrake.pm:699
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11873,7 +12197,7 @@ msgstr ""
 "%s%s\n"
 "printer"
 
-#: printer/printerdrake.pm:678
+#: printer/printerdrake.pm:703
 #, c-format
 msgid ""
 "\n"
@@ -11882,7 +12206,7 @@ msgstr ""
 "\n"
 "Üks tundmatu printer on Teie süsteemi otse ühendatud"
 
-#: printer/printerdrake.pm:679
+#: printer/printerdrake.pm:704
 #, c-format
 msgid ""
 "\n"
@@ -11891,18 +12215,18 @@ msgstr ""
 "\n"
 "%d tundmatut printerit on Teie süsteemi otse ühendatud"
 
-#: printer/printerdrake.pm:682
+#: printer/printerdrake.pm:707
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Ei leitud ühtegi printerit, mis oleks masinaga otse ühendatud"
 
-#: printer/printerdrake.pm:685
+#: printer/printerdrake.pm:710
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr " (Kontrollige, et kõik printerid on ühendatud ja sisse lülitatud).\n"
 
-#: printer/printerdrake.pm:698
+#: printer/printerdrake.pm:723
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -11911,23 +12235,23 @@ msgstr ""
 "Kas soovite trükkimist lubada ülalmainitud printeritel või printeritel Teie "
 "kohtvõrgus?\n"
 
-#: printer/printerdrake.pm:699
+#: printer/printerdrake.pm:724
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "Kas soovite trükkimist lubada printeritel Teie kohtvõrgus?\n"
 
-#: printer/printerdrake.pm:701
+#: printer/printerdrake.pm:726
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "Kas soovite trükkimist lubada ülalmainitud printeritel?\n"
 
-#: printer/printerdrake.pm:702
+#: printer/printerdrake.pm:727
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
-"Kas olete ikka kindel, et soovite seadistada trükkimist sellel masinal?\n"
+"Kas olete ikka kindel, et soovite seadistada trükkimist selles masinas?\n"
 
-#: printer/printerdrake.pm:703
+#: printer/printerdrake.pm:728
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11936,42 +12260,42 @@ msgstr ""
 "MÄRKUS: Sõltuvalt printeri mudelist ja trükkimissüsteemist paigaldatakse "
 "kuni %d MB lisatarkvara."
 
-#: printer/printerdrake.pm:742
+#: printer/printerdrake.pm:767
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Uute printerite otsimine..."
 
-#: printer/printerdrake.pm:797
+#: printer/printerdrake.pm:826
 #, c-format
 msgid "Found printer on %s..."
 msgstr "Leiti printer asukohas %s..."
 
-#: printer/printerdrake.pm:822
+#: printer/printerdrake.pm:851
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:823
+#: printer/printerdrake.pm:852
 #, c-format
 msgid " on "
-msgstr " masinal "
+msgstr " masinas "
 
-#: printer/printerdrake.pm:824 standalone/scannerdrake:137
+#: printer/printerdrake.pm:853 standalone/scannerdrake:137
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:829 printer/printerdrake.pm:2591
+#: printer/printerdrake.pm:858 printer/printerdrake.pm:2868
 #, c-format
 msgid "Printer model selection"
 msgstr "Printeri mudeli valik"
 
-#: printer/printerdrake.pm:830 printer/printerdrake.pm:2592
+#: printer/printerdrake.pm:859 printer/printerdrake.pm:2869
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "Milline on Teie printeri mudel?"
 
-#: printer/printerdrake.pm:831
+#: printer/printerdrake.pm:860
 #, c-format
 msgid ""
 "\n"
@@ -11984,33 +12308,34 @@ msgstr ""
 "Printerdrake ei suutnud määrata Teie printeri %s mudelit. Valige palun õige "
 "mudel nimekirjast."
 
-#: printer/printerdrake.pm:834 printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:863 printer/printerdrake.pm:2874
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
 msgstr ""
-"Kui Teie printerit loendis ei leidu, valige mõni ühilduv (vaadake printeri "
-"käsiraamatust) või sarnane."
+"Kui Teie printerit nimekirjas ei leidu, valige mõni ühilduv (vaadake "
+"printeri käsiraamatust) või sarnane."
 
-#: printer/printerdrake.pm:839
+#: printer/printerdrake.pm:868
 #, c-format
 msgid "Configuring printer on %s..."
 msgstr "Printeri seadistamine asukohas %s..."
 
-#: printer/printerdrake.pm:849 printer/printerdrake.pm:4096
+#: printer/printerdrake.pm:878 printer/printerdrake.pm:4455
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "Printeri \"%s\" seadistamine..."
 
-#: printer/printerdrake.pm:932 printer/printerdrake.pm:944
-#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1987
-#: printer/printerdrake.pm:4332 printer/printerdrake.pm:4501
+#: printer/printerdrake.pm:1036 printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1107 printer/printerdrake.pm:2103
+#: printer/printerdrake.pm:2118 printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4861
 #, c-format
 msgid "Add a new printer"
-msgstr "Lisa uus printer"
+msgstr "Uue printeri lisamine"
 
-#: printer/printerdrake.pm:933
+#: printer/printerdrake.pm:1037
 #, c-format
 msgid ""
 "\n"
@@ -12033,7 +12358,7 @@ msgstr ""
 "tähendab olemasolevad printeridraiverid, draiveri valikud ja printeri "
 "ühendusviis."
 
-#: printer/printerdrake.pm:946
+#: printer/printerdrake.pm:1050
 #, c-format
 msgid ""
 "\n"
@@ -12048,8 +12373,8 @@ msgid ""
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-"
 "detection of only the printers connected to this machine. So turn off the "
-"auto-detection of network and/or Windows-hosted printers when you don't need "
-"it.\n"
+"auto-detection of network and/or Windows-hosted printers when you do not "
+"need it.\n"
 "\n"
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
 "to set up your printer(s) now."
@@ -12070,10 +12395,10 @@ msgstr ""
 "seda vaja ei ole, lülitage võrgus ja/või Windowsi taga olevate printeri(te) "
 "automaattuvastus välja.\n"
 "\n"
-"Kui olete valmis, vajutage \"Järgmine\", või \"Loobu\", kui Te ei soovi "
+"Kui olete valmis, klõpsake nupule \"Edasi\", või \"Loobu\", kui Te ei soovi "
 "printeri(te) seadistamisega praegu tegelda."
 
-#: printer/printerdrake.pm:955
+#: printer/printerdrake.pm:1059
 #, c-format
 msgid ""
 "\n"
@@ -12098,10 +12423,10 @@ msgstr ""
 "see/need arvutiga ja lülitage sisse, et seda/neid saaks automaatselt "
 "tuvastada.\n"
 "\n"
-"Kui olete valmis, vajutage \"Järgmine\", või \"Loobu\", kui Te ei soovi "
+"Kui olete valmis, klõpsake nupule \"Edasi\", või \"Loobu\", kui Te ei soovi "
 "praegu printeri(te) seadistamisega tegelda."
 
-#: printer/printerdrake.pm:963
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid ""
 "\n"
@@ -12116,7 +12441,7 @@ msgid ""
 "\n"
 "Note that auto-detecting printers on the network takes longer than the auto-"
 "detection of only the printers connected to this machine. So turn off the "
-"auto-detection of network printers when you don't need it.\n"
+"auto-detection of network printers when you do not need it.\n"
 "\n"
 " Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
 "to set up your printer(s) now."
@@ -12135,10 +12460,10 @@ msgstr ""
 "ainult selle masinaga ühendatud printeri(te) automaatne tuvastamine. Nii et "
 "kui te seda ei vaja, lülitage võrguprinterite automaattuvastus välja.\n"
 "\n"
-"Kui olete valmis, vajutage \"Järgmine\", või \"Loobu\", kui Te ei soovi "
+"Kui olete valmis, klõpsake nupule \"Edasi\", või \"Loobu\", kui Te ei soovi "
 "praegu printeri(te) seadistamisega tegelda."
 
-#: printer/printerdrake.pm:972
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid ""
 "\n"
@@ -12163,25 +12488,25 @@ msgstr ""
 "see/need arvutiga ja lülitage sisse, et seda/neid saaks automaatselt "
 "tuvastada.\n"
 "\n"
-"Kui olete valmis, vajutage \"Järgmine\", või \"Loobu\", kui Te ei soovi "
+"Kui olete valmis, klõpsake nupule \"Edasi\", või \"Loobu\", kui Te ei soovi "
 "praegu printeri(te) seadistamisega tegelda."
 
-#: printer/printerdrake.pm:981
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Selle masinaga ühendatud printerite automaattuvastus"
 
-#: printer/printerdrake.pm:984
+#: printer/printerdrake.pm:1088
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Kohtvõrku ühendatud printerite automaattuvastus"
 
-#: printer/printerdrake.pm:987
+#: printer/printerdrake.pm:1091
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "Microsoft Windowsi masinatega ühendatud printerite automaattuvastus"
 
-#: printer/printerdrake.pm:1003
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid ""
 "\n"
@@ -12204,70 +12529,71 @@ msgstr ""
 "muuta vaikeseadistusi (trükikvaliteet, paberisalv,...), valige %s "
 "juhtimiskeskuse \"Riistvara\" sektsioonis \"Printer\"."
 
-#: printer/printerdrake.pm:1038 printer/printerdrake.pm:1267
-#: printer/printerdrake.pm:1329 printer/printerdrake.pm:1419
-#: printer/printerdrake.pm:1556 printer/printerdrake.pm:1631
-#: printer/printerdrake.pm:1782 printer/printerdrake.pm:1865
-#: printer/printerdrake.pm:1874 printer/printerdrake.pm:1883
-#: printer/printerdrake.pm:1894 printer/printerdrake.pm:2010
-#: printer/printerdrake.pm:2076 printer/printerdrake.pm:2111
+#: printer/printerdrake.pm:1143 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1435 printer/printerdrake.pm:1525
+#: printer/printerdrake.pm:1663 printer/printerdrake.pm:1738
+#: printer/printerdrake.pm:1890 printer/printerdrake.pm:1976
+#: printer/printerdrake.pm:1985 printer/printerdrake.pm:1994
+#: printer/printerdrake.pm:2005 printer/printerdrake.pm:2143
+#: printer/printerdrake.pm:2229 printer/printerdrake.pm:2275
+#: printer/printerdrake.pm:2342 printer/printerdrake.pm:2377
 #, c-format
 msgid "Could not install the %s packages!"
 msgstr "Ei õnnestunud paigaldada %s paketti!"
 
-#: printer/printerdrake.pm:1040
+#: printer/printerdrake.pm:1145
 #, c-format
 msgid "Skipping Windows/SMB server auto-detection"
 msgstr "Windows/SMB serveri automaattuvastus jäetakse vahele"
 
-#: printer/printerdrake.pm:1046 printer/printerdrake.pm:1190
-#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
+#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1296
+#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Printeri automaattuvastus"
 
-#: printer/printerdrake.pm:1046
+#: printer/printerdrake.pm:1151
 #, c-format
 msgid "Detecting devices..."
 msgstr "Seadmete otsimine..."
 
-#: printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1181
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", võrguprinter \"%s\", port %s"
 
-#: printer/printerdrake.pm:1078
+#: printer/printerdrake.pm:1184
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
-msgstr ", printer \"%s\" SMB/Windows serveril \"%s\""
+msgstr ", printer \"%s\" SMB/Windows serveris \"%s\""
 
-#: printer/printerdrake.pm:1082
+#: printer/printerdrake.pm:1188
 #, c-format
 msgid "Detected %s"
 msgstr "Tuvastati %s"
 
-#: printer/printerdrake.pm:1087 printer/printerdrake.pm:1114
-#: printer/printerdrake.pm:1132
+#: printer/printerdrake.pm:1193 printer/printerdrake.pm:1220
+#: printer/printerdrake.pm:1238
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "Printer paralleelpordis #%s"
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Võrguprinter \"%s\", port %s"
 
-#: printer/printerdrake.pm:1096
+#: printer/printerdrake.pm:1202
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "Printer \"%s\" SMB/Windows serveril \"%s\""
+msgstr "Printer \"%s\" SMB/Windows serveris \"%s\""
 
-#: printer/printerdrake.pm:1177
+#: printer/printerdrake.pm:1283
 #, c-format
 msgid "Local Printer"
 msgstr "Kohalik printer"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1284
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -12280,32 +12606,32 @@ msgstr ""
 "mille vasteks teistes süsteemides on LPT1, LPT2...; esimene USB printer: /"
 "dev/usb/lp0, teine USB printer: /dev/usb/lp1...)"
 
-#: printer/printerdrake.pm:1182
+#: printer/printerdrake.pm:1288
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Seadme- või failinime sisestamine on kohustuslik!"
 
-#: printer/printerdrake.pm:1191
+#: printer/printerdrake.pm:1297
 #, c-format
 msgid "No printer found!"
 msgstr "Printerit ei leitud!"
 
-#: printer/printerdrake.pm:1199
+#: printer/printerdrake.pm:1305
 #, c-format
 msgid "Local Printers"
 msgstr "Kohalikud printerid"
 
-#: printer/printerdrake.pm:1200
+#: printer/printerdrake.pm:1306
 #, c-format
 msgid "Available printers"
 msgstr "Saadaolevad printerid"
 
-#: printer/printerdrake.pm:1204 printer/printerdrake.pm:1213
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1319
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "See printer tuvastati automaatselt. "
 
-#: printer/printerdrake.pm:1206
+#: printer/printerdrake.pm:1312
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -12314,18 +12640,18 @@ msgstr ""
 "Kui see ei ole printer, mida soovite seadistada, kirjutage sisendireale "
 "seadmenimi/failinimi"
 
-#: printer/printerdrake.pm:1207
+#: printer/printerdrake.pm:1313
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "Soovi korral võite ka sisendireal määrata seadmenime/failinime"
 
-#: printer/printerdrake.pm:1208 printer/printerdrake.pm:1217
+#: printer/printerdrake.pm:1314 printer/printerdrake.pm:1323
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "Nimekiri kõigist automaatselt tuvastatud printeritest. "
 
-#: printer/printerdrake.pm:1210
+#: printer/printerdrake.pm:1316
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -12334,7 +12660,7 @@ msgstr ""
 "Valige palun printer, mida soovite seadistada, või kirjutage sisendireale "
 "seadmenimi/failinimi"
 
-#: printer/printerdrake.pm:1211
+#: printer/printerdrake.pm:1317
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -12343,7 +12669,7 @@ msgstr ""
 "Valige palun printer, kuhu trükitööd tuleks saata, või kirjutage "
 "sisendireale seadmenimi/failinimi"
 
-#: printer/printerdrake.pm:1215
+#: printer/printerdrake.pm:1321
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12354,12 +12680,12 @@ msgstr ""
 "tuvastati valesti või Te eelistate seadistusi korrigeerida, lülitage sisse "
 "\"Käsitsiseadistamine\"."
 
-#: printer/printerdrake.pm:1216
+#: printer/printerdrake.pm:1322
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Praegu ei ole ühtegi teist võimalust"
 
-#: printer/printerdrake.pm:1219
+#: printer/printerdrake.pm:1325
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12371,12 +12697,12 @@ msgstr ""
 "toimima täiesti automaatselt. Kui printer tuvastati valesti või Te eelistate "
 "selle seadistusi korrigeerida, lülitage sisse \"Käsitsiseadistamine\"."
 
-#: printer/printerdrake.pm:1220
+#: printer/printerdrake.pm:1326
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Valige palun printer, kuhu tuleks saata trükitööd."
 
-#: printer/printerdrake.pm:1222
+#: printer/printerdrake.pm:1328
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -12385,12 +12711,12 @@ msgstr ""
 "Valige palun port, kuhu printer on ühendatud, või kirjutage sisendireale "
 "seadmenimi/failinimi"
 
-#: printer/printerdrake.pm:1223
+#: printer/printerdrake.pm:1329
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Valige palun port, kuhu Teie printer on ühendatud."
 
-#: printer/printerdrake.pm:1225
+#: printer/printerdrake.pm:1331
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12400,91 +12726,91 @@ msgstr ""
 "LPT1:, LPT2:...; esimene USB printer: /dev/usb/lp0, teine USB printer: /dev/"
 "usb/lp1...)"
 
-#: printer/printerdrake.pm:1229
+#: printer/printerdrake.pm:1335
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Printeri/seadme valimine/sisestamine on kohustuslik!"
 
-#: printer/printerdrake.pm:1269 printer/printerdrake.pm:1331
-#: printer/printerdrake.pm:1421 printer/printerdrake.pm:1558
-#: printer/printerdrake.pm:1633 printer/printerdrake.pm:1784
-#: printer/printerdrake.pm:1867 printer/printerdrake.pm:1876
-#: printer/printerdrake.pm:1885 printer/printerdrake.pm:1896
+#: printer/printerdrake.pm:1375 printer/printerdrake.pm:1437
+#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1665
+#: printer/printerdrake.pm:1740 printer/printerdrake.pm:1892
+#: printer/printerdrake.pm:1978 printer/printerdrake.pm:1987
+#: printer/printerdrake.pm:1996 printer/printerdrake.pm:2007
 #, c-format
 msgid "Aborting"
 msgstr "Katkestamine"
 
-#: printer/printerdrake.pm:1304
+#: printer/printerdrake.pm:1410
 #, c-format
 msgid "Remote lpd Printer Options"
-msgstr "Võrguprinteri (lpd) seadistused"
+msgstr "Võrguprinteri (lpd) valikud"
 
-#: printer/printerdrake.pm:1305
+#: printer/printerdrake.pm:1411
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
 "server and the printer name on that server."
 msgstr ""
 "Et kasutada teise masina lpd printerit, peate sisestama printserveri nime ja "
-"serveril kasutatava printeri nime."
+"serveris kasutatava printeri nime."
 
-#: printer/printerdrake.pm:1306
+#: printer/printerdrake.pm:1412
 #, c-format
 msgid "Remote host name"
-msgstr "Kaugarvuti nimi"
+msgstr "Võrgumasina nimi"
 
-#: printer/printerdrake.pm:1307
+#: printer/printerdrake.pm:1413
 #, c-format
 msgid "Remote printer name"
 msgstr "Võrguprinteri nimi"
 
-#: printer/printerdrake.pm:1310
+#: printer/printerdrake.pm:1416
 #, c-format
 msgid "Remote host name missing!"
-msgstr "Kaugarvuti nimi puudub!"
+msgstr "Võrgumasina nimi puudub!"
 
-#: printer/printerdrake.pm:1314
+#: printer/printerdrake.pm:1420
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Võrguprinteri nimi puudub!"
 
-#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
-#: standalone/drakTermServ:429 standalone/drakTermServ:726
-#: standalone/drakTermServ:742 standalone/drakTermServ:1405
-#: standalone/drakTermServ:1413 standalone/drakTermServ:1424
-#: standalone/drakbackup:513 standalone/drakbackup:619
-#: standalone/drakbackup:654 standalone/drakbackup:774
-#: standalone/harddrake2:237
+#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
+#: standalone/drakTermServ:445 standalone/drakTermServ:747
+#: standalone/drakTermServ:764 standalone/drakTermServ:1480
+#: standalone/drakTermServ:1488 standalone/drakTermServ:1500
+#: standalone/drakbackup:512 standalone/drakbackup:618
+#: standalone/drakbackup:653 standalone/drakbackup:773
+#: standalone/harddrake2:256
 #, c-format
 msgid "Information"
 msgstr "Info"
 
-#: printer/printerdrake.pm:1343 printer/printerdrake.pm:1914
+#: printer/printerdrake.pm:1449 printer/printerdrake.pm:2025
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Tuvastati mudel: %s %s"
 
-#: printer/printerdrake.pm:1425 printer/printerdrake.pm:1678
+#: printer/printerdrake.pm:1531 printer/printerdrake.pm:1785
 #, c-format
 msgid "Scanning network..."
 msgstr "Võrgu uurimine..."
 
-#: printer/printerdrake.pm:1436 printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1543 printer/printerdrake.pm:1564
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
-msgstr ", printer \"%s\" serveril \"%s\""
+msgstr ", printer \"%s\" serveris \"%s\""
 
-#: printer/printerdrake.pm:1439 printer/printerdrake.pm:1460
+#: printer/printerdrake.pm:1546 printer/printerdrake.pm:1567
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
-msgstr "Printer \"%s\" serveril \"%s\""
+msgstr "Printer \"%s\" serveris \"%s\""
 
-#: printer/printerdrake.pm:1481
+#: printer/printerdrake.pm:1588
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
-msgstr "SMB (Windows 9x/NT) printeri seadistused"
+msgstr "SMB (Windows 9x/NT) printeri valikud"
 
-#: printer/printerdrake.pm:1482
+#: printer/printerdrake.pm:1589
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12495,58 +12821,58 @@ msgstr ""
 "Et trükkida SMB printeril, peate andma vastava serveri SMB nime\n"
 "(NB! See ei pruugi kokku langeda TCP/IP nimega!) ja võib-olla ka\n"
 "printserveri IP-aadressi, samuti ka serveri poolt jagatava printeri\n"
-"nime ning serveri poolt aktsepteeritud kasutajatunnuse, salasõna ja töögrupi."
+"nime ning serveri poolt aktsepteeritud kasutajatunnuse, parooli ja töögrupi."
 
-#: printer/printerdrake.pm:1483
+#: printer/printerdrake.pm:1590
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
-" Kui soovitud printer tuvastati automaatselt, valige see loendist ning "
+" Kui soovitud printer tuvastati automaatselt, valige see nimekirjast ning "
 "lisage siis vajadusel kasutajatunnus, parool ja/või töögrupp."
 
-#: printer/printerdrake.pm:1485
+#: printer/printerdrake.pm:1592
 #, c-format
 msgid "SMB server host"
 msgstr "SMB serveri nimi"
 
-#: printer/printerdrake.pm:1486
+#: printer/printerdrake.pm:1593
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB serveri IP"
 
-#: printer/printerdrake.pm:1487
+#: printer/printerdrake.pm:1594
 #, c-format
 msgid "Share name"
 msgstr "Jagatav printer"
 
-#: printer/printerdrake.pm:1490
+#: printer/printerdrake.pm:1597
 #, c-format
 msgid "Workgroup"
 msgstr "Töögrupp"
 
-#: printer/printerdrake.pm:1492
+#: printer/printerdrake.pm:1599
 #, c-format
 msgid "Auto-detected"
 msgstr "Automaatselt tuvastatud"
 
-#: printer/printerdrake.pm:1502
+#: printer/printerdrake.pm:1609
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Andma peab kas serveri nime või serveri IP!"
 
-#: printer/printerdrake.pm:1506
+#: printer/printerdrake.pm:1613
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Samba jagatava printeri nimi puudub!"
 
-#: printer/printerdrake.pm:1512
+#: printer/printerdrake.pm:1619
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "TURVAHOIATUS!"
 
-#: printer/printerdrake.pm:1513
+#: printer/printerdrake.pm:1620
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -12571,15 +12897,15 @@ msgid ""
 msgstr ""
 "Asusite seadistama trükkimist Windowsi parooliga kontole. Samba kliendi "
 "arhitektuuri vea tõttu pannakse parool tavalise tekstina Samba kliendi "
-"käsureale, mida see kasutab trükitöö saatmiseks Windowsi serverile. Seejärel "
-"on tolle masina igal kasutajal võimalik parooli ekraanil näha näiteks käsuga "
-"\"ps auxwww\".\n"
+"käsureale, mida see kasutab trükitöö saatmiseks Windowsi serverisse. "
+"Seejärel on tolle masina igal kasutajal võimalik parooli ekraanil näha "
+"näiteks käsuga \"ps auxwww\".\n"
 "\n"
 "Soovitame selle asemel kasutada üht alltoodud alternatiividest (igatahes "
-"tuleks teil tagada, et Teie Windowsi serverile pääsevad ligi ainult "
+"tuleks teil tagada, et Teie Windowsi serverisse pääsevad ligi ainult "
 "kohtvõrgu masinad; selleks sobib hästi kasutada tulemüüri):\n"
 "\n"
-"Kasutage Windowsi serveril paroolitut kontot, olgu selleks konto \"GUEST\" "
+"Kasutage Windowsi serveris paroolitut kontot, olgu selleks konto \"GUEST\" "
 "või spetsiaalne trükkimiseks kasutatav konto. Ärge eemaldage aga "
 "paroolikaitset oma erakontolt ega administraatori kontolt.\n"
 "\n"
@@ -12588,7 +12914,7 @@ msgstr ""
 "\".\n"
 "\n"
 
-#: printer/printerdrake.pm:1523
+#: printer/printerdrake.pm:1630
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12597,11 +12923,11 @@ msgid ""
 "\n"
 msgstr ""
 "Seadistage oma Windows-server nii, et printer oleks kättesaadav IPP "
-"protokolliga, ning seadistage trükkimine sellelt masinalt \"%s\" "
-"ühendustüübiga Printerdrakes.\n"
+"protokolliga, ning seadistage trükkimine sellest masinast \"%s\" "
+"ühendustüübiga Printerdrake'is.\n"
 "\n"
 
-#: printer/printerdrake.pm:1526
+#: printer/printerdrake.pm:1633
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12609,17 +12935,17 @@ msgid ""
 "\n"
 "Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
-"Ühendage oma printer Linux-serveri külge ja lubage oma Windowsi masina(te)l "
+"Ühendage oma printer Linuxi serveriga ja lubage oma Windowsi masina(te)l "
 "sellega ühendust võtta kliendina.\n"
 "\n"
 "Kas soovite tõesti jätkata selle printeri seadistamist?"
 
-#: printer/printerdrake.pm:1604
+#: printer/printerdrake.pm:1711
 #, c-format
 msgid "NetWare Printer Options"
-msgstr "NetWare printeri seadistused"
+msgstr "NetWare printeri valikud"
 
-#: printer/printerdrake.pm:1605
+#: printer/printerdrake.pm:1712
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12629,54 +12955,54 @@ msgid ""
 msgstr ""
 "Et kasutada NetWare printerit, peate sisestama NetWare printserveri nime "
 "(NB! See võib olla erinev tema TCP/IP nimest!), samuti trükijärjekorra nime "
-"serveril ning kasutajatunnuse ja salasõna."
+"serveris ning kasutajatunnuse ja parooli."
 
-#: printer/printerdrake.pm:1606
+#: printer/printerdrake.pm:1713
 #, c-format
 msgid "Printer Server"
 msgstr "Printserver"
 
-#: printer/printerdrake.pm:1607
+#: printer/printerdrake.pm:1714
 #, c-format
 msgid "Print Queue Name"
 msgstr "Trükijärjekorra nimi"
 
-#: printer/printerdrake.pm:1612
+#: printer/printerdrake.pm:1719
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCP serveri nimi puudub!"
 
-#: printer/printerdrake.pm:1616
+#: printer/printerdrake.pm:1723
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCP järjekorra nimi puudub!"
 
-#: printer/printerdrake.pm:1689 printer/printerdrake.pm:1709
+#: printer/printerdrake.pm:1797 printer/printerdrake.pm:1817
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", masin \"%s\", port %s"
 
-#: printer/printerdrake.pm:1692 printer/printerdrake.pm:1712
+#: printer/printerdrake.pm:1800 printer/printerdrake.pm:1820
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "Masin \"%s\", port %s"
 
-#: printer/printerdrake.pm:1733
+#: printer/printerdrake.pm:1841
 #, c-format
 msgid "TCP/Socket Printer Options"
-msgstr "TCP/Socket printeri seadistused"
+msgstr "TCP/Socket printeri valikud"
 
-#: printer/printerdrake.pm:1735
+#: printer/printerdrake.pm:1843
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
 "or IP and the optional port number (default is 9100) in the input fields."
 msgstr ""
-"Valige loendist üks automaatselt tuvastatud printeritest või kirjutage "
+"Valige nimekirjast üks automaatselt tuvastatud printeritest või kirjutage "
 "sisendiväljale masinanimi või IP ja kui teate, ka pordi number (vaikimisi on "
 "see 9100)."
 
-#: printer/printerdrake.pm:1736
+#: printer/printerdrake.pm:1844
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12689,27 +13015,27 @@ msgstr ""
 "serveritel on pordi number tavaliselt 9100, teistel serveritel võib see olla "
 "teistsugune. Kontrollige seda oma riistvara käsiraamatust."
 
-#: printer/printerdrake.pm:1740
+#: printer/printerdrake.pm:1848
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Printeri masinanimi või IP puudub!"
 
-#: printer/printerdrake.pm:1763
+#: printer/printerdrake.pm:1871
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Printeri masinanimi või IP"
 
-#: printer/printerdrake.pm:1819
+#: printer/printerdrake.pm:1927
 #, c-format
 msgid "Refreshing Device URI list..."
 msgstr "Printeri andmete värskendamine..."
 
-#: printer/printerdrake.pm:1822 printer/printerdrake.pm:1824
+#: printer/printerdrake.pm:1930 printer/printerdrake.pm:1932
 #, c-format
 msgid "Printer Device URI"
 msgstr "Printeri seadme URI"
 
-#: printer/printerdrake.pm:1823
+#: printer/printerdrake.pm:1931
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12717,114 +13043,200 @@ msgid ""
 "are supported by all the spoolers."
 msgstr ""
 "Siin saab määrata konkreetse URI printerile ligipääsuks. URI peab järgima "
-"CUPSi või Foomaticu spetsifikatsiooni. Pange tähele, et mitte kõik spuulerid "
-"ei toeta kõiki URI tüüpe."
+"CUPS-i või Foomaticu spetsifikatsiooni. Pange tähele, et mitte kõik "
+"spuulerid ei toeta kõiki URI tüüpe."
 
-#: printer/printerdrake.pm:1846
+#: printer/printerdrake.pm:1957
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Sisestama peab sobiva URI!"
 
-#: printer/printerdrake.pm:1949
+#: printer/printerdrake.pm:2060
 #, c-format
 msgid "Pipe into command"
 msgstr "Töö toru kaudu käsuks"
 
-#: printer/printerdrake.pm:1950
+#: printer/printerdrake.pm:2061
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
 "piped instead of being sent directly to a printer."
 msgstr "Siin saate määrata printeri asemele suvalise käsurea."
 
-#: printer/printerdrake.pm:1951
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Command line"
 msgstr "Käsurida"
 
-#: printer/printerdrake.pm:1955
+#: printer/printerdrake.pm:2066
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Sisestama peab käsurea!"
 
-#: printer/printerdrake.pm:1988
+#: printer/printerdrake.pm:2104
+#, c-format
+msgid ""
+"On many HP printers there are special functions available, maintenance (ink "
+"level checking, nozzle cleaning. head alignment, ...) on all not too old "
+"inkjets, scanning on multi-function devices, and memory card access on "
+"printers with card readers. "
+msgstr ""
+"Paljudel HP printeritel on erifunktsioone, näiteks hoolduseks (tinditaseme "
+"kontroll, pea puhastamine ja joondamine ja nii edasi...) enamikul uuematel "
+"tindiprinteritel, skaneerimiseks mitmefunktsionaalsetel seadmetel ning "
+"mälukaardi kasutamiseks kaardilugejaga printeritel. "
+
+#: printer/printerdrake.pm:2106
+#, c-format
+msgid ""
+"To access these extra functions on your HP printer, it must be set up with "
+"the appropriate software: "
+msgstr ""
+"Selliste HP printerite lisafunktsioonide pruukimiseks tuleb paigaldada ka "
+"vastav tarkvara: "
+
+#: printer/printerdrake.pm:2107
+#, c-format
+msgid ""
+"Either with the newer HPLIP which allows printer maintenance through the "
+"easy-to-use graphical application \"Toolbox\" and four-edge full-bleed on "
+"newer PhotoSmart models "
+msgstr ""
+"kas uuem HPLIP, mis võimaldab printeri hooldamist väga lihtsa graafilise "
+"rakendusega \"Toolbox\" ning neljavärvitrükki uuematel PhotoSmarti mudelitel "
+
+#: printer/printerdrake.pm:2108
+#, c-format
+msgid ""
+"or with the older HPOJ which allows only scanner and memory card access, but "
+"could help you in case of failure of HPLIP. "
+msgstr ""
+"või vanem HPOJ, mis võimaldab küll ainult skänneri ja mälukaardi kasutamist, "
+"kuid võib välja aidata, kui HPLIP miskipärast toime ei tule."
+
+#: printer/printerdrake.pm:2110
+#, c-format
+msgid "What is your choice (choose \"None\" for non-HP printers)? "
+msgstr "Milline on Teie valik (valige \"Puudub\", kui Teil pole HP printerit)?"
+
+#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2112
+#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2144
+#: printer/printerdrake.pm:2170
+#, c-format
+msgid "HPLIP"
+msgstr "HPLIP"
+
+#: printer/printerdrake.pm:2111 printer/printerdrake.pm:2114
+#: printer/printerdrake.pm:2270 printer/printerdrake.pm:2276
+#: printer/printerdrake.pm:2287
+#, c-format
+msgid "HPOJ"
+msgstr "HPOJ"
+
+#: printer/printerdrake.pm:2119
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
-"LaserJet 1100/1200/1220/3200/3300 with scanner, DeskJet 450, Sony IJP-V100), "
-"an HP PhotoSmart or an HP LaserJet 2200?"
+"LaserJet 1100/1200/1220/3000/3200/3300/4345 with scanner, DeskJet 450, Sony "
+"IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
 "Kas Teie printer on mitmefunktsionaalne HP või Sony toode (OfficeJet, PSC, "
-"LaserJet 1100/1200/1220/3200/3300 skänneriga, DeskJet 450, Sony IJP-V100) "
-"või vahest HP PhotoSmart ehk siis HP LaserJet 2200?"
+"LaserJet 1100/1200/1220/3000/3200/3300/4345 skänneriga, DeskJet 450, Sony "
+"IJP-V100) või vahest HP PhotoSmart ehk siis HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:2005
+#: printer/printerdrake.pm:2138 printer/printerdrake.pm:2270
 #, c-format
-msgid "Installing HPOJ package..."
-msgstr "HPOJ pakettide paigaldamine..."
+msgid "Installing %s package..."
+msgstr "%s pakettide paigaldamine..."
 
-#: printer/printerdrake.pm:2012
+#: printer/printerdrake.pm:2145 printer/printerdrake.pm:2277
 #, c-format
 msgid "Only printing will be possible on the %s."
 msgstr "%s korral on võimalik ainult trükkimine."
 
-#: printer/printerdrake.pm:2022 printer/printerdrake.pm:2148
+#: printer/printerdrake.pm:2160
+#, c-format
+msgid "Could not remove your old HPOJ configuration file %s for your %s! "
+msgstr ""
+"Vana HPOJ konfiguratsioonifaili %s (%s jaoks) eemaldamine ebaõnnestus! "
+
+#: printer/printerdrake.pm:2162
+#, c-format
+msgid "Please remove the file manually and restart HPOJ."
+msgstr "Palun eemaldage fail käsitsi ja käivitage HPOJ uuesti."
+
+#: printer/printerdrake.pm:2170 printer/printerdrake.pm:2287
+#, c-format
+msgid "Checking device and configuring %s..."
+msgstr "%s kontrollimine ja seadistamine..."
+
+#: printer/printerdrake.pm:2189
 #, c-format
-msgid "Checking device and configuring HPOJ..."
-msgstr "HPOJ kontrollimine ja seadistamine..."
+msgid "Which printer do you want to set up with HPLIP?"
+msgstr "Millise printeri jaoks soovite HPLIP-i kasutada?"
 
-#: printer/printerdrake.pm:2065
+#: printer/printerdrake.pm:2218 printer/printerdrake.pm:2331
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "SANE pakettide paigaldamine..."
 
-#: printer/printerdrake.pm:2078
+#: printer/printerdrake.pm:2231 printer/printerdrake.pm:2344
 #, c-format
 msgid "Scanning on the %s will not be possible."
 msgstr "%s korral ei ole skaneerimine võimalik."
 
-#: printer/printerdrake.pm:2105
+#: printer/printerdrake.pm:2246
+#, c-format
+msgid "Using and Maintaining your %s"
+msgstr "Teie %s kasutamine ja hooldamine"
+
+#: printer/printerdrake.pm:2371
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Paketi \"mtools\" paigaldamine..."
 
-#: printer/printerdrake.pm:2113
+#: printer/printerdrake.pm:2379
 #, c-format
 msgid "Photo memory card access on the %s will not be possible."
 msgstr "%s ei võimalda foto mälukaardi lugemist."
 
-#: printer/printerdrake.pm:2128
+#: printer/printerdrake.pm:2395
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Skaneerimine Teie HP mitme funktsiooniga seadmel"
 
-#: printer/printerdrake.pm:2136
+#: printer/printerdrake.pm:2404
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Digifoto mälukaardi lugeja Teie HP mitme funktsiooniga seadmel"
 
-#: printer/printerdrake.pm:2185
+#: printer/printerdrake.pm:2421
+#, c-format
+msgid "Configuring device..."
+msgstr "Seadme seadistamine..."
+
+#: printer/printerdrake.pm:2455
 #, c-format
 msgid "Making printer port available for CUPS..."
-msgstr "Printer tehakse CUPS-ile kättesaadavaks"
+msgstr "Printeriport tehakse CUPS-ile kättesaadavaks..."
 
-#: printer/printerdrake.pm:2194 printer/printerdrake.pm:2438
-#: printer/printerdrake.pm:2580
+#: printer/printerdrake.pm:2464 printer/printerdrake.pm:2715
+#: printer/printerdrake.pm:2857
 #, c-format
 msgid "Reading printer database..."
 msgstr "Printerite andmebaasi lugemine..."
 
-#: printer/printerdrake.pm:2404
+#: printer/printerdrake.pm:2674
 #, c-format
 msgid "Enter Printer Name and Comments"
-msgstr "Sisestage printeri nimi ja kommentaar"
+msgstr "Printeri nimi ja kommentaar"
 
-#: printer/printerdrake.pm:2408 printer/printerdrake.pm:3606
+#: printer/printerdrake.pm:2678 printer/printerdrake.pm:3965
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "Printeri nimi tohib sisaldada vaid tähti, numbreid ja alakriipsu"
 
-#: printer/printerdrake.pm:2414 printer/printerdrake.pm:3611
+#: printer/printerdrake.pm:2684 printer/printerdrake.pm:3970
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -12833,7 +13245,17 @@ msgstr ""
 "Printer \"%s\" on juba olemas,\n"
 "kas tõesti kirjutada selle seadistused üle?"
 
-#: printer/printerdrake.pm:2423
+#: printer/printerdrake.pm:2691
+#, c-format
+msgid ""
+"The printer name \"%s\" has more than 12 characters which can make the "
+"printer unaccessible from Windows clients. Do you really want to use this "
+"name?"
+msgstr ""
+"Printeri nimes \"%s\" on üle 12 märgi, mis muudab selle Windowsi klientidele "
+"kättesaamatuks. Kas soovite tõesti sellist nime kasutada?"
+
+#: printer/printerdrake.pm:2700
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12842,35 +13264,35 @@ msgstr ""
 "Iga printer vajab nime (näiteks \"printer\"). Kirjelduse ja asukoha välja ei "
 "ole vaja tingimata täita, need on vaid kommentaarid kasutajatele."
 
-#: printer/printerdrake.pm:2424
+#: printer/printerdrake.pm:2701
 #, c-format
 msgid "Name of printer"
 msgstr "Printeri nimi"
 
-#: printer/printerdrake.pm:2425 standalone/drakconnect:568
-#: standalone/harddrake2:34 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: printer/printerdrake.pm:2702 standalone/drakconnect:570
+#: standalone/harddrake2:37 standalone/printerdrake:211
+#: standalone/printerdrake:218
 #, c-format
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: printer/printerdrake.pm:2426 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: printer/printerdrake.pm:2703 standalone/printerdrake:211
+#: standalone/printerdrake:218
 #, c-format
 msgid "Location"
 msgstr "Asukoht"
 
-#: printer/printerdrake.pm:2443
+#: printer/printerdrake.pm:2720
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Printerite andmebaasi ettevalmistamine..."
 
-#: printer/printerdrake.pm:2559
+#: printer/printerdrake.pm:2836
 #, c-format
 msgid "Your printer model"
 msgstr "Teie printeri mudel"
 
-#: printer/printerdrake.pm:2560
+#: printer/printerdrake.pm:2837
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12887,27 +13309,27 @@ msgstr ""
 "Printerdrake võrdles printeri automaattuvastusel leitud mudelinime oma "
 "printerite andmebaasis leiduvate mudelitega, et leida sobiv vaste. Valik "
 "võib olla ekslik, eriti juhul, kui Teie printerit ei peaks mingil põhjusel "
-"andmebaasis leiduma. Seepärast kontrollige, kas valik on õige ning vajutage "
-"\"Mudel õige\", kui see on nii, või \"Mudeli valik käsitsi\", kui midagi on "
-"valesti, mille järel saate järgmisel sammul valida printeri mudeli "
+"andmebaasis leiduma. Seepärast kontrollige, kas valik on õige ning klõpsake "
+"nupule \"Mudel õige\", kui see on nii, või \"Mudeli valik käsitsi\", kui "
+"midagi on valesti, mille järel saate järgmisel sammul valida printeri mudeli "
 "iseseisvalt.\n"
 "\n"
 "Teie printeri puhul leidis Printerdrake:\n"
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2565 printer/printerdrake.pm:2568
+#: printer/printerdrake.pm:2842 printer/printerdrake.pm:2845
 #, c-format
 msgid "The model is correct"
 msgstr "Mudel õige"
 
-#: printer/printerdrake.pm:2566 printer/printerdrake.pm:2567
-#: printer/printerdrake.pm:2570
+#: printer/printerdrake.pm:2843 printer/printerdrake.pm:2844
+#: printer/printerdrake.pm:2847
 #, c-format
 msgid "Select model manually"
 msgstr "Mudeli valik käsitsi"
 
-#: printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2870
 #, c-format
 msgid ""
 "\n"
@@ -12919,24 +13341,24 @@ msgstr ""
 "\n"
 "\n"
 "Kontrollige palun, kas Printerdrake automaattuvastus määras Teie printeri "
-"mudeli õigesti. Valige loendist õige mudel, kui kursor seisab vale mudeli "
+"mudeli õigesti. Valige nimekirjast õige mudel, kui kursor seisab vale mudeli "
 "või \"toorprinteri\" kohal."
 
-#: printer/printerdrake.pm:2612
+#: printer/printerdrake.pm:2889
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Tootja PPD-faili paigaldamine"
 
-#: printer/printerdrake.pm:2643
+#: printer/printerdrake.pm:2920
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
 "printer's options and features."
 msgstr ""
-"Iga PostScript printeriga on kaasas PPD-fail, mis kirjeldab printeri "
+"Iga PostScript-printeriga on kaasas PPD-fail, mis kirjeldab printeri "
 "võimalusi ja omadusi."
 
-#: printer/printerdrake.pm:2644
+#: printer/printerdrake.pm:2921
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
@@ -12944,21 +13366,21 @@ msgid ""
 msgstr ""
 "Tavaliselt leidub see CD-l kõrvuti printeri Windowsi ja Mac draiveritega."
 
-#: printer/printerdrake.pm:2645
+#: printer/printerdrake.pm:2922
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr "PPD-faile võib leida ka tootja veebileheküljelt."
 
-#: printer/printerdrake.pm:2646
+#: printer/printerdrake.pm:2923
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
 "your Windows partition, too."
 msgstr ""
-"Kui arvutile on paigaldatud Windows, võib PPD-faili leida ka Windowsi "
+"Kui arvutisse on paigaldatud Windows, võib PPD-faili leida ka Windowsi "
 "partitsioonilt."
 
-#: printer/printerdrake.pm:2647
+#: printer/printerdrake.pm:2924
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -12968,60 +13390,60 @@ msgstr ""
 "Printeri PPD-faili paigaldamine ja selle kasutamine printeri seadistamisel "
 "muudab kättesaadavaks kõik võimalused, mida tootja on printerile ette näinud."
 
-#: printer/printerdrake.pm:2648
+#: printer/printerdrake.pm:2925
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
 "then be used for the setup of your printer."
 msgstr ""
-"Siin saate valida, milline PPD-fail Teie masinale paigaldada. Seda "
+"Siin saate valida, milline PPD-fail Teie masinasse paigaldada. Seda "
 "kasutatakse seejärel printeri seadistamisel."
 
-#: printer/printerdrake.pm:2650
+#: printer/printerdrake.pm:2927
 #, c-format
 msgid "Install PPD file from"
 msgstr "PPD-faili paigaldamine asukohast"
 
-#: printer/printerdrake.pm:2653 printer/printerdrake.pm:2661
-#: standalone/scannerdrake:177 standalone/scannerdrake:186
-#: standalone/scannerdrake:236 standalone/scannerdrake:244
+#: printer/printerdrake.pm:2930 printer/printerdrake.pm:2938
+#: standalone/scannerdrake:183 standalone/scannerdrake:192
+#: standalone/scannerdrake:242 standalone/scannerdrake:250
 #, c-format
 msgid "Floppy Disk"
 msgstr "Diskett"
 
-#: printer/printerdrake.pm:2654 printer/printerdrake.pm:2663
-#: standalone/scannerdrake:178 standalone/scannerdrake:188
-#: standalone/scannerdrake:237 standalone/scannerdrake:246
+#: printer/printerdrake.pm:2931 printer/printerdrake.pm:2940
+#: standalone/scannerdrake:184 standalone/scannerdrake:194
+#: standalone/scannerdrake:243 standalone/scannerdrake:252
 #, c-format
 msgid "Other place"
 msgstr "Muu koht"
 
-#: printer/printerdrake.pm:2669
+#: printer/printerdrake.pm:2946
 #, c-format
 msgid "Select PPD file"
 msgstr "Valige PPD-fail"
 
-#: printer/printerdrake.pm:2673
+#: printer/printerdrake.pm:2950
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "PPD-faili %s ei ole olemas või ei ole see loetav!"
 
-#: printer/printerdrake.pm:2679
+#: printer/printerdrake.pm:2956
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "PPD-fail %s ei vasta PPD spetsifikatsioonile!"
 
-#: printer/printerdrake.pm:2690
+#: printer/printerdrake.pm:2967
 #, c-format
 msgid "Installing PPD file..."
 msgstr "PPD-faili paigaldamine..."
 
-#: printer/printerdrake.pm:2807
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "OKI winprinter configuration"
-msgstr "OKI winprinteri seadistused"
+msgstr "OKI winprinteri seadistamine"
 
-#: printer/printerdrake.pm:2808
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -13038,12 +13460,12 @@ msgstr ""
 "trükite testlehekülje. Vastasel juhul printer lihtsalt ei tööta ja draiver "
 "eirab Teie määratud ühendusviisi."
 
-#: printer/printerdrake.pm:2833 printer/printerdrake.pm:2863
+#: printer/printerdrake.pm:3110 printer/printerdrake.pm:3140
 #, c-format
 msgid "Lexmark inkjet configuration"
-msgstr "Lexmark inkjeti seadistused"
+msgstr "Lexmark inkjeti seadistamine"
 
-#: printer/printerdrake.pm:2834
+#: printer/printerdrake.pm:3111
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -13052,11 +13474,11 @@ msgid ""
 "to."
 msgstr ""
 "Lexmarki pakutavad inkjet printerite draiverid toetavad ainult kohalikke "
-"printereid, mitte aga printereid kaugarvutitel või printserveritel. Ühendage "
-"palun oma printer kohalikku porti või seadistage see masinal, millega "
-"printer on ühendatud."
+"printereid, mitte aga printereid võrgumasinatel või printserveritel. "
+"Ühendage palun oma printer kohalikku porti või seadistage see masinas, "
+"millega printer on ühendatud."
 
-#: printer/printerdrake.pm:2864
+#: printer/printerdrake.pm:3141
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -13072,18 +13494,18 @@ msgstr ""
 "pakutavaid inkjet printeri draivereid (http://www.lexmark.com/). Klõpsake "
 "viidal \"Drivers\". Seejärel valige oma mudel ja seejärel "
 "operatsioonisüsteem \"Linux\". Draiverid on kas RPM-paketid või "
-"shelliskriptid interaktiivse graafilise paigalduse võimalusega. Te ei pruugi "
-"seda seadistust sooritada graafiliste kasutajaliideste abil. Katkestage kohe "
-"pärast litsentsilepinguga nõustumist. Seejärel trükkige \"lexmarkmaintain\" "
-"abil printeripea joondamise leheküljed ning kohandage selle rakenduse abil "
-"pea joondamise seadistust."
+"shelliskriptid interaktiivse graafilise paigaldamise võimalusega. Te ei "
+"pruugi seda seadistust sooritada graafiliste kasutajaliideste abil. "
+"Katkestage kohe pärast litsentsilepinguga nõustumist. Seejärel trükkige "
+"\"lexmarkmaintain\" abil printeripea joondamise leheküljed ning kohandage "
+"selle rakenduse abil pea joondamise seadistust."
 
-#: printer/printerdrake.pm:2874
+#: printer/printerdrake.pm:3151
 #, c-format
 msgid "Lexmark X125 configuration"
-msgstr "Lexmark X125 seadistused"
+msgstr "Lexmark X125 seadistamine"
 
-#: printer/printerdrake.pm:2875
+#: printer/printerdrake.pm:3152
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected via "
@@ -13092,16 +13514,16 @@ msgid ""
 "connected to."
 msgstr ""
 "Selle printeri draiver toetab ainult kohalikke USB ühendusega printereid, "
-"mitte aga printereid kaugarvutitel või printserveritel. Ühendage palun oma "
-"printer kohalikku USB porti või seadistage see masinal, millega printer on "
+"mitte aga printereid võrgumasinatel või printserveritel. Ühendage palun oma "
+"printer kohalikku USB porti või seadistage see masinas, millega printer on "
 "ühendatud."
 
-#: printer/printerdrake.pm:2897
+#: printer/printerdrake.pm:3174
 #, c-format
 msgid "Samsung ML/QL-85G configuration"
-msgstr "Samsung ML/QL-85G seadistused"
+msgstr "Samsung ML/QL-85G seadistamine"
 
-#: printer/printerdrake.pm:2898 printer/printerdrake.pm:2925
+#: printer/printerdrake.pm:3175 printer/printerdrake.pm:3202
 #, c-format
 msgid ""
 "The driver for this printer only supports printers locally connected on the "
@@ -13110,21 +13532,22 @@ msgid ""
 "port or configure it on the machine where it is connected to."
 msgstr ""
 "Selle printeri draiver toetab ainult kohalikke esimesse paralleelporti "
-"ühendatud printereid, mitte aga printereid kaugarvutitel või printserveritel "
-"või muudes paralleelportides. Palun ühendage oma printer esimesse "
-"paralleelporti või seadistage see masinal, millega printer on ühendatud."
+"ühendatud printereid, mitte aga printereid võrgumasinatel või "
+"printserveritel või muudes paralleelportides. Palun ühendage oma printer "
+"esimesse paralleelporti või seadistage see masinas, millega printer on "
+"ühendatud."
 
-#: printer/printerdrake.pm:2924
+#: printer/printerdrake.pm:3201
 #, c-format
 msgid "Canon LBP-460/660 configuration"
-msgstr "Canon LBP-460/660 seadistused"
+msgstr "Canon LBP-460/660 seadistamine"
 
-#: printer/printerdrake.pm:2943
+#: printer/printerdrake.pm:3220
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "HP LaserJet 1000 püsivara laadimine"
 
-#: printer/printerdrake.pm:3056
+#: printer/printerdrake.pm:3369
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -13136,33 +13559,33 @@ msgid ""
 msgstr ""
 "Printeri vaikeseadistused\n"
 "\n"
-"Kontrollige palun, et lehekülje suurus ja tinditüüp/trükiresiim (kui "
+"Kontrollige palun, et lehekülje suurus ja tinditüüp/trükirežiim (kui "
 "võimalik), samuti laserprinterite riistvaralised seadistused (mälu, "
 "dupleksseade, lisasalved) oleksid määratud korrektselt. Pange tähele, et "
 "väga suure trükikvaliteedi või lahutusvõime puhul muutub trükkimine "
 "märgatavalt aeglasemaks."
 
-#: printer/printerdrake.pm:3181
+#: printer/printerdrake.pm:3494
 #, c-format
 msgid "Printer default settings"
 msgstr "Printeri vaikeseadistused"
 
-#: printer/printerdrake.pm:3188
+#: printer/printerdrake.pm:3501
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Võti %s peab olema täisarv!"
 
-#: printer/printerdrake.pm:3192
+#: printer/printerdrake.pm:3505
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Võti %s peab olema arv!"
 
-#: printer/printerdrake.pm:3196
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Võti %s väljub piiridest!"
 
-#: printer/printerdrake.pm:3247
+#: printer/printerdrake.pm:3560
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -13171,12 +13594,12 @@ msgstr ""
 "Kas soovite määrata selle printeri (\"%s\")\n"
 "vaikeprinteriks?"
 
-#: printer/printerdrake.pm:3262
+#: printer/printerdrake.pm:3575
 #, c-format
 msgid "Test pages"
 msgstr "Testleheküljed"
 
-#: printer/printerdrake.pm:3263
+#: printer/printerdrake.pm:3576
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -13189,57 +13612,52 @@ msgstr ""
 "mäluga laserprinteritel ei pruugi see üldse õnnestuda. Enamasti peaks "
 "piisama tavalise testlehekülje trükkimisest."
 
-#: printer/printerdrake.pm:3267
+#: printer/printerdrake.pm:3580
 #, c-format
 msgid "No test pages"
 msgstr "Ära trüki"
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3581
 #, c-format
 msgid "Print"
 msgstr "Trüki"
 
-#: printer/printerdrake.pm:3293
+#: printer/printerdrake.pm:3606
 #, c-format
 msgid "Standard test page"
 msgstr "Tavaline testlehekülg"
 
-#: printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3609
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Alternatiivne testlehekülg (Letter)"
 
-#: printer/printerdrake.pm:3299
+#: printer/printerdrake.pm:3612
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Alternatiivne testlehekülg (A4)"
 
-#: printer/printerdrake.pm:3301
+#: printer/printerdrake.pm:3614
 #, c-format
 msgid "Photo test page"
 msgstr "Fototestlehekülg"
 
-#: printer/printerdrake.pm:3305
+#: printer/printerdrake.pm:3618
 #, c-format
 msgid "Do not print any test page"
 msgstr "Ära trüki testlehekülge"
 
-#: printer/printerdrake.pm:3313 printer/printerdrake.pm:3485
+#: printer/printerdrake.pm:3626 printer/printerdrake.pm:3809
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Trükitakse testlehekülg(i)..."
 
-#: printer/printerdrake.pm:3331
-#, c-format
-msgid "Could not install the %s package!"
-msgstr "Ei õnnestunud paigaldada %s paketti!"
-
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3646
 #, c-format
 msgid "Skipping photo test page."
 msgstr "Fototestlehekülg jäetakse vahele."
 
-#: printer/printerdrake.pm:3350
+#: printer/printerdrake.pm:3663
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13254,7 +13672,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3354
+#: printer/printerdrake.pm:3667
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -13263,17 +13681,17 @@ msgstr ""
 "Testlehekülg on saadetud printerile.\n"
 "Nüüd võib minna natuke aega, enne kui printer alustab.\n"
 
-#: printer/printerdrake.pm:3364
+#: printer/printerdrake.pm:3677
 #, c-format
 msgid "Did it work properly?"
 msgstr "Kas kõik oli korras?"
 
-#: printer/printerdrake.pm:3386 printer/printerdrake.pm:4689
+#: printer/printerdrake.pm:3700 printer/printerdrake.pm:5049
 #, c-format
 msgid "Raw printer"
 msgstr "Toorprinter"
 
-#: printer/printerdrake.pm:3416
+#: printer/printerdrake.pm:3738
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -13286,7 +13704,7 @@ msgstr ""
 "<fail>\". Graafilised vahendid võimaldavad hõlpsamalt valida printerit ja "
 "muuta valikuid.\n"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3740
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -13297,8 +13715,8 @@ msgstr ""
 "\"Trükkimiskäsk\", kuid seal pole vaja kirjutada failinime, sest selle annab "
 "rakendus ise.\n"
 
-#: printer/printerdrake.pm:3421 printer/printerdrake.pm:3438
-#: printer/printerdrake.pm:3448
+#: printer/printerdrake.pm:3743 printer/printerdrake.pm:3760
+#: printer/printerdrake.pm:3770
 #, c-format
 msgid ""
 "\n"
@@ -13310,7 +13728,7 @@ msgstr ""
 "Käsk \"%s\" võimaldab muuta ka konkreetse trükkimistöö valikuid. Selleks "
 "lisage vaid soovitud valik käsureale, nt \"%s <fail>\". "
 
-#: printer/printerdrake.pm:3424 printer/printerdrake.pm:3464
+#: printer/printerdrake.pm:3746 printer/printerdrake.pm:3786
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -13318,20 +13736,20 @@ msgid ""
 "\n"
 msgstr ""
 "Seda, millised valikud on saadaval praeguse printeri puhul, saab teada kas "
-"allpool toodud loendist või pärast vajutust nupule \"Trükkimisvalikute loend"
-"\".%s%s%s\n"
+"allpool toodud nimekirjast või pärast vajutust nupule \"Trükkimisvalikute "
+"nimekiri\".%s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3428
+#: printer/printerdrake.pm:3750
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
 msgstr ""
-"See on loend praegusel printeril kasutamiskõlblike trükkimisvalikutega:\n"
+"See on nimekiri praegusel printeril kasutamiskõlblike trükkimisvalikutega:\n"
 "\n"
 
-#: printer/printerdrake.pm:3433 printer/printerdrake.pm:3443
+#: printer/printerdrake.pm:3755 printer/printerdrake.pm:3765
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13339,8 +13757,8 @@ msgid ""
 msgstr ""
 "Faili trükkimiseks käsurealt (terminaliaken) kasutage käsku \"%s <fail>\".\n"
 
-#: printer/printerdrake.pm:3435 printer/printerdrake.pm:3445
-#: printer/printerdrake.pm:3455
+#: printer/printerdrake.pm:3757 printer/printerdrake.pm:3767
+#: printer/printerdrake.pm:3777
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -13351,16 +13769,16 @@ msgstr ""
 "\"Trükkimiskäsk\". Kuid seal ei ole vaja kirjutada failinime, sest selle "
 "annab rakendus ise.\n"
 
-#: printer/printerdrake.pm:3440 printer/printerdrake.pm:3450
+#: printer/printerdrake.pm:3762 printer/printerdrake.pm:3772
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
 "\"Print option list\" button."
 msgstr ""
-"Praeguse printeri puhul kasutuskõlblike valikute loendi vaatamiseks vajutage "
-"nupule \"Trükkimisvalikute loend\"."
+"Praeguse printeri puhul kasutuskõlblike valikute nimekirja vaatamiseks "
+"klõpsake nupule \"Trükkimisvalikute nimekiri\"."
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3775
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -13369,7 +13787,7 @@ msgstr ""
 "Faili trükkimiseks käsurealt (terminaliaken) kasutage käsku \"%s <fail>\" "
 "või \"%s <fail>\".\n"
 
-#: printer/printerdrake.pm:3457
+#: printer/printerdrake.pm:3779
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -13385,7 +13803,7 @@ msgstr ""
 "nimetusega \"PEATA printer!\", millele klõpsates peatatakse otsekohe kõik "
 "trükkimistööd. See on kasulik näiteks paberiummistuste esinemisel.\n"
 
-#: printer/printerdrake.pm:3461
+#: printer/printerdrake.pm:3783
 #, c-format
 msgid ""
 "\n"
@@ -13398,32 +13816,141 @@ msgstr ""
 "valikuid. Selleks tuleb vaid lisada soovitud valikud käsureale, näiteks \"%s "
 "<fail>\".\n"
 
-#: printer/printerdrake.pm:3471
+#: printer/printerdrake.pm:3793
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Trükkimine/skaneerimine/fotokaardid seadmel \"%s\""
 
-#: printer/printerdrake.pm:3472
+#: printer/printerdrake.pm:3794
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Trükkimine/skaneerimine seadmel \"%s\""
 
-#: printer/printerdrake.pm:3474
+#: printer/printerdrake.pm:3796
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Trükkimine/fotokaartide kasutamine seadmel \"%s\""
 
-#: printer/printerdrake.pm:3475
+#: printer/printerdrake.pm:3798
+#, c-format
+msgid "Using/Maintaining the printer \"%s\""
+msgstr "Printeri \"%s\" kasutamine/hooldamine"
+
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Trükkimine printeril \"%s\""
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3805
 #, c-format
 msgid "Print option list"
-msgstr "Trükkimisvalikute loend"
+msgstr "Trükkimisvalikute nimekiri"
+
+#: printer/printerdrake.pm:3827
+#, c-format
+msgid ""
+"Your %s is set up with HP's HPLIP driver software. This way many special "
+"features of your printer are supported.\n"
+"\n"
+msgstr ""
+"Teie %s kasutab HP HPLIP-draiveri tarkvara. See toetab paljusid Teie "
+"printeri lisavõimalusi.\n"
+"\n"
+
+#: printer/printerdrake.pm:3830
+#, c-format
+msgid ""
+"The scanner in your printer can be used with the usual SANE software, for "
+"example Kooka or XSane (Both in the Multimedia/Graphics menu). "
+msgstr ""
+"Teie printeri skännerit saab kasutada tavalise SANE tarkvaraga, näiteks "
+"Kooka või XSane (mõlemad leiab menüüst Multimeedia/Graafika). "
+
+#: printer/printerdrake.pm:3831
+#, c-format
+msgid ""
+"Run Scannerdrake (Hardware/Scanner in Mandrakelinux Control Center) to share "
+"your scanner on the network.\n"
+"\n"
+msgstr ""
+"Oma skänneri väljajagamiseks võrgus käivitage Scannerdrake (Mandrakelinuxi "
+"juhtimiskeskuses rubriik Riistvara/Skänner).\n"
+"\n"
 
-#: printer/printerdrake.pm:3502
+#: printer/printerdrake.pm:3835
+#, c-format
+msgid ""
+"The memory card readers in your printer can be accessed like a usual USB "
+"mass storage device. "
+msgstr ""
+"Teie printeri mälukaardilugejaid saab kasutada nagu tavalisi USB mass-"
+"salvestusseadmeid. "
+
+#: printer/printerdrake.pm:3836
+#, c-format
+msgid ""
+"After inserting a card a hard disk icon to access the card should appear on "
+"your desktop.\n"
+"\n"
+msgstr ""
+"Pärast kaardi sisestamist ilmub töölauale ikoon, mis võimaldabki kaarti "
+"kasutada.\n"
+"\n"
+
+#: printer/printerdrake.pm:3838
+#, c-format
+msgid ""
+"The memory card readers in your printer can be accessed using HP's Printer "
+"Toolbox (Menu: System/Monitoring/HP Printer Toolbox) clicking the \"Access "
+"Photo Cards...\" button on the \"Functions\" tab. "
+msgstr ""
+"Teie printeri mälukaardilugejaid saab kasutada HP printeri \"Toolboxis"
+"\" (menüüs: Süsteem/Monitooring/HP printeri Toolbox) klõpsuga nupule "
+"\"Access Photo Cards...\", mille leiab kaardilt \"Functions\". "
+
+#: printer/printerdrake.pm:3839
+#, c-format
+msgid ""
+"Note that this is very slow, reading the pictures from the camera or a USB "
+"card reader is usually faster.\n"
+"\n"
+msgstr ""
+"Arvestage, et see on väga aeglane ja piltide lugemine kaamerast või USB "
+"kaardilugejalt läheb tavaliselt palju kiiremini.\n"
+"\n"
+
+#: printer/printerdrake.pm:3842
+#, c-format
+msgid ""
+"HP's Printer Toolbox (Menu: System/Monitoring/HP Printer Toolbox) offers a "
+"lot of status monitoring and maintenance functions for your %s:\n"
+"\n"
+msgstr ""
+"HP printeri Toolbox (menüüs: Süsteem/Monitooring/HP printeri Toolbox) pakub "
+"mitmeid võimalusi Teie %s jälgimiseks ja hooldamiseks:\n"
+"\n"
+
+#: printer/printerdrake.pm:3843
+#, c-format
+msgid " - Ink level/status info\n"
+msgstr " - tinditase/olekuinfo\n"
+
+#: printer/printerdrake.pm:3844
+#, c-format
+msgid " - Ink nozzle cleaning\n"
+msgstr " - tindiavade puhastamine\n"
+
+#: printer/printerdrake.pm:3845
+#, c-format
+msgid " - Print head alignment\n"
+msgstr " - printeri pea joondus\n"
+
+#: printer/printerdrake.pm:3846
+#, c-format
+msgid " - Color calibration\n"
+msgstr " - värvi kalibeerimine\n"
+
+#: printer/printerdrake.pm:3861
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13449,7 +13976,7 @@ msgstr ""
 "\"scannerdraket\"  - seda on mõtet pruukida ainult siis, kui soovite oma "
 "skännerit võrgus jagada."
 
-#: printer/printerdrake.pm:3528
+#: printer/printerdrake.pm:3887
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13462,23 +13989,23 @@ msgid ""
 "can switch between drive letters with the field at the upper-right corners "
 "of the file lists."
 msgstr ""
-"Teie printer on seadistatud automaatselt ja võimaldab Teil oma arvutilt ligi "
+"Teie printer on seadistatud automaatselt ja võimaldab Teil oma arvutist ligi "
 "pääseda fotokaardiketastele. Fotokaartidele pääseb ligi graafilise rakenduse "
 "\"MtoolsFM\" (menüüs: \"Rakendused\" -> \"Failivahendid\" -> \"Failihaldur "
 "MTools\") või käsureavahendi \"mtools\" abil (andke käsureal käsk \"man "
 "mtools\", et saada selle kohta rohkem infot). Kaartide failisüsteemi leiate "
 "kettal \"p:\" või mõnel sellele järgneva tähega kettal, kui Teil juhtub "
 "olema enam kui üks HP fotokaardiseadmega printer. Rakenduses \"MtoolsFM\" "
-"võite liikuda ketaste vahel faililoendi ülal paremas nurgas asuval väljal "
+"võite liikuda ketaste vahel failinimekirja ülal paremas nurgas asuval väljal "
 "leiduvaid tähti vahetades."
 
-#: printer/printerdrake.pm:3570 printer/printerdrake.pm:3597
-#: printer/printerdrake.pm:3632
+#: printer/printerdrake.pm:3929 printer/printerdrake.pm:3956
+#: printer/printerdrake.pm:3991
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "Printeri seadistuste ülekandmine"
 
-#: printer/printerdrake.pm:3571
+#: printer/printerdrake.pm:3930
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13492,16 +14019,16 @@ msgstr ""
 "nimi, kirjeldus, asukoht, ühendusviis, vaikevalikud), aga mitte tööd.\n"
 "Kõiki järjekordi ei saa üle kanda järgmistel põhjustel:\n"
 
-#: printer/printerdrake.pm:3574
+#: printer/printerdrake.pm:3933
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
 msgstr ""
-"CUPS ei toeta printereid Novelli serveritel ega printereid, mis saadavad "
+"CUPS ei toeta printereid Novelli serverites ega printereid, mis saadavad "
 "andmeid suvalise vormiga käskudena.\n"
 
-#: printer/printerdrake.pm:3576
+#: printer/printerdrake.pm:3935
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13510,12 +14037,12 @@ msgstr ""
 "PDQ toetab ainult kohalikke printereid, võrguprintereid (LPD) ning Socket/"
 "TCP printereid.\n"
 
-#: printer/printerdrake.pm:3578
+#: printer/printerdrake.pm:3937
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD ja LPRng ei toeta IPP printereid.\n"
 
-#: printer/printerdrake.pm:3580
+#: printer/printerdrake.pm:3939
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13524,7 +14051,7 @@ msgstr ""
 "Lisaks sellele ei saa üle kanda järjekordi, mis on loodud käesoleva "
 "programmi või \"foomatic-configure\" poolt."
 
-#: printer/printerdrake.pm:3581
+#: printer/printerdrake.pm:3940
 #, c-format
 msgid ""
 "\n"
@@ -13533,9 +14060,9 @@ msgid ""
 msgstr ""
 "\n"
 "Üle kanda ei saa ka printereid, mis on seadistatud nende tootjate pakutud "
-"PPD failidega või loomupäraste CUPS draiveritega."
+"PPD failidega või loomupäraste CUPS-i draiveritega."
 
-#: printer/printerdrake.pm:3582
+#: printer/printerdrake.pm:3941
 #, c-format
 msgid ""
 "\n"
@@ -13543,20 +14070,20 @@ msgid ""
 "\"Transfer\"."
 msgstr ""
 "\n"
-"Märkige printer(id), mida soovite üle kanda, ning vajutage \n"
+"Märkige printer(id), mida soovite üle kanda, ning klõpsake nupule \n"
 "\"Kanna üle\"."
 
-#: printer/printerdrake.pm:3585
+#: printer/printerdrake.pm:3944
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Ära kanna printereid üle"
 
-#: printer/printerdrake.pm:3586 printer/printerdrake.pm:3602
+#: printer/printerdrake.pm:3945 printer/printerdrake.pm:3961
 #, c-format
 msgid "Transfer"
 msgstr "Kanna üle"
 
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:3957
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13564,20 +14091,20 @@ msgid ""
 "You can also type a new name or skip this printer."
 msgstr ""
 "Printer nimega \"%s\" on juba %s olemas. \n"
-"Vajutage \"Kanna üle\" selle ülekirjutamiseks.\n"
+"Klõpsake \"Kanna üle\" selle ülekirjutamiseks.\n"
 "Te võite küll ka sisestada uue nime või selle printeri vahele jätta."
 
-#: printer/printerdrake.pm:3619
+#: printer/printerdrake.pm:3978
 #, c-format
 msgid "New printer name"
 msgstr "Uus printeri nimi"
 
-#: printer/printerdrake.pm:3622
+#: printer/printerdrake.pm:3981
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s ülekandmine..."
 
-#: printer/printerdrake.pm:3633
+#: printer/printerdrake.pm:3992
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13586,28 +14113,28 @@ msgstr ""
 "Kandsite üle oma senise vaikeprinteri (\"%s\"). Kas see peaks olema "
 "vaikeprinter ka uue trükkimissüsteemi %s puhul?"
 
-#: printer/printerdrake.pm:3643
+#: printer/printerdrake.pm:4002
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Printeri andmete värskendamine..."
 
-#: printer/printerdrake.pm:3652
+#: printer/printerdrake.pm:4011
 #, c-format
 msgid "Starting network..."
 msgstr "Võrgu käivitamine..."
 
-#: printer/printerdrake.pm:3695 printer/printerdrake.pm:3699
-#: printer/printerdrake.pm:3701
+#: printer/printerdrake.pm:4054 printer/printerdrake.pm:4058
+#: printer/printerdrake.pm:4060
 #, c-format
 msgid "Configure the network now"
 msgstr "Seadistada võrk otsekohe"
 
-#: printer/printerdrake.pm:3696
+#: printer/printerdrake.pm:4055
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Võrguvalmidus on seadistamata"
 
-#: printer/printerdrake.pm:3697
+#: printer/printerdrake.pm:4056
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13620,12 +14147,12 @@ msgstr ""
 "seadistamata, et ole Teil võimalik kasutada printerit, mida te tahate "
 "seadistada. Kuidas peaks nüüd edasi talitama?"
 
-#: printer/printerdrake.pm:3700
+#: printer/printerdrake.pm:4059
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Jätkata ilma võrku seadistamata"
 
-#: printer/printerdrake.pm:3735
+#: printer/printerdrake.pm:4094
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
@@ -13634,13 +14161,13 @@ msgid ""
 "\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
 msgstr ""
-"Paigalduse ajal seadistatud võrku ei õnnestu praegu käivitada. Kontrollige "
+"Paigaldamise ajal seadistatud võrku ei õnnestu praegu käivitada. Kontrollige "
 "palun, kas võrk on kättesaadav pärast süsteemi uut alglaadimist, ning "
 "korrigeerige seadistust %s juhtimiskeskuse sektsioonis \"Kohtvõrk ja Internet"
 "\"/\"Ühendus\", misjärel seadistage printer samuti %s juhtimiskeskuses, aga "
 "sektsioonis \"Riistvara\"/\"Printer\". "
 
-#: printer/printerdrake.pm:3736
+#: printer/printerdrake.pm:4095
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13650,27 +14177,27 @@ msgstr ""
 "Võrguühendus ei töötanud ja seda ei saa ka käivitada. Kontrollige palun oma "
 "seadistusi ja riistvara. Seejärel proovige uuesti seadistada võrguprinterit."
 
-#: printer/printerdrake.pm:3746
+#: printer/printerdrake.pm:4105
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Trükkimissüsteemi taaskäivitamine..."
 
-#: printer/printerdrake.pm:3776
+#: printer/printerdrake.pm:4135
 #, c-format
 msgid "high"
 msgstr "kõrge"
 
-#: printer/printerdrake.pm:3776
+#: printer/printerdrake.pm:4135
 #, c-format
 msgid "paranoid"
 msgstr "paranoiline"
 
-#: printer/printerdrake.pm:3778
+#: printer/printerdrake.pm:4137
 #, c-format
 msgid "Installing a printing system in the %s security level"
-msgstr "Trükkimissüsteemi paigaldamine turvatasemel '%s'"
+msgstr "Trükkimissüsteemi paigaldamine turvatasemel \"%s\""
 
-#: printer/printerdrake.pm:3779
+#: printer/printerdrake.pm:4138
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -13685,22 +14212,22 @@ msgid ""
 "Do you really want to configure printing on this machine?"
 msgstr ""
 "Te püüate praegu paigaldada trükkimissüsteemi %s süsteemi, mis töötab "
-"turvatasemel '%s'.\n"
+"turvatasemel \"%s\".\n"
 "\n"
 "See trükkimissüsteem käivitab deemoni (taustal töötava protsessina), mis "
 "võtab vastu ja käsitleb trükkimistöid. Deemonile pääseb võrgu kaudu ligi ka "
-"kaugmasinatelt, mistõttu see kujutab endast võimaliku rünnaku objekti. "
+"võrgumasinatelt, mistõttu see kujutab endast võimaliku rünnaku objekti. "
 "Seetõttu käivitatakse selle turvataseme puhul vaikimisi ainult mõned valitud "
 "deemonid.\n"
 "\n"
-"Kas soovite tõesti seadistada trükkimist sellel masinal?"
+"Kas soovite tõesti seadistada trükkimist selles masinas?"
 
-#: printer/printerdrake.pm:3814
+#: printer/printerdrake.pm:4173
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Trükkimissüsteem käivitatakse alglaadimisel"
 
-#: printer/printerdrake.pm:3815
+#: printer/printerdrake.pm:4174
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13720,32 +14247,32 @@ msgstr ""
 "\n"
 "Kas soovite trükkimissüsteemi automaatkäivituse taas sisse lülitada?"
 
-#: printer/printerdrake.pm:3837
+#: printer/printerdrake.pm:4196
 #, c-format
 msgid "Checking installed software..."
 msgstr "Paigaldatud tarkvara kontroll..."
 
-#: printer/printerdrake.pm:3843
+#: printer/printerdrake.pm:4202
 #, c-format
 msgid "Removing %s..."
 msgstr "%s eemaldamine..."
 
-#: printer/printerdrake.pm:3847
+#: printer/printerdrake.pm:4206
 #, c-format
 msgid "Could not remove the %s printing system!"
 msgstr "%s trükkimissüsteemi ei õnnestunud eemaldada!"
 
-#: printer/printerdrake.pm:3863
+#: printer/printerdrake.pm:4222
 #, c-format
 msgid "Installing %s..."
 msgstr "%s paigaldamine..."
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4226
 #, c-format
 msgid "Could not install the %s printing system!"
 msgstr "%s trükkimissüsteemi ei õnnestunud paigaldada!"
 
-#: printer/printerdrake.pm:3934
+#: printer/printerdrake.pm:4293
 #, c-format
 msgid ""
 "In this mode there is no local printing system, all printing requests go "
@@ -13753,56 +14280,55 @@ msgid ""
 "define local print queues then and if the specified server is down it cannot "
 "be printed at all from this machine."
 msgstr ""
-"Selles resiimis puudub kohalik trükkimissüsteem, kõik trükkimissoovid "
-"saadetakse vahetult allpool määratud serverile. Pange tähele, et sel juhul "
+"Selles režiimis puudub kohalik trükkimissüsteem, kõik trükkimissoovid "
+"saadetakse vahetult allpool määratud serverisse. Pange tähele, et sel juhul "
 "ei ole võimalik määrata kohalikke trükkimisjärjekordi ja kui määratud server "
 "ei peaks töötama, ei ole Teie masinast üldse võimalik trükkida."
 
-#: printer/printerdrake.pm:3936
+#: printer/printerdrake.pm:4295
 #, c-format
 msgid ""
 "Enter the host name or IP of your CUPS server and click OK if you want to "
 "use this mode, click \"Quit\" otherwise."
 msgstr ""
-"Sisestage oma CUPS serveri nimi või IP aadress ja klõpsakse \"Olgu\", kui "
-"soovite seda resiimi kasutada. Vastasel juhul klõpsake \"Välju\"."
+"Sisestage oma CUPS-serveri nimi või IP-aadress ja klõpsakse \"Olgu\", kui "
+"soovite seda režiimi kasutada. Vastasel juhul klõpsake \"Välju\"."
 
-#: printer/printerdrake.pm:3950
+#: printer/printerdrake.pm:4309
 #, c-format
 msgid "Name or IP of remote server:"
-msgstr "Kaugserveri nimi või IP:"
+msgstr "Võrguserveri nimi või IP:"
 
-#: printer/printerdrake.pm:3970
+#: printer/printerdrake.pm:4329
 #, c-format
 msgid "Setting Default Printer..."
-msgstr "Vaikeprinteri seadmine..."
+msgstr "Vaikeprinteri määramine..."
 
-#: printer/printerdrake.pm:3989
+#: printer/printerdrake.pm:4348
 #, c-format
 msgid "Local CUPS printing system or remote CUPS server?"
-msgstr "Kas kohalik CUPS trükkimissüsteem või CUPS kaugserver?"
+msgstr "Kas kohalik CUPS-trükkimissüsteem või CUPS-võrguserver?"
 
-#: printer/printerdrake.pm:3990
+#: printer/printerdrake.pm:4349
 #, c-format
 msgid "The CUPS printing system can be used in two ways: "
-msgstr "CUPS trükkimissüsteemi saab kasutada kahel moel: "
+msgstr "CUPS-trükkimissüsteemi saab kasutada kahel moel: "
 
-#: printer/printerdrake.pm:3992
+#: printer/printerdrake.pm:4351
 #, c-format
 msgid "1. The CUPS printing system can run locally. "
-msgstr "1. CUPS trükkimissüsteem töötab kohalikus masinas. "
+msgstr "1. CUPS-trükkimissüsteem töötab kohalikus masinas. "
 
-#: printer/printerdrake.pm:3993
+#: printer/printerdrake.pm:4352
 #, c-format
 msgid ""
 "Then locally connected printers can be used and remote printers on other "
 "CUPS servers in the same network are automatically discovered. "
 msgstr ""
 "Sellisel juhul saab kasutada kohaliku masinaga ühendatud printereid ning "
-"samas võrgus muudel CUPS serveritel töötavad kaugprinterid tuvastatakse "
-"automaatselt. "
+"sama võrgu muude CUPS-serverite võrguprinterid tuvastatakse automaatselt. "
 
-#: printer/printerdrake.pm:3994
+#: printer/printerdrake.pm:4353
 #, c-format
 msgid ""
 "Disadvantage of this approach is, that more resources on the local machine "
@@ -13810,78 +14336,78 @@ msgid ""
 "daemon has to run in the background and needs some memory, and the IPP port "
 "(port 631) is opened. "
 msgstr ""
-"Selle puuduseks on aga vajadus kasutada kohalikul masinal suhteliselt palju "
-"ressursse: tuleb paigaldada täiendav tarkvara, taustal peab töötama CUPS "
-"deemon, kõik see nõuab omajagu mälu ning IPP pordi (port 631) avamist. "
+"Selle puuduseks on aga vajadus kasutada palju kohaliku masina ressursse: "
+"tuleb paigaldada lisatarkvara, taustal peab töötama CUPS-i deemon jne. Kõik "
+"see nõuab omajagu mälu ning IPP pordi (port 631) avamist. "
 
-#: printer/printerdrake.pm:3996
+#: printer/printerdrake.pm:4355
 #, c-format
 msgid "2. All printing requests are immediately sent to a remote CUPS server. "
-msgstr "2. Kõik trükkimissoovid saadetakse vahetult CUPS kaugserverile. "
+msgstr "2. Kõik trükkimissoovid saadetakse vahetult CUPS-võrguserverisse. "
 
-#: printer/printerdrake.pm:3997
+#: printer/printerdrake.pm:4356
 #, c-format
 msgid ""
 "Here local resource occupation is reduced to a minimum. No CUPS daemon is "
 "started or port opened, no software infrastructure for setting up local "
 "print queues is installed, so less memory and disk space is used. "
 msgstr ""
-"Sellel juhul on kohalikke ressursse minimaalselt vaja. CUPS deemonit ei "
-"käivitata, mingit porti ei avata, kohalike trükkimisjärjekordade loomiseks "
-"ei paigaldata täiendavat tarkvara, mis kokkuvõttes kulutab vähem mälu ja "
+"Sellel juhul on kohalikke ressursse vaja minimaalselt. CUPS-i deemonit ei "
+"käivitata, mingit porti ei avata, kohalike trükijärjekordade loomiseks ei "
+"paigaldata täiendavat tarkvara. Kokkuvõttes kasutatakse nii vähem mälu ja "
 "kettaruumi. "
 
-#: printer/printerdrake.pm:3998
+#: printer/printerdrake.pm:4357
 #, c-format
 msgid ""
 "Disadvantage is that it is not possible to define local printers then and if "
 "the specified server is down it cannot be printed at all from this machine. "
 msgstr ""
 "Puuduseks on see, et ei ole võimalik määrata kohalikke printereid ja kui "
-"määratud kaugserver ei peaks töötama, ei saa Teie masinast üldse trükkida. "
+"määratud server ei peaks töötama, ei saa Teie masinast üldse trükkida. "
 
-#: printer/printerdrake.pm:4000
+#: printer/printerdrake.pm:4359
 #, c-format
 msgid "How should CUPS be set up on your machine?"
-msgstr "Kuidas CUPS Teie masinal tööle panna?"
+msgstr "Kuidas CUPS Teie masinas tööle panna?"
 
-#: printer/printerdrake.pm:4004 printer/printerdrake.pm:4019
-#: printer/printerdrake.pm:4023 printer/printerdrake.pm:4029
+#: printer/printerdrake.pm:4363 printer/printerdrake.pm:4378
+#: printer/printerdrake.pm:4382 printer/printerdrake.pm:4388
 #, c-format
 msgid "Remote server, specify Name or IP here:"
-msgstr "Kaugserveril, mille nimi või IP aadress on:"
+msgstr "Võrguserveris, mille nimi või IP-aadress on:"
 
-#: printer/printerdrake.pm:4018
+#: printer/printerdrake.pm:4377
 #, c-format
 msgid "Local CUPS printing system"
-msgstr "Kohaliku CUPS trükkimissüsteemina"
+msgstr "Kohaliku CUPS-trükkimissüsteemina"
 
-#: printer/printerdrake.pm:4056
+#: printer/printerdrake.pm:4415
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Printeri spuuleri valik"
 
-#: printer/printerdrake.pm:4057
+#: printer/printerdrake.pm:4416
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Millist trükkimissüsteemi (spuulerit) soovite kasutada?"
 
-#: printer/printerdrake.pm:4105
+#: printer/printerdrake.pm:4464
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Printeri \"%s\" seadistamine ebaõnnestus!"
 
-#: printer/printerdrake.pm:4118
+#: printer/printerdrake.pm:4478
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Foomaticu paigaldamine..."
 
-#: printer/printerdrake.pm:4124
+#: printer/printerdrake.pm:4484
 #, c-format
 msgid "Could not install %s packages, %s cannot be started!"
 msgstr "Ei õnnestunud paigaldada %s paketti, %s käivitamine ei ole võimalik!"
 
-#: printer/printerdrake.pm:4314
+#: printer/printerdrake.pm:4674
 #, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
@@ -13891,161 +14417,160 @@ msgstr ""
 "Seadistatud on järgmised printerid. Topeltklõps printeril võimaldab muuta "
 "selle seadistusi, teha see vaikeprinteriks või vaadata selle infot."
 
-#: printer/printerdrake.pm:4344
+#: printer/printerdrake.pm:4704
 #, c-format
 msgid "Display all available remote CUPS printers"
-msgstr "Näita kõiki saadaolevaid CUPS printserveri printereid"
+msgstr "Näita kõiki saadaolevaid CUPS-serveri printereid"
 
-#: printer/printerdrake.pm:4345
+#: printer/printerdrake.pm:4705
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
-"Värskenda printeriloendit (näitamaks kõiki saadaolevaid CUPS printserveri "
-"printereid)"
+"Värskenda printerite nimekirja (näitamaks kõiki saadaolevaid CUPS-printereid)"
 
-#: printer/printerdrake.pm:4356
+#: printer/printerdrake.pm:4716
 #, c-format
 msgid "CUPS configuration"
-msgstr "CUPSi seadistused"
+msgstr "CUPS-i seadistamine"
 
-#: printer/printerdrake.pm:4368
+#: printer/printerdrake.pm:4728
 #, c-format
 msgid "Change the printing system"
 msgstr "Trükkimissüsteemi muutmine"
 
-#: printer/printerdrake.pm:4377
+#: printer/printerdrake.pm:4737
 #, c-format
 msgid "Normal Mode"
-msgstr "Tavakasutus"
+msgstr "Tavarežiim"
 
-#: printer/printerdrake.pm:4378
+#: printer/printerdrake.pm:4738
 #, c-format
 msgid "Expert Mode"
-msgstr "Ekspertresiim"
+msgstr "Ekspertrežiim"
 
-#: printer/printerdrake.pm:4632 printer/printerdrake.pm:4690
-#: printer/printerdrake.pm:4768 printer/printerdrake.pm:4777
+#: printer/printerdrake.pm:4992 printer/printerdrake.pm:5050
+#: printer/printerdrake.pm:5128 printer/printerdrake.pm:5137
 #, c-format
 msgid "Printer options"
 msgstr "Printeri valikud"
 
-#: printer/printerdrake.pm:4668
+#: printer/printerdrake.pm:5028
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Printeri seadistuste muutmine"
 
-#: printer/printerdrake.pm:4670
+#: printer/printerdrake.pm:5030
 #, c-format
 msgid ""
 "Printer %s%s\n"
 "What do you want to modify on this printer?"
 msgstr ""
 "Printer %s%s\n"
-"Mida soovite muuta?"
+"Mida soovite ette võtta?"
 
-#: printer/printerdrake.pm:4675
+#: printer/printerdrake.pm:5035
 #, c-format
 msgid "This printer is disabled"
 msgstr "See printer on keelatud"
 
-#: printer/printerdrake.pm:4677
+#: printer/printerdrake.pm:5037
 #, c-format
 msgid "Do it!"
-msgstr "Nüüd!"
+msgstr "Tee seda!"
 
-#: printer/printerdrake.pm:4682 printer/printerdrake.pm:4737
+#: printer/printerdrake.pm:5042 printer/printerdrake.pm:5097
 #, c-format
 msgid "Printer connection type"
 msgstr "Printeri ühendusviis"
 
-#: printer/printerdrake.pm:4683 printer/printerdrake.pm:4743
+#: printer/printerdrake.pm:5043 printer/printerdrake.pm:5103
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Printeri nimi, kirjeldus, asukoht"
 
-#: printer/printerdrake.pm:4685 printer/printerdrake.pm:4761
+#: printer/printerdrake.pm:5045 printer/printerdrake.pm:5121
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Printeri tootja, mudel, draiver"
 
-#: printer/printerdrake.pm:4686 printer/printerdrake.pm:4762
+#: printer/printerdrake.pm:5046 printer/printerdrake.pm:5122
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Printeri tootja, mudel"
 
-#: printer/printerdrake.pm:4692 printer/printerdrake.pm:4772
+#: printer/printerdrake.pm:5052 printer/printerdrake.pm:5132
 #, c-format
 msgid "Set this printer as the default"
-msgstr "Määra vaikeprinteriks"
+msgstr "Määramine vaikeprinteriks"
 
-#: printer/printerdrake.pm:4697 printer/printerdrake.pm:4778
-#: printer/printerdrake.pm:4780
+#: printer/printerdrake.pm:5057 printer/printerdrake.pm:5138
+#: printer/printerdrake.pm:5140
 #, c-format
 msgid "Enable Printer"
 msgstr "Printeri lubamine"
 
-#: printer/printerdrake.pm:4700 printer/printerdrake.pm:4783
-#: printer/printerdrake.pm:4785
+#: printer/printerdrake.pm:5060 printer/printerdrake.pm:5143
+#: printer/printerdrake.pm:5145
 #, c-format
 msgid "Disable Printer"
 msgstr "Printeri keelamine"
 
-#: printer/printerdrake.pm:4701 printer/printerdrake.pm:4788
+#: printer/printerdrake.pm:5061 printer/printerdrake.pm:5148
 #, c-format
 msgid "Print test pages"
-msgstr "Trüki testlehekülg(i)"
+msgstr "Testlehekülgede trükkimine"
 
-#: printer/printerdrake.pm:4702 printer/printerdrake.pm:4790
+#: printer/printerdrake.pm:5062 printer/printerdrake.pm:5150
 #, c-format
 msgid "Learn how to use this printer"
-msgstr "Printeri kasutama õppimine"
+msgstr "Tutvumine printeri võimalustega"
 
-#: printer/printerdrake.pm:4703 printer/printerdrake.pm:4792
+#: printer/printerdrake.pm:5063 printer/printerdrake.pm:5152
 #, c-format
 msgid "Remove printer"
-msgstr "Eemalda printer"
+msgstr "Printeri eemaldamine"
 
-#: printer/printerdrake.pm:4750
+#: printer/printerdrake.pm:5110
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Vana printeri \"%s\" eemaldamine..."
 
-#: printer/printerdrake.pm:4781
+#: printer/printerdrake.pm:5141
 #, c-format
 msgid "Printer \"%s\" is now enabled."
 msgstr "Printer \"%s\" on nüüd lubatud."
 
-#: printer/printerdrake.pm:4786
+#: printer/printerdrake.pm:5146
 #, c-format
 msgid "Printer \"%s\" is now disabled."
 msgstr "Printer \"%s\" on nüüd välja lülitatud."
 
-#: printer/printerdrake.pm:4823
+#: printer/printerdrake.pm:5183
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Kas tõesti eemaldada printer \"%s\"?"
 
-#: printer/printerdrake.pm:4827
+#: printer/printerdrake.pm:5187
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Printeri \"%s\" eemaldamine..."
 
-#: printer/printerdrake.pm:4851
+#: printer/printerdrake.pm:5211
 #, c-format
 msgid "Default printer"
 msgstr "Vaikeprinter"
 
-#: printer/printerdrake.pm:4852
+#: printer/printerdrake.pm:5212
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Printer \"%s\" on määratud vaikeprinteriks."
 
-#: raid.pm:36
+#: raid.pm:42
 #, c-format
-msgid "Can't add a partition to _formatted_ RAID %s"
+msgid "Can not add a partition to _formatted_ RAID %s"
 msgstr "Juba _vormindatud_ RAID-ile %s ei saa partitsiooni lisada"
 
-#: raid.pm:132
+#: raid.pm:144
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Ei ole piisavalt partitsioone RAID-%d jaoks\n"
@@ -14072,15 +14597,15 @@ msgid "Could not set permissions of firmware file %s!"
 msgstr "Ei õnnestunud seada õigusi püsivarafailile %s!"
 
 #: scanner.pm:200 standalone/scannerdrake:66 standalone/scannerdrake:70
-#: standalone/scannerdrake:78 standalone/scannerdrake:340
-#: standalone/scannerdrake:415 standalone/scannerdrake:459
-#: standalone/scannerdrake:463 standalone/scannerdrake:485
-#: standalone/scannerdrake:550
+#: standalone/scannerdrake:78 standalone/scannerdrake:346
+#: standalone/scannerdrake:382 standalone/scannerdrake:446
+#: standalone/scannerdrake:490 standalone/scannerdrake:494
+#: standalone/scannerdrake:516 standalone/scannerdrake:581
 #, c-format
 msgid "Scannerdrake"
 msgstr "Scannerdrake"
 
-#: scanner.pm:201 standalone/scannerdrake:916
+#: scanner.pm:201 standalone/scannerdrake:947
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr ""
@@ -14124,7 +14649,7 @@ msgid ""
 msgstr ""
 "Kui on \"KÕIK\", on lubatud nii /etc/issue kui /etc/issue.net.\n"
 "\n"
-"Kui on \"MITTE KEEGI\", ei ole kumbki lubatud.\n"
+"Kui on \"PUUDUB\", ei ole kumbki lubatud.\n"
 "\n"
 "Muidu on lubatud ainult /etc/issue."
 
@@ -14174,13 +14699,13 @@ msgid ""
 "\n"
 "- NONE (no connection)."
 msgstr ""
-"X-i ühenduste lubamine/keelamine:\n"
+"X'i ühenduste lubamine/keelamine:\n"
 "\n"
 "- KÕIK (kõik ühendused on lubatud),\n"
 "\n"
 "- KOHALIK (ainult kohalikud ühendused),\n"
 "\n"
-"- MITTE KEEGI (ühendusi ei lubata)."
+"- PUUDUB (ühendusi ei lubata)."
 
 #: security/help.pm:48
 #, c-format
@@ -14214,7 +14739,7 @@ msgstr ""
 "\n"
 "- ainult kohalikud, kui on \"KOHALIK\",\n"
 "\n"
-"- mitte ühtegi teenust, kui on \"MITTE KEEGI\".\n"
+"- mitte ühtegi teenust, kui on \"PUUDUB\".\n"
 "\n"
 "Vajalike teenuste autoriseerimiseks kasutage faili /etc/hosts.allow (vt. "
 "hosts.allow(5))."
@@ -14302,7 +14827,7 @@ msgstr ""
 #: security/help.pm:92
 #, c-format
 msgid "Use password to authenticate users."
-msgstr "Salasõna kasutamine kasutajate autentimiseks"
+msgstr "Parooli kasutamine kasutajate autentimiseks"
 
 #: security/help.pm:94
 #, c-format
@@ -14322,19 +14847,19 @@ msgstr " sulogin(8) lubamine/keelamine üksikkasutaja tasemel"
 #: security/help.pm:100
 #, c-format
 msgid "Add the name as an exception to the handling of password aging by msec."
-msgstr "Nimi lisatakse erandite hulka, kui msec uurib salasõnade aegumist"
+msgstr "Nimi lisatakse erandite hulka, kui msec uurib paroolide aegumist"
 
 #: security/help.pm:102
 #, c-format
 msgid "Set password aging to \"max\" days and delay to change to \"inactive\"."
 msgstr ""
-"Määrab salasõna aeguma \"maks.\" n päeva pärast ning viivituse enne muutmist "
+"Määrab parooli aeguma \"maks.\" n päeva pärast ning viivituse enne muutmist "
 "\"mittekehtivaks\"."
 
 #: security/help.pm:104
 #, c-format
 msgid "Set the password history length to prevent password reuse."
-msgstr "Salasõna puhvri suuruse määramine vältimaks selle taaskasutamist"
+msgstr "Paroolipuhvri suuruse määramine vältimaks selle taaskasutamist"
 
 #: security/help.pm:106
 #, c-format
@@ -14342,7 +14867,7 @@ msgid ""
 "Set the password minimum length and minimum number of digit and minimum "
 "number of capitalized letters."
 msgstr ""
-"Määrab salasõna minimaalse pikkuse ning numbrite ja suurtähtede minimaalse "
+"Määrab parooli minimaalse pikkuse ning numbrite ja suurtähtede minimaalse "
 "hulga"
 
 #: security/help.pm:108
@@ -14353,7 +14878,7 @@ msgstr "Administraatori umask-i määramine"
 #: security/help.pm:109
 #, c-format
 msgid "if set to yes, check open ports."
-msgstr "Kui on 'jah', kontrollitakse avatud porte."
+msgstr "Kui on \"jah\", kontrollitakse avatud porte."
 
 #: security/help.pm:110
 #, c-format
@@ -14366,11 +14891,11 @@ msgid ""
 "\n"
 "- for users with the 0 id other than root."
 msgstr ""
-"Kui on 'jah', kontrollitakse:\n"
+"Kui on \"jah\", kontrollitakse:\n"
 "\n"
-"- tühja salasõna,\n"
+"- tühja parooli,\n"
 "\n"
-"- salasõna puudumist /etc/shadow-s\n"
+"- parooli puudumist /etc/shadow-s\n"
 "\n"
 "- kasutajaid ID-ga 0, kes pole administraatorid."
 
@@ -14378,52 +14903,53 @@ msgstr ""
 #, c-format
 msgid "if set to yes, check permissions of files in the users' home."
 msgstr ""
-"Kui on 'jah', kontrollitakse failide loabitte kasutajate kodukataloogis."
+"Kui on \"jah\", kontrollitakse failide loabitte kasutajate kodukataloogis."
 
 #: security/help.pm:118
 #, c-format
 msgid "if set to yes, check if the network devices are in promiscuous mode."
-msgstr "Kui on 'jah', kontrollitakse, kas võrguseadmed on mitte-eelisresiimis."
+msgstr ""
+"Kui on \"jah\", kontrollitakse, kas võrguseadmed on mitte-eelisrežiimis."
 
 #: security/help.pm:119
 #, c-format
 msgid "if set to yes, run the daily security checks."
-msgstr "Kui on 'jah', lubatakse igapäevane turvakontroll."
+msgstr "Kui on \"jah\", lubatakse igapäevane turvakontroll."
 
 #: security/help.pm:120
 #, c-format
 msgid "if set to yes, check additions/removals of sgid files."
-msgstr "Kui on 'jah', kontrollitakse sgid failide lisamist/eemaldamist."
+msgstr "Kui on \"jah\", kontrollitakse sgid failide lisamist/eemaldamist."
 
 #: security/help.pm:121
 #, c-format
 msgid "if set to yes, check empty password in /etc/shadow."
-msgstr "Kui on 'jah', kontrollitakse tühja salasõna /etc/shadow-s."
+msgstr "Kui on \"jah\", kontrollitakse tühja parooli /etc/shadow-s."
 
 #: security/help.pm:122
 #, c-format
 msgid "if set to yes, verify checksum of the suid/sgid files."
-msgstr "Kui on 'jah', kontrollitakse suid/sgid failide checksum-i."
+msgstr "Kui on \"jah\", kontrollitakse suid/sgid failide checksum-i."
 
 #: security/help.pm:123
 #, c-format
 msgid "if set to yes, check additions/removals of suid root files."
-msgstr "Kui on 'jah', kontrollitakse suid root failide lisamist/eemaldamist."
+msgstr "Kui on \"jah\", kontrollitakse suid root failide lisamist/eemaldamist."
 
 #: security/help.pm:124
 #, c-format
 msgid "if set to yes, report unowned files."
-msgstr "Kui on 'jah', teatatakse omanikuta failidest."
+msgstr "Kui on \"jah\", teatatakse omanikuta failidest."
 
 #: security/help.pm:125
 #, c-format
 msgid "if set to yes, check files/directories writable by everybody."
-msgstr "Kui on 'jah', kontrollitakse kõigi kirjutatavaid faile/katalooge."
+msgstr "Kui on \"jah\", kontrollitakse kõigi kirjutatavaid faile/katalooge."
 
 #: security/help.pm:126
 #, c-format
 msgid "if set to yes, run chkrootkit checks."
-msgstr "Kui on 'jah', käivitatakse chkrootkit kontroll."
+msgstr "Kui on \"jah\", käivitatakse chkrootkit kontroll."
 
 #: security/help.pm:127
 #, c-format
@@ -14436,7 +14962,7 @@ msgstr ""
 #: security/help.pm:128
 #, c-format
 msgid "if set to yes, report check result by mail."
-msgstr "Kui on 'jah', antakse kontrolli tulemustest teada meilitsi."
+msgstr "Kui on \"jah\", antakse kontrolli tulemustest teada meilitsi."
 
 #: security/help.pm:129
 #, c-format
@@ -14446,17 +14972,17 @@ msgstr "Meili ei saadeta, kui hoiatusi pole"
 #: security/help.pm:130
 #, c-format
 msgid "if set to yes, run some checks against the rpm database."
-msgstr "Kui on 'jah', kontrollitakse veidi rpm andmebaasi."
+msgstr "Kui on \"jah\", kontrollitakse veidi rpm andmebaasi."
 
 #: security/help.pm:131
 #, c-format
 msgid "if set to yes, report check result to syslog."
-msgstr "Kui on 'jah', saadetakse kontrolli tulemused syslog-i."
+msgstr "Kui on \"jah\", saadetakse kontrolli tulemused syslog-i."
 
 #: security/help.pm:132
 #, c-format
 msgid "if set to yes, reports check result to tty."
-msgstr "Kui on 'jah', saadetakse kontrolli tulemused tty-sse."
+msgstr "Kui on \"jah\", saadetakse kontrolli tulemused tty-sse."
 
 #: security/help.pm:134
 #, c-format
@@ -14586,7 +15112,7 @@ msgstr "Su lubamine ainult grupi wheel liikmetele või igale kasutajale"
 #: security/l10n.pm:33
 #, c-format
 msgid "Use password to authenticate users"
-msgstr "Salasõna kasutamine kasutajate autentimiseks"
+msgstr "Parooli kasutamine kasutajate autentimiseks"
 
 #: security/l10n.pm:34
 #, c-format
@@ -14606,22 +15132,22 @@ msgstr "Sulogin(8) üksikkasutaja tasemel"
 #: security/l10n.pm:37
 #, c-format
 msgid "No password aging for"
-msgstr "Salasõna ei aegu"
+msgstr "Parool ei aegu"
 
 #: security/l10n.pm:38
 #, c-format
 msgid "Set password expiration and account inactivation delays"
-msgstr "Salasõna aegumise ja konto tühistamise viivituse määramine"
+msgstr "Parooli aegumise ja konto tühistamise viivituse määramine"
 
 #: security/l10n.pm:39
 #, c-format
 msgid "Password history length"
-msgstr "Salasõna puhvri suurus"
+msgstr "Paroolipuhvri suurus"
 
 #: security/l10n.pm:40
 #, c-format
 msgid "Password minimum length and number of digits and upcase letters"
-msgstr "Salasõna miinimumpikkus ning numbrite ja suurtähtede hulk"
+msgstr "Parooli miinimumpikkus ning numbrite ja suurtähtede hulk"
 
 #: security/l10n.pm:41
 #, c-format
@@ -14661,7 +15187,7 @@ msgstr "Failide loabittide kontroll kasutajate kodukataloogis"
 #: security/l10n.pm:48
 #, c-format
 msgid "Check if the network devices are in promiscuous mode"
-msgstr "Võrguseadmete mitte-eelisresiimis oleku kontroll"
+msgstr "Võrguseadmete mitte-eelisrežiimis oleku kontroll"
 
 #: security/l10n.pm:49
 #, c-format
@@ -14676,7 +15202,7 @@ msgstr "Sgid-failide lisamise/eemaldamise kontroll"
 #: security/l10n.pm:51
 #, c-format
 msgid "Check empty password in /etc/shadow"
-msgstr "Tühja salasõna kontroll /etc/shadow-s"
+msgstr "Tühja parooli kontroll /etc/shadow-s"
 
 #: security/l10n.pm:52
 #, c-format
@@ -14777,7 +15303,7 @@ msgid ""
 "Passwords are now enabled, but use as a networked computer is still not "
 "recommended."
 msgstr ""
-"Salasõnad on nüüd kasutusel, kuid võrku ühendamine ei ole siiski soovitav."
+"Paroolid on nüüd kasutusel, kuid võrku ühendamine ei ole siiski soovitav."
 
 #: security/level.pm:45
 #, c-format
@@ -14793,8 +15319,8 @@ msgid ""
 "There are already some restrictions, and more automatic checks are run every "
 "night."
 msgstr ""
-"Mõned piirangud on juba peal ja igal ööl viiakse läbi veel hulk automaatseid "
-"kontrollimisi."
+"Mõned piirangud on juba peal ja igal ööl kontrollitakse automaatselt mitmeid "
+"turvalisuse aspekte."
 
 #: security/level.pm:47
 #, c-format
@@ -14818,7 +15344,7 @@ msgid ""
 "security features are at their maximum."
 msgstr ""
 "See sarnaneb eelmisele tasemele, ainult et süsteem on täiesti suletud ja "
-"turvaseadistused maksimumi peale keeratud."
+"turvalisus maksimaalne."
 
 #: security/level.pm:55
 #, c-format
@@ -14828,7 +15354,7 @@ msgstr "DrakSeci põhiseadistused"
 #: security/level.pm:56
 #, c-format
 msgid "Please choose the desired security level"
-msgstr "Palun valige meelepärane turvatase"
+msgstr "Palun valige sobiv turvatase"
 
 #: security/level.pm:60
 #, c-format
@@ -15069,9 +15595,9 @@ msgstr "Toetab OKI 4w ja sellega ühilduvaid winprintereid."
 #, c-format
 msgid ""
 "PCMCIA support is usually to support things like ethernet and\n"
-"modems in laptops.  It won't get started unless configured so it is safe to "
-"have\n"
-"it installed on machines that don't need it."
+"modems in laptops.  It will not get started unless configured so it is safe "
+"to have\n"
+"it installed on machines that do not need it."
 msgstr ""
 "PCMCIA tugi on tavaliselt vajalik sülearvutitele võrgu- ja\n"
 "modemiliideste lisamiseks."
@@ -15174,52 +15700,52 @@ msgstr "Laeb draiverid USB-seadmete tarbeks."
 msgid "Starts the X Font Server (this is mandatory for Xorg to run)."
 msgstr "Käivitab X fondiserveri, ilma milleta X lihtsalt ei lähe käima."
 
-#: services.pm:117 services.pm:159
+#: services.pm:115 services.pm:157
 #, c-format
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Valige, millised teenused tuleks alglaadimisel käivitada"
 
-#: services.pm:129
+#: services.pm:127
 #, c-format
 msgid "Printing"
 msgstr "Trükkimine"
 
-#: services.pm:130
+#: services.pm:128
 #, c-format
 msgid "Internet"
 msgstr "Internet"
 
-#: services.pm:133
+#: services.pm:131
 #, c-format
 msgid "File sharing"
 msgstr "Failide jagamine"
 
-#: services.pm:140
+#: services.pm:138
 #, c-format
 msgid "Remote Administration"
-msgstr "Kaughaldus"
+msgstr "Võrguhaldus"
 
-#: services.pm:148
+#: services.pm:146
 #, c-format
 msgid "Database Server"
 msgstr "Andmebaasi server"
 
-#: services.pm:211
+#: services.pm:209
 #, c-format
 msgid "running"
 msgstr "töötab"
 
-#: services.pm:211
+#: services.pm:209
 #, c-format
 msgid "stopped"
 msgstr "peatatud"
 
-#: services.pm:215
+#: services.pm:213
 #, c-format
 msgid "Services and daemons"
 msgstr "Teenused ja deemonid"
 
-#: services.pm:221
+#: services.pm:219
 #, c-format
 msgid ""
 "No additional information\n"
@@ -15228,27 +15754,27 @@ msgstr ""
 "Selle teenuse kohta\n"
 "ei oska lisainfot anda."
 
-#: services.pm:226 ugtk2.pm:1214
+#: services.pm:224 ugtk2.pm:1010
 #, c-format
 msgid "Info"
 msgstr "Info"
 
-#: services.pm:229
+#: services.pm:227
 #, c-format
 msgid "Start when requested"
 msgstr "Vajaduse korral"
 
-#: services.pm:229
+#: services.pm:227
 #, c-format
 msgid "On boot"
 msgstr "Alglaadimisel"
 
-#: services.pm:246
+#: services.pm:244
 #, c-format
 msgid "Start"
 msgstr "Käivita"
 
-#: services.pm:246
+#: services.pm:244
 #, c-format
 msgid "Stop"
 msgstr "Peata"
@@ -15399,7 +15925,7 @@ msgstr ""
 #, c-format
 msgid ""
 "The Download version <b>cannot include</b> all the software that is not open "
-"source. Therefore, you won't find in the Download version:"
+"source. Therefore, you will not find in the Download version:"
 msgstr ""
 "Allatõmmatavas versioonis <b>ei leidu</b> sellist tarkvara, mis ei ole vaba "
 "tarkvara. Seepärast puuduvad selles versioonis:"
@@ -15409,8 +15935,8 @@ msgstr ""
 msgid ""
 "\t* <b>Proprietary drivers</b> (such as drivers for NVIDIA®, ATI™, etc.)."
 msgstr ""
-"\t* <b>Suletud lähtekoodiga draiverid</b> (näiteks NVIDIA® ja ATI™ draiverid "
-"jne.)."
+"\t* <b>Suletud lähtekoodiga draiverid</b> (näiteks NVIDIA® ja ATI™ "
+"originaaldraiverid jne.)."
 
 #: share/advertising/05.pl:19
 #, c-format
@@ -15418,13 +15944,13 @@ msgid ""
 "\t* <b>Proprietary software</b> (such as Acrobat® Reader®, RealPlayer®, "
 "Flash™, etc.)."
 msgstr ""
-"\t* <b>Suletud lähtekoodiga tarkvara (näiteks Acrobat® Reader®, RealPlayer®, "
-"Flash™ jne.)."
+"\t* <b>Suletud lähtekoodiga tarkvara</b> (näiteks Acrobat® Reader®, "
+"RealPlayer®, Flash™ jne.)."
 
 #: share/advertising/05.pl:21
 #, c-format
 msgid ""
-"You won't have access to the <b>services included</b> in the other "
+"You will not have access to the <b>services included</b> in the other "
 "Mandrakesoft products either."
 msgstr ""
 "Teil puudub ligipääs ka muudesse Mandrakesofti toodetesse <b>lisatud "
@@ -15519,17 +16045,17 @@ msgstr "Mandrakelinux 10.1 koosseisu kuuluvad järgmised tooted:"
 #: share/advertising/09.pl:18
 #, c-format
 msgid "\t* <b>Discovery</b>, Your First Linux Desktop."
-msgstr "\t* <b>Discovery - Teie esimene Linuxi töölaud</b>."
+msgstr "\t* <b>Discovery</b> - Teie esimene Linuxi töölaud."
 
 #: share/advertising/09.pl:19
 #, c-format
 msgid "\t* <b>PowerPack</b>, The Ultimate Linux Desktop."
-msgstr "\t* <b>PowerPack - tipptasemel Linuxi töölaud</b>."
+msgstr "\t* <b>PowerPack</b> - tipptasemel Linuxi töölaud."
 
 #: share/advertising/09.pl:20
 #, c-format
 msgid "\t* <b>PowerPack+</b>, The Linux Solution for Desktops and Servers."
-msgstr "\t* <b>PowerPack+ - Linuxi lahendus töölaudadele ja serveritele</b>."
+msgstr "\t* <b>PowerPack+</b> - Linuxi lahendus töölaudadele ja serveritele."
 
 #: share/advertising/09.pl:21
 #, c-format
@@ -15552,14 +16078,14 @@ msgid ""
 "<b>on any computer</b> and without any need to actually install it:"
 msgstr ""
 "Mandrakesoft on välja töötanud kaks toodet, mis lubavad Teil kasutada "
-"Mandrakelinuxit <b>suvalisel arvutil</b>, ilma et te peaksite seda "
-"tegelikult arvutile paigaldamagi:"
+"Mandrakelinuxit <b>suvalises arvutis</b>, ilma et peaksite seda tegelikult "
+"arvutisse paigaldamagi:"
 
 #: share/advertising/10.pl:16
 #, c-format
 msgid ""
 "\t* <b>Move</b>, a Mandrakelinux distribution that runs entirely from a "
-"bootable CD-Rom."
+"bootable CD-ROM."
 msgstr ""
 "\t* <b>Move</b> - Mandrakelinuxi distributsioon, mis töötab täielikult "
 "alglaaditava CD pealt."
@@ -15571,7 +16097,7 @@ msgid ""
 "ultra-compact “LaCie Mobile Hard Drive”."
 msgstr ""
 "\t* <b>GlobeTrotter</b> - Mandrakelinuxi distributsioon, mis on juba "
-"paigaldatud ülikompaktsele \"LaCie välisele kõvakettale\"."
+"paigaldatud ülikompaktsele LaCie välisele kõvakettale."
 
 #: share/advertising/11.pl:13
 #, c-format
@@ -15614,13 +16140,13 @@ msgid ""
 "and user-friendly <b>graphical desktop environment</b> available."
 msgstr ""
 "Discovery korral on teil võimalik kasutusele võtta <b>KDE</b> - kõige "
-"arenenum ja kasutajasõbralikum <b>graafiline töökeskkond</b>."
+"täiuslikum ja kasutajasõbralikum <b>graafiline töökeskkond</b>."
 
 #: share/advertising/12.pl:17
 #, c-format
 msgid ""
 "KDE will make your <b>first steps</b> with Linux so <b>easy</b> that you "
-"won't ever think of running another operating system!"
+"will not ever think of running another operating system!"
 msgstr ""
 "KDE muudab Teie <b>esimesed sammud</b> Linuxis nii <b>lihtsaks</b>, et kui "
 "Te olete harjunud mõne muu operatsioonisüsteemiga, ei pruugi Te vahet "
@@ -15655,8 +16181,8 @@ msgid ""
 "KDE is one of the <b>most advanced</b> and <b>user-friendly</b> graphical "
 "desktop environment available. It includes a lot of integrated applications."
 msgstr ""
-"KDE on üks <b>kõige arenenumaid</b> ja <b>kasutajasõbralikumaid</b> "
-"graafilis töökeskkonid. KDE pakub ka terve hulga integreeritud rakendusi."
+"KDE on üks <b>kõige täiuslikumaid</b> ja <b>kasutajasõbralikumaid</b> "
+"graafilisi töökeskkondi. KDE pakub ka terve hulga integreeritud rakendusi."
 
 #: share/advertising/13-a.pl:19 share/advertising/13-b.pl:19
 #, c-format
@@ -15693,7 +16219,7 @@ msgid ""
 "It is a <b>full-featured office suite</b> that includes word processor, "
 "spreadsheet, presentation and drawing applications."
 msgstr ""
-"See on <b>kõigi võimalustega kontoritöö paket</b>, mille hulka kuulub "
+"See on <b>kõigi võimalustega kontoritöö pakett</b>, mille hulka kuulub "
 "teksti- ja tabelitöötluse, esitluste loomise ja joonistusrakendus."
 
 #: share/advertising/14.pl:19
@@ -15703,8 +16229,8 @@ msgid ""
 "documents such as Word, Excel and PowerPoint® files."
 msgstr ""
 "OpenOffice.org suudab avada ja salvestada enam-vähem kõiki <b>Microsoft® "
-"Office</b> dokumentide tüüpe, sealhulgas Wordi, Exceli ja PowerPoint®  "
-"failid."
+"Office'i</b> dokumentide tüüpe, sealhulgas Word'i, Excel'i ja PowerPoint®  "
+"faile."
 
 #: share/advertising/15.pl:13
 #, c-format
@@ -15734,7 +16260,7 @@ msgid ""
 "It is the easiest way to communicate with your contacts and to organize your "
 "time."
 msgstr ""
-"Kontact - see on lihtsaim võimalus suhelda oma kontaktidega ja organiseerida "
+"Kontact - see on lihtsaim võimalus suhelda oma kontaktidega ja korraldada "
 "enda ajakasutust."
 
 #: share/advertising/16.pl:13
@@ -15751,7 +16277,7 @@ msgstr ""
 #: share/advertising/16.pl:16
 #, c-format
 msgid "\t* Browse the <b>Web</b> with Konqueror."
-msgstr "\t* Konqueror viib Teid kõikjale <b>veebis</b>"
+msgstr "\t* Konqueror viib Teid kõikjale <b>veebis</b>."
 
 #: share/advertising/16.pl:17
 #, c-format
@@ -15761,7 +16287,7 @@ msgstr "\t* Kopete lubab oma sõpradega võrgus <b>vestelda</b>."
 #: share/advertising/16.pl:18
 #, c-format
 msgid "\t* <b>Transfer</b> files with KBear."
-msgstr "\t* KBear aitab Teil faile <b>üle interneti liigutada</b>."
+msgstr "\t* KBear aitab Teil faile <b>üle Interneti liigutada</b>."
 
 #: share/advertising/16.pl:19 share/advertising/17.pl:19
 #: share/advertising/18.pl:22
@@ -15820,8 +16346,8 @@ msgid ""
 "\t* Manage your personal data with the integrated personal information "
 "suites <b>Kontact</b> and <b>Evolution</b>."
 msgstr ""
-"\t* <b>Kontact</b> ja <b>Evolution</b> pakuvad igakülgseid võimalusi oma "
-"personaalset infot integreeritud keskkonnas hallata."
+"\t* <b>Kontact</b> ja <b>Evolution</b> pakuvad igakülgseid võimalusi hallata "
+"oma personaalset infot integreeritud keskkonnas."
 
 #: share/advertising/18.pl:18
 #, c-format
@@ -15866,7 +16392,7 @@ msgid ""
 msgstr ""
 "Teil on võimalik nautida KDE võimsat integreeritud arenduskeskkonda "
 "<b>KDevelop</b>, mis lubab programmeerida väga paljudes "
-"programmeerimiskeelte."
+"programmeerimiskeeltes."
 
 #: share/advertising/19.pl:19
 #, c-format
@@ -15874,7 +16400,7 @@ msgid ""
 "PowerPack also ships with <b>GCC</b>, the leading Linux compiler and <b>GDB</"
 "b>, the associated debugger."
 msgstr ""
-"PowerPack sisaldab ka Linuxi põhilist kompilaatorit <b>GCC</b> ning sellega "
+"PowerPack sisaldab ka Linuxi tuntuimat kompilaatorit <b>GCC</b> ning sellega "
 "seotud silumisprogrammi <b>GDB</b>."
 
 #: share/advertising/20.pl:13
@@ -15975,14 +16501,14 @@ msgid ""
 "leading Linux compiler <b>GCC</b>, you will be able to create applications "
 "in <b>many different languages</b> (C, C++, Java™, Perl, Python, etc.)."
 msgstr ""
-"Võimsa integreeritud arenduskeskkonna <b>KDevelop</b> ja Linuxi põhilise "
+"Võimsa integreeritud arenduskeskkonna <b>KDevelop</b> ja Linuxi tuntuima "
 "kompilaatori <b>GCC</b> abil on Teil võimalik luua rakendusi <b>paljudes "
 "erinevates programmeerimiskeeltes</b> (C, C++, Java™, Perl, Python jne.)."
 
 #: share/advertising/23.pl:13
 #, c-format
 msgid "<b>Groupware Server</b>"
-msgstr "<b>Grupitöö serveri</b>"
+msgstr "<b>Grupitööserver</b>"
 
 #: share/advertising/23.pl:15
 #, c-format
@@ -16056,7 +16582,7 @@ msgstr ""
 #, c-format
 msgid ""
 "\t* <b>ProFTPD</b>: The highly configurable GPL-licensed FTP server software."
-msgstr "\t* <b>ProFTPD</b>: äärmiselt paindlik vaba tarkvara FTP server."
+msgstr "\t* <b>ProFTPD</b>: äärmiselt paindlik vaba tarkvara FTP-server."
 
 #: share/advertising/24.pl:21
 #, c-format
@@ -16079,7 +16605,7 @@ msgid ""
 "your computer."
 msgstr ""
 "<b>Mandrakelinuxi juhtimiskeskus</b> koondab ühtekokku olulised, "
-"Mandrakelinuxile spetsiifilised vahendid, et Te saaksite oma arvutit "
+"Mandrakelinuxile spetsiifilised tööriistad, et Te saaksite oma arvutit "
 "lihtsamalt ja mugavamalt seadistada."
 
 #: share/advertising/25.pl:17
@@ -16108,8 +16634,8 @@ msgid ""
 "and the development of Mandrakelinux, <b>please</b> consider buying one of "
 "our products or services!"
 msgstr ""
-"Nagu programmeerimine üldse, nõuab ka vaba takrvara arendamiseks <b>aega ja "
-"inimesi</b>. Vaba takrvara põhimõtete vaimu elushoidmiseks müüb Mandrakesoft "
+"Nagu programmeerimine üldse, nõuab ka vaba tarkvara arendamiseks <b>aega ja "
+"inimesi</b>. Vaba tarkvara põhimõtete vaimu elushoidmiseks müüb Mandrakesoft "
 "oma tooteid ja teenuseid, et <b>aidata arendada Mandrakelinuxit</b>. Kui ka "
 "Teie soovite <b>toetada vaba tarkvara põhimõtteid</b> ning Mandrakelinuxi "
 "arendustegevust, kaaluge <b>palun</b> mõtet osta mõni meie toode või teenus!"
@@ -16140,7 +16666,7 @@ msgid ""
 "This platform has just been <b>redesigned</b> to improve its efficiency and "
 "usability."
 msgstr ""
-"Tõhususe ja kasutamishõlpsuse suurendamise huvides võtsime hiljaaegu ette "
+"Suurema tõhususe ja hõlpsama kasutamise huvides võtsime hiljaaegu ette "
 "Internetikaupluse suurema <b>ümberkujundamise</b>."
 
 #: share/advertising/27.pl:21
@@ -16159,7 +16685,8 @@ msgid ""
 "<b>Mandrakeclub</b> is the <b>perfect companion</b> to your Mandrakelinux "
 "product.."
 msgstr ""
-"<b>Mandrakeclub> on <b>suurepärane kaaslane</b> Teie Mandrakelinuxi tootele."
+"<b>Mandrakeclub</b> on <b>suurepärane kaaslane</b> Teie Mandrakelinuxi "
+"tootele."
 
 #: share/advertising/28.pl:17
 #, c-format
@@ -16185,7 +16712,7 @@ msgid ""
 "drivers)."
 msgstr ""
 "\t* Ligipääs <b>kommertsrakendustele</b> (näiteks NVIDIA® või ATI™ "
-"draiverid)."
+"originaaldraiverid)."
 
 #: share/advertising/28.pl:20
 #, c-format
@@ -16198,8 +16725,8 @@ msgid ""
 "\t* <b>Early and privileged access</b>, before public release, to "
 "Mandrakelinux <b>ISO images</b>."
 msgstr ""
-"\t* <b>Varane ja privlegeeritud ligipääs</b> juba enne ametlikku väljalaset "
-"Mandrakelinuxi <b>ISO tõmmistele</b>."
+"\t* <b>Varane ja privilegeeritud ligipääs</b> juba enne ametlikku väljalaset "
+"Mandrakelinuxi <b>ISO-tõmmistele</b>."
 
 #: share/advertising/29.pl:13
 #, c-format
@@ -16286,7 +16813,7 @@ msgstr ""
 #: share/compssUsers.pl:25
 #, c-format
 msgid "Office Workstation"
-msgstr "Kontori tööjaam"
+msgstr "Kontori-tööjaam"
 
 #: share/compssUsers.pl:27
 #, c-format
@@ -16295,7 +16822,7 @@ msgid ""
 "(OpenOffice.org Calc, Kspread), PDF viewers, etc"
 msgstr ""
 "Kontoritöö programmid: tekstitöötlus (OpenOffice.org Writer, Kword), "
-"tabeltöötlus (OpenOffice.org Calc, Kspread), PDF vaatajad jne"
+"tabelitöötlus (OpenOffice.org Calc, Kspread), PDF-failide näitajad jne"
 
 #: share/compssUsers.pl:28
 #, c-format
@@ -16303,8 +16830,8 @@ msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
-"Kontoritöö programmid: tekstitöötlus (kword, abiword), tabeltöötlus "
-"(kspread, gnumeric), PDF vaatajad jne"
+"Kontoritöö programmid: tekstitöötlus (kword, abiword), tabelitöötlus "
+"(kspread, gnumeric), PDF-failide näitajad jne"
 
 #: share/compssUsers.pl:33
 #, c-format
@@ -16319,7 +16846,7 @@ msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
 #: share/compssUsers.pl:37
 #, c-format
 msgid "Multimedia station"
-msgstr "Multimeedia tööjaam"
+msgstr "Multimeedia-tööjaam"
 
 #: share/compssUsers.pl:38
 #, c-format
@@ -16337,7 +16864,7 @@ msgid ""
 "Set of tools to read and send mail and news (mutt, tin..) and to browse the "
 "Web"
 msgstr ""
-"Valik rakendusi meili ja uudiste lugemiseks (mutt, tin...) ning veebi "
+"Valik rakendusi e-posti ja uudiste lugemiseks (mutt, tin...) ning veebi "
 "lehitsemiseks"
 
 #: share/compssUsers.pl:49
@@ -16358,7 +16885,7 @@ msgstr "Seadistamine"
 #: share/compssUsers.pl:55
 #, c-format
 msgid "Tools to ease the configuration of your computer"
-msgstr "Vahendid süsteemi lihtsamaks administreerimiseks"
+msgstr "Vahendid süsteemi lihtsamaks haldamiseks"
 
 #: share/compssUsers.pl:59
 #, c-format
@@ -16373,7 +16900,7 @@ msgstr "Redaktorid, shellid, terminalid, failihaldus"
 #: share/compssUsers.pl:65 share/compssUsers.pl:165
 #, c-format
 msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
+msgstr "C ja C++ arendusteegid, rakendused ja päisefailid"
 
 #: share/compssUsers.pl:69 share/compssUsers.pl:169
 #, c-format
@@ -16393,7 +16920,7 @@ msgstr "LSB"
 #: share/compssUsers.pl:75 share/compssUsers.pl:174
 #, c-format
 msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Võõraste rakenduste toetus"
+msgstr "Linux Standard Base. Kolmandate tootjate rakenduste toetus"
 
 #: share/compssUsers.pl:85
 #, c-format
@@ -16418,7 +16945,7 @@ msgstr "Tulemüür/marsruuter"
 #: share/compssUsers.pl:93 share/compssUsers.pl:134
 #, c-format
 msgid "Internet gateway"
-msgstr "Internetiasjad"
+msgstr "Internet"
 
 #: share/compssUsers.pl:96
 #, c-format
@@ -16428,7 +16955,7 @@ msgstr "E-post/Uudistegrupid"
 #: share/compssUsers.pl:97
 #, c-format
 msgid "Postfix mail server, Inn news server"
-msgstr "Postfix meiliserver, Inn uudisteserver"
+msgstr "Postfixi e-posti server, Inn uudisteserver"
 
 #: share/compssUsers.pl:100
 #, c-format
@@ -16438,7 +16965,7 @@ msgstr "Kataloogiserver"
 #: share/compssUsers.pl:104
 #, c-format
 msgid "FTP Server"
-msgstr "FTP server"
+msgstr "FTP-server"
 
 #: share/compssUsers.pl:105
 #, c-format
@@ -16463,7 +16990,7 @@ msgstr "Faili- ja printserver"
 #: share/compssUsers.pl:113
 #, c-format
 msgid "NFS Server, Samba server"
-msgstr "NFS server, Samba server"
+msgstr "NFS-server, Samba-server"
 
 #: share/compssUsers.pl:116 share/compssUsers.pl:129
 #, c-format
@@ -16473,7 +17000,7 @@ msgstr "Andmebaasid"
 #: share/compssUsers.pl:117
 #, c-format
 msgid "PostgreSQL and MySQL Database Server"
-msgstr "PostgreSQL ja MySQL andmebaasiserver"
+msgstr "PostgreSQL- ja MySQL-andmebaasiserver"
 
 #: share/compssUsers.pl:121
 #, c-format
@@ -16493,12 +17020,12 @@ msgstr "E-post"
 #: share/compssUsers.pl:126
 #, c-format
 msgid "Postfix mail server"
-msgstr "Postfix meiliserver"
+msgstr "Postfixi e-posti server"
 
 #: share/compssUsers.pl:130
 #, c-format
 msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL või MySQL andmebaasiserver"
+msgstr "PostgreSQL- või MySQL-andmebaasiserver"
 
 #: share/compssUsers.pl:137
 #, c-format
@@ -16508,7 +17035,7 @@ msgstr "Võrguserver"
 #: share/compssUsers.pl:138
 #, c-format
 msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
+msgstr "NFS-, SMB-, SSH-server, puhverserver (proxy)"
 
 #: share/compssUsers.pl:146
 #, c-format
@@ -16520,8 +17047,7 @@ msgstr "KDE tööjaam"
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
-msgstr ""
-"K töölaua keskkond: graafiline töökeskkond ja rida seonduvaid rakendusi"
+msgstr "K töölaua keskkond: graafiline töökeskkond ja palju rakendusi"
 
 #: share/compssUsers.pl:151
 #, c-format
@@ -16553,7 +17079,7 @@ msgstr "Utiliidid"
 #: share/compssUsers.pl:181 share/compssUsers.pl:182 standalone/logdrake:381
 #, c-format
 msgid "SSH Server"
-msgstr "SSH server"
+msgstr "SSH-server"
 
 #: share/compssUsers.pl:186
 #, c-format
@@ -16563,7 +17089,7 @@ msgstr "Webmin"
 #: share/compssUsers.pl:187
 #, c-format
 msgid "Webmin Remote Configuration Server"
-msgstr "Webmin kaugseadistusserver"
+msgstr "Webmin võrguseadistusserver"
 
 #: share/compssUsers.pl:191
 #, c-format
@@ -16577,7 +17103,7 @@ msgstr "Jälgimisvahendid, protsesside jälgimine, tcpdump, nmap..."
 
 #: share/compssUsers.pl:196
 #, c-format
-msgid "MandrakeSoft Wizards"
+msgid "Mandrakesoft Wizards"
 msgstr "Mandrakesofti nõustajad"
 
 #: share/compssUsers.pl:197
@@ -16637,8 +17163,8 @@ msgstr ""
 "\n"
 "--default             : salvestab vaikekataloogid.\n"
 "--debug               : näitab kõiki silumisteateid.\n"
-"--show-conf           : varundatavate failide või kataloogide loend.\n"
-"--config-info         : selgitab seadistustefaili võtmeid (X-i "
+"--show-conf           : varundatavate failide või kataloogide nimekiri.\n"
+"--config-info         : selgitab seadistustefaili võtmeid (X'i "
 "mittekasutajaile).\n"
 "--daemon              : kasutab deemoni seadistusi.\n"
 "--help                : näitab käesolevat abiteadet.\n"
@@ -16657,7 +17183,7 @@ msgstr ""
 "VÕTMED:\n"
 "  --boot            - alglaadija seadistamise lubamine\n"
 "  --splash          - alglaadimisteema seadistamise lubamine\n"
-"vaikeresiim: pakutakse võimalust seadistada automaatset sisselogimist"
+"vaikerežiim: pakutakse võimalust seadistada automaatset sisselogimist"
 
 #: standalone.pm:57
 #, c-format
@@ -16779,7 +17305,7 @@ msgid ""
 "--disconnect : disconnect to internet if already connected\n"
 "--force : used with (dis)connect : force (dis)connection.\n"
 "--status : returns 1 if connected 0 otherwise, then exit.\n"
-"--quiet : don't be interactive. To be used with (dis)connect."
+"--quiet : do not be interactive. To be used with (dis)connect."
 msgstr ""
 "[VÕTMED]\n"
 "Kohtvõrgu ja Interneti ühenduse ja jälgimise rakendus\n"
@@ -16800,18 +17326,18 @@ msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 #, c-format
 msgid ""
 "[OPTION]...\n"
-"  --no-confirmation      don't ask first confirmation question in "
+"  --no-confirmation      do not ask first confirmation question in "
 "MandrakeUpdate mode\n"
-"  --no-verify-rpm        don't verify packages signatures\n"
+"  --no-verify-rpm        do not verify packages signatures\n"
 "  --changelog-first      display changelog before filelist in the "
 "description window\n"
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr ""
 "[VÕTI]...\n"
 "  --no-confirmation      ei küsita esimest kinnitust MandrakeUpdate "
-"resiimis\n"
+"režiimis\n"
 "  -no-verify-rpm        pakettide signatuure ei kontrollita\n"
-"  --changelog-first      näitab kirjelduse aknas enne faililoendit "
+"  --changelog-first      näitab kirjelduse aknas enne failinimekirja "
 "muudatuste logi\n"
 "  -merge-all-rpmnew     proovib liita kõik leitud failid .rpmnew/.rpmsave"
 
@@ -16833,7 +17359,7 @@ msgid ""
 msgstr ""
 " [kõik]\n"
 "       XFDrake [--noauto] monitor\n"
-"       XFDrake kuvatihedus"
+"       XFDrake ekraanilahutus"
 
 #: standalone.pm:133
 #, c-format
@@ -16846,27 +17372,32 @@ msgstr ""
 "Kasutamine: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
 "testing] [-v|--version]"
 
-#: standalone/XFdrake:85
+#: standalone/XFdrake:61
+#, c-format
+msgid "You need to reboot for changes to take effect"
+msgstr "Muudatuste rakendamiseks tuleb arvuti uuesti käivitada"
+
+#: standalone/XFdrake:92
 #, c-format
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Palun väljuge ja vajutage siis Ctrl+Alt+BackSpace"
 
-#: standalone/XFdrake:89
+#: standalone/XFdrake:96
 #, c-format
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "Muudatuste rakendamiseks tuleb end uuesti sisse logida"
 
-#: standalone/drakTermServ:76
+#: standalone/drakTermServ:74
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Kasutu ilma terminaliserverita"
 
-#: standalone/drakTermServ:108 standalone/drakTermServ:114
+#: standalone/drakTermServ:106 standalone/drakTermServ:112
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s nõuab kasutajatunnust...\n"
 
-#: standalone/drakTermServ:125
+#: standalone/drakTermServ:123
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -16875,69 +17406,79 @@ msgstr ""
 "%s: %s nõuab masina nime, MAC aadressi, IP-d, nbi-laadepilti, 0/1 "
 "THIN_CLIENT puhul, 0/1 kohaliku seadistuse puhul...\n"
 
-#: standalone/drakTermServ:131
+#: standalone/drakTermServ:129
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s nõuab masina nime...\n"
 
-#: standalone/drakTermServ:213 standalone/drakTermServ:216
+#: standalone/drakTermServ:211 standalone/drakTermServ:214
 #, c-format
 msgid "Terminal Server Configuration"
-msgstr "Terminaliserveri seadistus"
+msgstr "Terminaliserveri seadistamine"
 
-#: standalone/drakTermServ:231
+#: standalone/drakTermServ:220
 #, c-format
 msgid "Enable Server"
 msgstr "Serveri lubamine"
 
-#: standalone/drakTermServ:237
+#: standalone/drakTermServ:226
 #, c-format
 msgid "Disable Server"
 msgstr "Serveri keelamine"
 
-#: standalone/drakTermServ:245
+#: standalone/drakTermServ:232
 #, c-format
 msgid "Start Server"
 msgstr "Serveri käivitamine"
 
-#: standalone/drakTermServ:251
+#: standalone/drakTermServ:238
 #, c-format
 msgid "Stop Server"
 msgstr "Serveri peatamine"
 
-#: standalone/drakTermServ:259
+#: standalone/drakTermServ:247
 #, c-format
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot diskett/ISO"
 
-#: standalone/drakTermServ:263
+#: standalone/drakTermServ:251
 #, c-format
 msgid "Net Boot Images"
 msgstr "Võrgu alglaadefailid"
 
-#: standalone/drakTermServ:269
+#: standalone/drakTermServ:258
 #, c-format
 msgid "Add/Del Users"
 msgstr "Lisa/kustuta kasutaja"
 
-#: standalone/drakTermServ:273
+#: standalone/drakTermServ:262
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Lisa/kustuta klient"
 
-#: standalone/drakTermServ:284 standalone/drakbug:47
+#: standalone/drakTermServ:270
+#, c-format
+msgid "Images"
+msgstr "Laadefailid"
+
+#: standalone/drakTermServ:271
+#, c-format
+msgid "Clients/Users"
+msgstr "Kliendid/kasutajad"
+
+#: standalone/drakTermServ:289 standalone/drakbug:47
 #, c-format
 msgid "First Time Wizard"
 msgstr "Esimese korra nõustaja"
 
-#: standalone/drakTermServ:315 standalone/drakTermServ:316
+#: standalone/drakTermServ:325 standalone/drakTermServ:326
 #, c-format
 msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
 msgstr ""
 "%s on määratud aknahalduriks, GDM kasutaja lisatakse faili /etc/passwd$"
 "$CLIENT$$"
 
-#: standalone/drakTermServ:322
+#: standalone/drakTermServ:332
 #, c-format
 msgid ""
 "\n"
@@ -16961,7 +17502,7 @@ msgid ""
 msgstr ""
 "\n"
 " See nõustaja:\n"
-" \t1) Palub valida 'õhukese' või 'paksu' kliendi.\n"
+" \t1) Palub valida \"õhukese\" või \"paksu\" kliendi.\n"
 " \t2) Seadistab DHCP.\n"
 "\t\n"
 "Pärast neid samme nõustaja:\n"
@@ -16979,22 +17520,27 @@ msgstr ""
 "    f) Kui tegemist on õhukese kliendiga, küsib, kas soovite taaskävitada "
 "KDM-i.\n"
 
-#: standalone/drakTermServ:367
+#: standalone/drakTermServ:377
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Välju nõustajast"
 
-#: standalone/drakTermServ:379
+#: standalone/drakTermServ:392
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Palun salvestage dhcpd seadistus!"
 
-#: standalone/drakTermServ:407
+#: standalone/drakTermServ:420
 #, c-format
 msgid "Use thin clients."
 msgstr "Õhukeste klientide lubamine."
 
-#: standalone/drakTermServ:409
+#: standalone/drakTermServ:422
+#, c-format
+msgid "Sync client X keyboard settings with server."
+msgstr "Kliendi X'i klaviatuuri seadistused sünkroniseeritakse serveriga."
+
+#: standalone/drakTermServ:424
 #, c-format
 msgid ""
 "Please select default client type.\n"
@@ -17003,40 +17549,35 @@ msgid ""
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
 msgstr ""
 "Palun valige kliendi tüüp.\n"
-"    'Õhuke' klient kasutab kõike serveri protsessori/RAM-i abil, kliendi "
+"    \"Õhuke\" klient kasutab kõike serveri protsessori/RAM-i abil, kliendi "
 "poolel on ainult monitor.\n"
-"    'Paks' klient kasutab enda protsessorit/RAM-i, kuid serveri "
+"    \"Paks\" klient kasutab enda protsessorit/RAM-i, kuid serveri "
 "failisüsteemi."
 
-#: standalone/drakTermServ:421 standalone/drakTermServ:1034
-#, c-format
-msgid "Sync client X keyboard settings with server."
-msgstr "Kliendi X'i klaviatuuri seadistused sünkroniseeritakse serveriga."
-
-#: standalone/drakTermServ:428
+#: standalone/drakTermServ:444
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Võrgulaadepiltide loomine kõigile kernelitele"
 
-#: standalone/drakTermServ:429 standalone/drakTermServ:726
-#: standalone/drakTermServ:742
+#: standalone/drakTermServ:445 standalone/drakTermServ:747
+#: standalone/drakTermServ:764
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Selleks kulub päris mitu minutit."
 
-#: standalone/drakTermServ:433 standalone/drakTermServ:452
+#: standalone/drakTermServ:449 standalone/drakTermServ:468
 #, c-format
 msgid "Done!"
 msgstr "Tehtud!"
 
-#: standalone/drakTermServ:438
+#: standalone/drakTermServ:454
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 "Serveri kasutajate nimekirja sünkroniseerimine kliendi nimekirjaga "
 "(sealhulgas administraator)"
 
-#: standalone/drakTermServ:458
+#: standalone/drakTermServ:474
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -17045,12 +17586,12 @@ msgstr ""
 "Õhukese kliendi muudatuste rakendamiseks tuleb kuvahaldur uuesti käivitada. "
 "Kas teha taaskäivitus nüüd?"
 
-#: standalone/drakTermServ:493
+#: standalone/drakTermServ:509
 #, c-format
 msgid "Terminal Server Overview"
 msgstr "Terminaliserveri ülevaade"
 
-#: standalone/drakTermServ:494
+#: standalone/drakTermServ:510
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -17075,7 +17616,7 @@ msgstr ""
 "        \tmis kaasatakse faili dhcpd.conf, tuleb luua etherboot-laadepildid "
 "vähemalt ühele kernelile."
 
-#: standalone/drakTermServ:500
+#: standalone/drakTermServ:516
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -17097,7 +17638,7 @@ msgstr ""
 "         - /etc/dhcpd.conf haldamine:\n"
 "        \t\tEt klient saaks teha alglaadimise võrgust, vajab iga klient "
 "kirjet failis dhcpd.conf,\n"
-"        \t\tmis omistab masinale IP aadressi ja võrgulaadepildi. "
+"        \t\tmis omistab masinale IP-aadressi ja võrgulaadepildi. "
 "drakServTerm aitab neid\n"
 "        \t\tkirjeid luua/eemaldada.\n"
 "\t\t\t\n"
@@ -17110,7 +17651,7 @@ msgstr ""
 "        \t\tTüüpiline dhcpd.conf-i lõik, mis toetab kettata tööjaama, näeb "
 "välja selline:"
 
-#: standalone/drakTermServ:518
+#: standalone/drakTermServ:534
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -17148,7 +17689,7 @@ msgid ""
 "        Note: You must stop/start the server after adding or changing "
 "clients."
 msgstr ""
-"\t\t\tKuigi võib kasutada ka IP aadresside valimikku, selle asemel et "
+"\t\t\tKuigi võib kasutada ka IP-aadresside valimikku, selle asemel et "
 "määrata igale\n"
 "\t\t\tkliendi masinale eraldi kirje, võimaldab fikseeritud aadress "
 "kasutamine siiski\n"
@@ -17156,11 +17697,11 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tMärkus: kirjet \"#type\" kasutab ainult drakTermServ.  Kliendid võivad "
 "olla \n"
-"\t\t\tkas \"thin\" või 'fat'.  \"Õhuke\" klient kasutab enamikku tarkvara "
-"serveril XDMCP\n"
+"\t\t\tkas \"thin\" või \"fat\".  \"Õhuke\" klient kasutab enamikku tarkvara "
+"serveris XDMCP\n"
 "\t\t\tvahendusel, \"paksud\" kliendid aga jooksutavad takrvara enamasti "
 "kliendi\n"
-"\t\t\tmasinal. Õhukeste klientide jaoks kirjutatakse eraldi inittab-fail\n"
+"\t\t\tmasinas. Õhukeste klientide jaoks kirjutatakse eraldi inittab-fail\n"
 "\t\t\t%s. Õhukeste klientide puhul muudetakse XDMCP\n"
 "\t\t\tvõimaldamiseks süsteemi seadetefaile xdm-config, kdmrc ja gdm.conf. "
 "Kuivõrd\n"
@@ -17170,9 +17711,9 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tNote: Ka kirjet \"#hdw_config\" kasutab ainult drakTermServ.  Kliendid "
 "võivad olla kas \n"
-"\t\t\tkas 'true' või 'false'.  'true' lubab administraatori sisselogimist "
-"kliendi masinal ning \n"
-"\t\t\theli, hiire ja X-i riistvara kohalikku seadistamist 'drak' "
+"\t\t\tkas \"true\" või \"false\".  \"true\" lubab administraatori "
+"sisselogimist kliendi masinas ning \n"
+"\t\t\theli, hiire ja X'i riistvara kohalikku seadistamist \"drak\"-"
 "vahenditega. See saab võimalikuks \n"
 "\t\t\teraldi seadistustefailide loomisega, mis on seotud kliendi IP "
 "aadressiga, samuti \n"
@@ -17184,7 +17725,7 @@ msgstr ""
 "\t\t\tMärkus: server tuleb peatada/käivitada pärast kliendi lisamist või "
 "muutmist."
 
-#: standalone/drakTermServ:538
+#: standalone/drakTermServ:554
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -17215,7 +17756,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tkus SUBNET/MASK määrab Teie võrku."
 
-#: standalone/drakTermServ:550
+#: standalone/drakTermServ:566
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -17232,7 +17773,7 @@ msgstr ""
 "        \t\tdrakTermServ aitab süsteemi kasutajaid faili lisada või sealt "
 "eemaldada."
 
-#: standalone/drakTermServ:554
+#: standalone/drakTermServ:570
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -17248,7 +17789,7 @@ msgstr ""
 "        \t\tserveri juurfailisüsteemis. Kliendi kohalikku riistvara "
 "seadistamist lubades aitab drakTermServ neid luua."
 
-#: standalone/drakTermServ:559
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -17276,13 +17817,13 @@ msgstr ""
 "modules.conf, /etc/sysconfig/mouse, /etc/sysconfig/keyboard.\n"
 "\n"
 "        Märkus: Kliendi kohaliku riistvara seadistamine lubamine võimaldab "
-"administraatorina terminaliserverile \n"
-"        sisse logida igal klientmasinal, millel see võimalus on lubatud.  "
+"administraatorina terminaliserverisse \n"
+"        sisse logida igas klientmasinas, millel see võimalus on lubatud.  "
 "Kohaliku seadistuse saab \n"
 "        tagasi muuta, hankides seadistustefailid uuesti, kui klientmasin on "
 "seadistatud."
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:584
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -17333,11 +17874,11 @@ msgstr ""
 "        \t\t\n"
 "        \t\tSiin tehtud muudatused võrreldes vaikepaigaldusega muudavad "
 "tühistamislipu\n"
-"        \t\tväärtuseks 'no' ning kataloogirajaks muudetakse /var/lib/"
+"        \t\tväärtuseks \"no\" ning kataloogirajaks muudetakse /var/lib/"
 "tftpboot, kuhu mkinitrd\n"
 "        \t\tsalvestab oma laadepildid."
 
-#: standalone/drakTermServ:589
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -17368,62 +17909,72 @@ msgstr ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:624
+#: standalone/drakTermServ:640
 #, c-format
 msgid "Boot Floppy"
 msgstr "Alglaadimisdiskett"
 
-#: standalone/drakTermServ:626
+#: standalone/drakTermServ:642
 #, c-format
 msgid "Boot ISO"
 msgstr "Alglaadimis-ISO"
 
-#: standalone/drakTermServ:628
+#: standalone/drakTermServ:644
 #, c-format
 msgid "PXE Image"
 msgstr "PXE laadefail"
 
-#: standalone/drakTermServ:696
+#: standalone/drakTermServ:712
 #, c-format
 msgid "Default kernel version"
 msgstr "Kerneli vaikeversioon"
 
-#: standalone/drakTermServ:724
+#: standalone/drakTermServ:715
+#, c-format
+msgid "Create PXE images."
+msgstr "PXE laadefailide loomine."
+
+#: standalone/drakTermServ:745
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Loo terve kernel -->"
 
-#: standalone/drakTermServ:731
+#: standalone/drakTermServ:753
 #, c-format
 msgid "No kernel selected!"
 msgstr "Kernelit pole valitud!"
 
-#: standalone/drakTermServ:734
+#: standalone/drakTermServ:756
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Loo ainus võrgukaart -->"
 
-#: standalone/drakTermServ:738
+#: standalone/drakTermServ:760
 #, c-format
 msgid "No NIC selected!"
 msgstr "Võrgukaarti pole valitud!"
 
-#: standalone/drakTermServ:741
+#: standalone/drakTermServ:763
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Loo kõik kernelid -->"
 
-#: standalone/drakTermServ:749
+#: standalone/drakTermServ:774
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Kustuta"
 
-#: standalone/drakTermServ:756
+#: standalone/drakTermServ:779
+#, c-format
+msgid "No image selected!"
+msgstr "Laadefaili pole valitud!"
+
+#: standalone/drakTermServ:782
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Kustuta kõik võrgu alglaadefailid"
 
-#: standalone/drakTermServ:843
+#: standalone/drakTermServ:908
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -17436,27 +17987,27 @@ msgstr ""
 "võimaldada\n"
 "sisselogimist."
 
-#: standalone/drakTermServ:848
+#: standalone/drakTermServ:913
 #, c-format
 msgid "Add User -->"
 msgstr "Lisa kasutaja -->"
 
-#: standalone/drakTermServ:854
+#: standalone/drakTermServ:919
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Kustuta kasutaja"
 
-#: standalone/drakTermServ:890
+#: standalone/drakTermServ:955
 #, c-format
 msgid "type: %s"
 msgstr "tüüp: %s"
 
-#: standalone/drakTermServ:894
+#: standalone/drakTermServ:959
 #, c-format
 msgid "local config: %s"
 msgstr "kohalik seadistus: %s"
 
-#: standalone/drakTermServ:924
+#: standalone/drakTermServ:989
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -17465,67 +18016,76 @@ msgstr ""
 "Kohalik riistvara\n"
 "seadistus on lubatud."
 
-#: standalone/drakTermServ:933
+#: standalone/drakTermServ:998
 #, c-format
 msgid "No net boot images created!"
 msgstr "Võrgu alglaadefaile pole loodud!"
 
-#: standalone/drakTermServ:951
+#: standalone/drakTermServ:1017
 #, c-format
 msgid "Thin Client"
 msgstr "Õhuke klient"
 
-#: standalone/drakTermServ:955
+#: standalone/drakTermServ:1021
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Luba õhukesi kliente"
 
-#: standalone/drakTermServ:956
+#: standalone/drakTermServ:1022
+#, c-format
+msgid ""
+"Sync client X keyboard\n"
+" settings with server."
+msgstr ""
+"Kliendi X'i klaviatuuri seadistused\n"
+"sünkroniseeritakse serveriga."
+
+#: standalone/drakTermServ:1023
 #, c-format
 msgid "Add Client -->"
 msgstr "Lisa klient -->"
 
-#: standalone/drakTermServ:970
+#: standalone/drakTermServ:1037
 #, c-format
 msgid "type: fat"
 msgstr "tüüp: paks (fat)"
 
-#: standalone/drakTermServ:971
+#: standalone/drakTermServ:1038
 #, c-format
 msgid "type: thin"
 msgstr "tüüp: õhuke (thin)"
 
-#: standalone/drakTermServ:978
+#: standalone/drakTermServ:1045
 #, c-format
 msgid "local config: false"
 msgstr "kohalik seadistus: false"
 
-#: standalone/drakTermServ:979
+#: standalone/drakTermServ:1046
 #, c-format
 msgid "local config: true"
 msgstr "kohalik seadistus: true"
 
-#: standalone/drakTermServ:987
+#: standalone/drakTermServ:1054
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Muuda klienti"
 
-#: standalone/drakTermServ:1013
+#: standalone/drakTermServ:1080
 #, c-format
 msgid "Disable Local Config"
 msgstr "Kohalik seadistus on keelatud"
 
-#: standalone/drakTermServ:1020
+#: standalone/drakTermServ:1087
 #, c-format
 msgid "Delete Client"
 msgstr "Kustuta klient"
 
-#: standalone/drakTermServ:1029
+#: standalone/drakTermServ:1096
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Dhcpd seadistamine..."
 
-#: standalone/drakTermServ:1045
+#: standalone/drakTermServ:1111
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -17534,78 +18094,78 @@ msgstr ""
 "Muutuste täielikuks jõustamiseks tuleb kuvahaldur taaskäivitada.\n"
 "(käsurealt: service dm restart)"
 
-#: standalone/drakTermServ:1085
+#: standalone/drakTermServ:1156
 #, c-format
-msgid "Thin clients won't work with autologin. Disable autologin?"
+msgid "Thin clients will not work with autologin. Disable autologin?"
 msgstr ""
 "Automaatne sisselogimine õhukestel klientidel ei toimi. Kas see keelata?"
 
-#: standalone/drakTermServ:1101
+#: standalone/drakTermServ:1172
 #, c-format
 msgid "All clients will use %s"
 msgstr "%s kõigile klientidele"
 
-#: standalone/drakTermServ:1133
+#: standalone/drakTermServ:1204
 #, c-format
 msgid "Subnet:"
 msgstr "Alamvõrk:"
 
-#: standalone/drakTermServ:1140
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Netmask:"
 msgstr "Võrgumask:"
 
-#: standalone/drakTermServ:1147
+#: standalone/drakTermServ:1218
 #, c-format
 msgid "Routers:"
 msgstr "Ruuterid:"
 
-#: standalone/drakTermServ:1154
+#: standalone/drakTermServ:1225
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Alamvõrgu mask:"
 
-#: standalone/drakTermServ:1161
+#: standalone/drakTermServ:1232
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Üldlevi aadress:"
 
-#: standalone/drakTermServ:1168
+#: standalone/drakTermServ:1239
 #, c-format
 msgid "Domain Name:"
 msgstr "Domeeninimi:"
 
-#: standalone/drakTermServ:1176
+#: standalone/drakTermServ:1247
 #, c-format
 msgid "Name Servers:"
 msgstr "Nimeserverid:"
 
-#: standalone/drakTermServ:1187
+#: standalone/drakTermServ:1258
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP vahemiku algus:"
 
-#: standalone/drakTermServ:1188
+#: standalone/drakTermServ:1259
 #, c-format
 msgid "IP Range End:"
 msgstr "IP vahemiku lõpp:"
 
-#: standalone/drakTermServ:1230
+#: standalone/drakTermServ:1301
 #, c-format
 msgid "Append TS Includes To Existing Config"
 msgstr "TS kaasatud lisatakse olemasolevasse seadistusse"
 
-#: standalone/drakTermServ:1232
+#: standalone/drakTermServ:1303
 #, c-format
 msgid "Write Config"
 msgstr "Salvesta seadistus"
 
-#: standalone/drakTermServ:1248
+#: standalone/drakTermServ:1319
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Dhcpd serveri seadistamine"
 
-#: standalone/drakTermServ:1249
+#: standalone/drakTermServ:1320
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -17615,97 +18175,97 @@ msgstr ""
 "Enamik väärtusi on võetud Teie töötavast\n"
 "süsteemist. Võite neid vajadusel muuta."
 
-#: standalone/drakTermServ:1252
+#: standalone/drakTermServ:1323
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Dünaamiline IP-aadresside vahemik:"
 
-#: standalone/drakTermServ:1399
+#: standalone/drakTermServ:1474
 #, c-format
 msgid "Please insert floppy disk:"
 msgstr "Sisestage palun diskett:"
 
-#: standalone/drakTermServ:1403
+#: standalone/drakTermServ:1478
 #, c-format
-msgid "Couldn't access the floppy!"
+msgid "Could not access the floppy!"
 msgstr "Disketti ei õnnestunud leida!"
 
-#: standalone/drakTermServ:1405
+#: standalone/drakTermServ:1480
 #, c-format
 msgid "Floppy can be removed now"
 msgstr "Disketi võib nüüd välja võtta"
 
-#: standalone/drakTermServ:1408
+#: standalone/drakTermServ:1483
 #, c-format
 msgid "No floppy drive available!"
 msgstr "Disketiseade ei ole kättesaadav!"
 
-#: standalone/drakTermServ:1413
+#: standalone/drakTermServ:1488
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "PXE laadefail on %s/%s"
 
-#: standalone/drakTermServ:1415
+#: standalone/drakTermServ:1490
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Viga faili %s/%s kirjutamisel"
 
-#: standalone/drakTermServ:1424
+#: standalone/drakTermServ:1500
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO-laadefail on %s"
 
-#: standalone/drakTermServ:1426
+#: standalone/drakTermServ:1502
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Midagi läks valesti! - Kas mkisofs on ikka paigaldatud?"
 
-#: standalone/drakTermServ:1447
+#: standalone/drakTermServ:1523
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Esmalt tuleb luua /etc/dhcpd.conf!"
 
-#: standalone/drakTermServ:1602
+#: standalone/drakTermServ:1683
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
-msgstr "%s salasõna terminaliserveris ei sobi - kirjutatakse uuesti...\n"
+msgstr "%s parool terminaliserveris ei sobi - kirjutatakse uuesti...\n"
 
-#: standalone/drakTermServ:1615
+#: standalone/drakTermServ:1696
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s ei ole kasutaja...\n"
 
-#: standalone/drakTermServ:1616
+#: standalone/drakTermServ:1697
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s on juba terminaliserveri kasutaja\n"
 
-#: standalone/drakTermServ:1618
+#: standalone/drakTermServ:1699
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
-msgstr "%s lisamine terminaliserverile ebaõnnestus!\n"
+msgstr "%s lisamine terminaliserverisse ebaõnnestus!\n"
 
-#: standalone/drakTermServ:1620
+#: standalone/drakTermServ:1701
 #, c-format
 msgid "%s added to Terminal Server\n"
-msgstr "%s lisati terminaliserverile\n"
+msgstr "%s lisati terminaliserverisse\n"
 
-#: standalone/drakTermServ:1666
+#: standalone/drakTermServ:1718
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Kustutati %s...\n"
 
-#: standalone/drakTermServ:1668 standalone/drakTermServ:1741
+#: standalone/drakTermServ:1720 standalone/drakTermServ:1793
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s jäi leidmata...\n"
 
-#: standalone/drakTermServ:1769
+#: standalone/drakTermServ:1821
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allow ja /etc/hosts.deny on juba seadistatud - ei muudeta"
 
-#: standalone/drakTermServ:1921
+#: standalone/drakTermServ:1961
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Seadistust on muudetud - kas käivitada clusternfs/dhcpd uuesti?"
@@ -17717,8 +18277,8 @@ msgstr "Viga!"
 
 #: standalone/drakautoinst:39
 #, c-format
-msgid "I can't find needed image file `%s'."
-msgstr "Ei suudetud leida laadefaili '%s'."
+msgid "I can not find needed image file `%s'."
+msgstr "Ei suudetud leida laadefaili \"%s\"."
 
 #: standalone/drakautoinst:41
 #, c-format
@@ -17743,14 +18303,14 @@ msgstr ""
 "Püüate hakata seadistama automaatpaigalduse disketti. See on natuke ohtlik "
 "tegevus, mida tuleb teha väga ettevaatlikult.\n"
 "\n"
-"Seda võimalust kasutades saate korrata arvutile tehtud paigaldust ning mõne "
+"Seda võimalust kasutades saate korrata arvutisse tehtud paigaldust ning mõne "
 "sammu puhul ka ise kaasa rääkida, et üksikuid väärtusi muuta.\n"
 "\n"
-"Täieliku turvalisuse huvides ei tuleks partitsioneerimist ja vormindamist "
+"Täieliku turvalisuse huvides ei tuleks kõvaketta jagamist ja vormindamist "
 "kunagi lubada automaatselt sooritada, seda hoolimata sellest, millise "
-"võimaluse kasuks olete paigalduse algul otsustanud.\n"
+"võimaluse kasuks olete paigaldamise algul otsustanud.\n"
 "\n"
-"Vajutage jätkamiseks 'Olgu'."
+"Klõpsake jätkamiseks nupule \"Olgu\"."
 
 #: standalone/drakautoinst:60
 #, c-format
@@ -17774,7 +18334,7 @@ msgid ""
 "will be manual"
 msgstr ""
 "Valige palun iga sammu puhul, kas selle peaks läbi viima automaatselt, nagu "
-"see sooritati paigalduse ajal, või soovite seal ise kaasa rääkida"
+"see sooritati paigaldamise ajal, või soovite seal ise kaasa rääkida"
 
 #: standalone/drakautoinst:77 standalone/drakautoinst:78
 #: standalone/drakautoinst:92
@@ -17805,8 +18365,8 @@ msgstr ""
 "\n"
 "Automaatpaigalduse parameetrid on näha vasakul"
 
-#: standalone/drakautoinst:252 standalone/drakgw:600 standalone/drakvpn:902
-#: standalone/scannerdrake:375
+#: standalone/drakautoinst:252 standalone/drakgw:597 standalone/drakvpn:902
+#: standalone/scannerdrake:405
 #, c-format
 msgid "Congratulations!"
 msgstr "Õnnitleme!"
@@ -17818,7 +18378,7 @@ msgid ""
 "You may now replay your installation."
 msgstr ""
 "Diskett on edukalt loodud.\n"
-"Nüüd võite vajadusel paigaldust korrata."
+"Nüüd võite vajadusel paigaldamist korrata."
 
 #: standalone/drakautoinst:289
 #, c-format
@@ -17845,7 +18405,7 @@ msgstr "hd"
 msgid "tape"
 msgstr "lint"
 
-#: standalone/drakbackup:153
+#: standalone/drakbackup:152
 #, c-format
 msgid ""
 "Expect is an extension to the TCL scripting language that allows interactive "
@@ -17854,21 +18414,21 @@ msgstr ""
 "Expect on skriptikeele TCL laiend, mis võimaldab interaktiivseid seansse "
 "ilma kasutaja sekkumiseta."
 
-#: standalone/drakbackup:154
+#: standalone/drakbackup:153
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "Parool salvestatakse selle süsteemi tarbeks drakbackupi seadistustes."
 
-#: standalone/drakbackup:155
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
 "the cdrw is erased before each backup."
 msgstr ""
-"Mitmeseansilise CD korral puhastatakse CD-RW ainult esimesel seansil. "
-"Märkimatajätmisel puhastatakse CD-RW enne iga varundamist."
+"Mitmeseansilise CD korral tühjendatakse CD-RW ainult esimesel seansil. "
+"Märkimatajätmisel tühjendatakse CD-RW enne iga varundamist."
 
-#: standalone/drakbackup:156
+#: standalone/drakbackup:155
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -17877,7 +18437,7 @@ msgstr ""
 "Selle märkimine võimaldab salvestada muudetud failid. Täpne viis sõltub "
 "sellest, kas valida muut- või diferentsvarundus."
 
-#: standalone/drakbackup:157
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -17886,16 +18446,16 @@ msgstr ""
 "Muutvarundus salvestab ainult pärast viimast varundamist muudetud või loodud "
 "failid."
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
 "original 'base' backup."
 msgstr ""
-"Diferentsvarundus salvestab ainult pärast 'baasvarunduse' loomist muudetud "
+"Diferentsvarundus salvestab ainult pärast \"baasvarunduse\" loomist muudetud "
 "või loodud failid."
 
-#: standalone/drakbackup:159
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "This should be a local user or email address that you want the backup "
@@ -17905,7 +18465,7 @@ msgstr ""
 "posti aadressid, kellele/kuhu antakse teada varunduse tulemustest. Selleks "
 "läheb vaja toimivat meiliedastusagenti."
 
-#: standalone/drakbackup:160
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -17914,7 +18474,7 @@ msgstr ""
 "Kataloogipuu tipus failis .backupignore loetletud faile või metamärkidega "
 "tähistatud faile ei varundata."
 
-#: standalone/drakbackup:161
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -17925,17 +18485,17 @@ msgstr ""
 "seejärel liigutatakse muule andmekandjale. Selle valiku märkimine eemaldab "
 "pärast varundamist kõvakettalt tar-failid."
 
-#: standalone/drakbackup:162
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
 "than using a directory path, you would use the 'module' name for the service "
 "path."
 msgstr ""
-"Mõningad protokollid, näiteks rsync, seadistatakse serveril ning nende puhul "
-"tuleks kataloogi otsingutee asemel kasutada teenuse 'mooduli' nime."
+"Mõningad protokollid, näiteks rsync, seadistatakse serveris ning nende puhul "
+"tuleks kataloogi otsingutee asemel kasutada teenuse \"mooduli\" nime."
 
-#: standalone/drakbackup:163
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -17944,28 +18504,28 @@ msgstr ""
 "Isetehtud võimaldab Teil määrata päeva ja aja oma tahtmist mööda. Muude "
 "võimaluste puhul kasutatakse /etc/crontab-is leiduvat run-parts'i."
 
-#: standalone/drakbackup:327
+#: standalone/drakbackup:326
 #, c-format
 msgid "No media selected for cron operation."
 msgstr "Cron-i operatsiooniks pole andmekandjat valitud."
 
-#: standalone/drakbackup:331
+#: standalone/drakbackup:330
 #, c-format
 msgid "No interval selected for cron operation."
 msgstr "Cron-i operatsiooniks pole intervalli valitud."
 
-#: standalone/drakbackup:378
+#: standalone/drakbackup:377
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Intervalliga cron-i saab tarvitada ainult administraator"
 
-#: standalone/drakbackup:463 standalone/logdrake:437
+#: standalone/drakbackup:462 standalone/logdrake:437
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr ""
 "\"%s\" ei ole korrektne e-posti aadress ega olemasolev kohalik kasutaja!"
 
-#: standalone/drakbackup:467 standalone/logdrake:442
+#: standalone/drakbackup:466 standalone/logdrake:442
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -17974,22 +18534,22 @@ msgstr ""
 "\"%s\" on kohalik kasutaja, aga Te ei valinud kohalikku SMPT-d, nii et peate "
 "kasutama täielikku e-posti aadressi!"
 
-#: standalone/drakbackup:476
+#: standalone/drakbackup:475
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "Kehtivat nimekirja on muudetud, seadistustefail kirjutatakse uuesti."
 
-#: standalone/drakbackup:478
+#: standalone/drakbackup:477
 #, c-format
 msgid "Old user list:\n"
 msgstr "Vanad kasutajate failid:\n"
 
-#: standalone/drakbackup:480
+#: standalone/drakbackup:479
 #, c-format
 msgid "New user list:\n"
 msgstr "Uued kasutajate failid:\n"
 
-#: standalone/drakbackup:525
+#: standalone/drakbackup:524
 #, c-format
 msgid ""
 "\n"
@@ -17998,7 +18558,7 @@ msgstr ""
 "\n"
 "                      DrakBackupi raport \n"
 
-#: standalone/drakbackup:526
+#: standalone/drakbackup:525
 #, c-format
 msgid ""
 "\n"
@@ -18007,7 +18567,7 @@ msgstr ""
 "\n"
 "                      DrakBackup deemoni raport\n"
 
-#: standalone/drakbackup:532
+#: standalone/drakbackup:531
 #, c-format
 msgid ""
 "\n"
@@ -18020,13 +18580,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:557 standalone/drakbackup:628
-#: standalone/drakbackup:684
+#: standalone/drakbackup:556 standalone/drakbackup:627
+#: standalone/drakbackup:683
 #, c-format
 msgid "Total progress"
 msgstr "Edenemine kokku"
 
-#: standalone/drakbackup:610
+#: standalone/drakbackup:609
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -18037,44 +18597,44 @@ msgstr ""
 "%s on olemas, kas kustutada?\n"
 "\n"
 "Kui te olete selle protsessi juba sooritanud, tuleks Teil\n"
-" ka kirje kustutada serveril autoriseeritud võtmete seast."
+" ka kirje kustutada serveris autoriseeritud võtmete seast."
 
-#: standalone/drakbackup:619
+#: standalone/drakbackup:618
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Võtmete genereerimine võtab mõne hetke aega"
 
-#: standalone/drakbackup:626
+#: standalone/drakbackup:625
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "%s tekitamine ebaõnnestus."
 
-#: standalone/drakbackup:643
+#: standalone/drakbackup:642
 #, c-format
 msgid "No password prompt on %s at port %s"
-msgstr "Parooli ei pärita masinal %s pordis %s"
+msgstr "Parooli ei pärita masinas %s pordis %s"
 
-#: standalone/drakbackup:644
+#: standalone/drakbackup:643
 #, c-format
 msgid "Bad password on %s"
 msgstr "Halb parool %s puhul"
 
-#: standalone/drakbackup:645
+#: standalone/drakbackup:644
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "%s ülekandmiseks %s-le puudub luba"
 
-#: standalone/drakbackup:646
+#: standalone/drakbackup:645
 #, c-format
-msgid "Can't find %s on %s"
+msgid "Can not find %s on %s"
 msgstr "%s leidmine %s-l ebaõnnestus"
 
-#: standalone/drakbackup:650
+#: standalone/drakbackup:649
 #, c-format
 msgid "%s not responding"
 msgstr "%s ei vasta"
 
-#: standalone/drakbackup:654
+#: standalone/drakbackup:653
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -18085,53 +18645,53 @@ msgid ""
 "without being prompted for a password."
 msgstr ""
 "Ülekanne oli edukas\n"
-"Võite kontrollida, kas suudate serverile sisse logida käsuga:\n"
+"Võite kontrollida, kas suudate serverisse sisse logida käsuga:\n"
 "\n"
 "ssh -i %s %s@%s\n"
 "\n"
 "ilma et Teilt küsitaks parooli."
 
-#: standalone/drakbackup:698
+#: standalone/drakbackup:697
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "WebDAVi kaugsait on juba sünkroonis!"
 
-#: standalone/drakbackup:702
+#: standalone/drakbackup:701
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "WebDAVi edastus ebaõnnestus!"
 
-#: standalone/drakbackup:723
+#: standalone/drakbackup:722
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "CD-R/DVD-R ei ole seadmes!"
 
-#: standalone/drakbackup:727
+#: standalone/drakbackup:726
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "See ei paista küll olevat kirjutatav andmekandja!"
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:731
 #, c-format
 msgid "Not erasable media!"
 msgstr "Seda andmekandjat ei saa puhastada!"
 
-#: standalone/drakbackup:774
+#: standalone/drakbackup:773
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Andmekandja puhastamine võtab mõni hetk aega"
 
-#: standalone/drakbackup:832
+#: standalone/drakbackup:831
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "CD-le ligipääsul tekkis loaprobleem."
 
-#: standalone/drakbackup:859
+#: standalone/drakbackup:858
 #, c-format
 msgid "No tape in %s!"
 msgstr "Seadmes %s puudub lint!"
 
-#: standalone/drakbackup:966
+#: standalone/drakbackup:965
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -18140,37 +18700,37 @@ msgstr ""
 "Varunduskvoot on lõhki!\n"
 "%d MB kasutatud, %d MB eraldatud."
 
-#: standalone/drakbackup:985 standalone/drakbackup:1018
+#: standalone/drakbackup:984 standalone/drakbackup:1017
 #, c-format
 msgid "Backup system files..."
 msgstr "Süsteemsete failide varundamine..."
 
-#: standalone/drakbackup:1019 standalone/drakbackup:1060
+#: standalone/drakbackup:1018 standalone/drakbackup:1059
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Kõvaketta varundamine..."
 
-#: standalone/drakbackup:1059
+#: standalone/drakbackup:1058
 #, c-format
 msgid "Backup User files..."
 msgstr "Kasutajafailide varundamine..."
 
-#: standalone/drakbackup:1094
+#: standalone/drakbackup:1093
 #, c-format
 msgid "Backup Other files..."
 msgstr "Muude failide varundamine..."
 
-#: standalone/drakbackup:1095
+#: standalone/drakbackup:1094
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Kõvaketta varundamise edenemine..."
 
-#: standalone/drakbackup:1100
+#: standalone/drakbackup:1099
 #, c-format
 msgid "No changes to backup!"
 msgstr "Varukoopiaga võrreldes pole mingeid muutusi!"
 
-#: standalone/drakbackup:1118 standalone/drakbackup:1142
+#: standalone/drakbackup:1117 standalone/drakbackup:1141
 #, c-format
 msgid ""
 "\n"
@@ -18181,7 +18741,7 @@ msgstr ""
 "Drakbackupi tegevus %s vahendusel:\n"
 "\n"
 
-#: standalone/drakbackup:1127
+#: standalone/drakbackup:1126
 #, c-format
 msgid ""
 "\n"
@@ -18191,18 +18751,18 @@ msgstr ""
 "\n"
 " FTP ühenduse probleem: FTP kaudu pole võimalik saata Teie varukoopiafaile.\n"
 
-#: standalone/drakbackup:1128
+#: standalone/drakbackup:1127
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr "Viga faili saatmisel FTP kaudu. Palun korrigeerige FTP seadistusi."
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:1129
 #, c-format
 msgid "file list sent by FTP: %s\n"
-msgstr "FTP kaudu saadetud faililoend: %s\n"
+msgstr "FTP kaudu saadetud failinimekiri: %s\n"
 
-#: standalone/drakbackup:1147
+#: standalone/drakbackup:1146
 #, c-format
 msgid ""
 "\n"
@@ -18213,7 +18773,7 @@ msgstr ""
 "Drakbackupi tegevus CD vahendusel:\n"
 "\n"
 
-#: standalone/drakbackup:1152
+#: standalone/drakbackup:1151
 #, c-format
 msgid ""
 "\n"
@@ -18224,22 +18784,22 @@ msgstr ""
 "Drakbackupi tegevus lindi vahendusel:\n"
 "\n"
 
-#: standalone/drakbackup:1161
+#: standalone/drakbackup:1160
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "Viga meili saatmisel. Raportimeili ei õnnestunud saata."
 
-#: standalone/drakbackup:1162
+#: standalone/drakbackup:1161
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Viga meili saatmisel. \n"
 
-#: standalone/drakbackup:1192
+#: standalone/drakbackup:1191
 #, c-format
-msgid "Can't create catalog!"
+msgid "Can not create catalog!"
 msgstr "Kataloogi ei õnnestunud luua!"
 
-#: standalone/drakbackup:1414
+#: standalone/drakbackup:1420
 #, c-format
 msgid ""
 "\n"
@@ -18248,219 +18808,219 @@ msgstr ""
 "\n"
 "Märkige pakun ära kõik vajalikud valikud.\n"
 
-#: standalone/drakbackup:1415
+#: standalone/drakbackup:1421
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 "Need valikud lubavad varundada ja taastada kõik failid kataloogis /etc.\n"
 
-#: standalone/drakbackup:1416
+#: standalone/drakbackup:1422
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Süsteemsete failide varundamine (kataloog /etc)"
 
-#: standalone/drakbackup:1417 standalone/drakbackup:1481
-#: standalone/drakbackup:1547
+#: standalone/drakbackup:1423 standalone/drakbackup:1487
+#: standalone/drakbackup:1553
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "Muut/diferentsvarunduse kasutamine (vanu varukoopiaid ei asendata)"
 
-#: standalone/drakbackup:1419 standalone/drakbackup:1483
-#: standalone/drakbackup:1549
+#: standalone/drakbackup:1425 standalone/drakbackup:1489
+#: standalone/drakbackup:1555
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "Muutvarunduse kasutamine"
 
-#: standalone/drakbackup:1419 standalone/drakbackup:1483
-#: standalone/drakbackup:1549
+#: standalone/drakbackup:1425 standalone/drakbackup:1489
+#: standalone/drakbackup:1555
 #, c-format
 msgid "Use Differential Backups"
 msgstr "Diferentsvarunduse kasutamine"
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1427
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Kriitilised failid jäetakse välja (passwd, group, fstab)"
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1428
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr "Selle valikuga võite taastada kataloogi /etc suvalise versiooni."
 
-#: standalone/drakbackup:1453
+#: standalone/drakbackup:1459
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "Märkige palun kõik kasutajad, keda soovite varukoopiasse kaasata."
 
-#: standalone/drakbackup:1480
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Veebilehitseja mälupuhvri kõrvalejätmine"
 
-#: standalone/drakbackup:1534
+#: standalone/drakbackup:1540
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
-msgstr "Valige failid või kataloogid ja klõpsake 'Olgu'"
+msgstr "Valige failid või kataloogid ja klõpsake \"Olgu\""
 
-#: standalone/drakbackup:1535 standalone/drakfont:660
+#: standalone/drakbackup:1541 standalone/drakfont:661
 #, c-format
 msgid "Remove Selected"
 msgstr "Eemalda valitud"
 
-#: standalone/drakbackup:1598
+#: standalone/drakbackup:1604
 #, c-format
 msgid "Users"
 msgstr "Kasutajad"
 
-#: standalone/drakbackup:1618
+#: standalone/drakbackup:1624
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Võrguühenduse kasutamine varundamiseks"
 
-#: standalone/drakbackup:1620
+#: standalone/drakbackup:1626
 #, c-format
 msgid "Net Method:"
 msgstr "Võrgumeetod:"
 
-#: standalone/drakbackup:1624
+#: standalone/drakbackup:1630
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Expecti kasutamine SSH jaoks"
 
-#: standalone/drakbackup:1625
+#: standalone/drakbackup:1631
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Loo/kanna üle varundusvõtmed SSH jaoks"
 
-#: standalone/drakbackup:1627
+#: standalone/drakbackup:1633
 #, c-format
 msgid "Transfer Now"
 msgstr "Kanna kohe üle"
 
-#: standalone/drakbackup:1629
+#: standalone/drakbackup:1635
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Muud (drakbackupi-välised) võtmed on juba paigas"
 
-#: standalone/drakbackup:1632
+#: standalone/drakbackup:1638
 #, c-format
 msgid "Host name or IP."
 msgstr "Masinanimi või IP"
 
-#: standalone/drakbackup:1637
+#: standalone/drakbackup:1643
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
-msgstr "Kataloog (või moodul), kuhu sellel masinal varukoopia salvestada"
+msgstr "Kataloog (või moodul), kuhu selles masinas varukoopia salvestada"
 
-#: standalone/drakbackup:1649
+#: standalone/drakbackup:1655
 #, c-format
 msgid "Remember this password"
-msgstr "Salasõna jäetakse meelde"
+msgstr "Parool jäetakse meelde"
 
-#: standalone/drakbackup:1665
+#: standalone/drakbackup:1671
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Vaja läheb masinanime, kasutajatunnust ja parooli!"
 
-#: standalone/drakbackup:1756
+#: standalone/drakbackup:1762
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Varundamine CD-R/DVD-R-ile"
 
-#: standalone/drakbackup:1759
+#: standalone/drakbackup:1765
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "CD/DVD-seade"
 
-#: standalone/drakbackup:1764
+#: standalone/drakbackup:1770
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Valige CD/DVD plaadi suurus"
 
-#: standalone/drakbackup:1771
+#: standalone/drakbackup:1777
 #, c-format
 msgid "Multisession CD"
 msgstr "Mitmeseansiline CD"
 
-#: standalone/drakbackup:1773
+#: standalone/drakbackup:1779
 #, c-format
 msgid "CDRW media"
 msgstr "CD-RW plaat"
 
-#: standalone/drakbackup:1779
+#: standalone/drakbackup:1785
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "RW plaadi puhastamine (esimene seanss)"
 
-#: standalone/drakbackup:1780
+#: standalone/drakbackup:1786
 #, c-format
 msgid " Erase Now "
 msgstr " Puhasta nüüd! "
 
-#: standalone/drakbackup:1786
+#: standalone/drakbackup:1792
 #, c-format
 msgid "DVD+RW media"
 msgstr "DVD+RW plaat"
 
-#: standalone/drakbackup:1788
+#: standalone/drakbackup:1794
 #, c-format
 msgid "DVD-R media"
 msgstr "DVD-R plaat"
 
-#: standalone/drakbackup:1790
+#: standalone/drakbackup:1796
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM seade"
 
-#: standalone/drakbackup:1821
+#: standalone/drakbackup:1827
 #, c-format
 msgid "No CD device defined!"
 msgstr "CD-seade on määramata!"
 
-#: standalone/drakbackup:1863
+#: standalone/drakbackup:1869
 #, c-format
 msgid "Use tape to backup"
 msgstr "Varundamine lindile"
 
-#: standalone/drakbackup:1866
+#: standalone/drakbackup:1872
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Varundamiseks kasutatava seadme nimi"
 
-#: standalone/drakbackup:1872
+#: standalone/drakbackup:1878
 #, c-format
 msgid "Backup directly to tape"
 msgstr "Varundamine otse lindile"
 
-#: standalone/drakbackup:1878
+#: standalone/drakbackup:1884
 #, c-format
-msgid "Don't rewind tape after backup"
+msgid "Do not rewind tape after backup"
 msgstr "Linti ei kerita pärast varundamist algusse"
 
-#: standalone/drakbackup:1884
+#: standalone/drakbackup:1890
 #, c-format
 msgid "Erase tape before backup"
-msgstr "Lint puhastatakse enne varundamist"
+msgstr "Lint tühjendatakse enne varundamist"
 
-#: standalone/drakbackup:1890
+#: standalone/drakbackup:1896
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Lint väljastatakse pärast varundamist"
 
-#: standalone/drakbackup:1962
+#: standalone/drakbackup:1968
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Kataloog, kuhu salvestada:"
 
-#: standalone/drakbackup:1966
+#: standalone/drakbackup:1972
 #, c-format
 msgid "Directory to save to"
 msgstr "Kataloog, kuhu salvestada"
 
-#: standalone/drakbackup:1971
+#: standalone/drakbackup:1977
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -18469,311 +19029,316 @@ msgstr ""
 "Drakbackupi suurim\n"
 " lubatud suurus (MB)"
 
-#: standalone/drakbackup:2035
+#: standalone/drakbackup:2041
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CD-R / DVD-R"
 
-#: standalone/drakbackup:2040
+#: standalone/drakbackup:2046
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Kõvaketas / NFS"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2056
-#: standalone/drakbackup:2061
+#: standalone/drakbackup:2061 standalone/drakbackup:2062
+#: standalone/drakbackup:2067
 #, c-format
 msgid "hourly"
 msgstr "kord tunnis"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2057
-#: standalone/drakbackup:2062
+#: standalone/drakbackup:2061 standalone/drakbackup:2063
+#: standalone/drakbackup:2068
 #, c-format
 msgid "daily"
 msgstr "kord päevas"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2058
-#: standalone/drakbackup:2063
+#: standalone/drakbackup:2061 standalone/drakbackup:2064
+#: standalone/drakbackup:2069
 #, c-format
 msgid "weekly"
 msgstr "kord nädalas"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2059
-#: standalone/drakbackup:2064
+#: standalone/drakbackup:2061 standalone/drakbackup:2065
+#: standalone/drakbackup:2070
 #, c-format
 msgid "monthly"
 msgstr "kord kuus"
 
-#: standalone/drakbackup:2055 standalone/drakbackup:2060
-#: standalone/drakbackup:2065
+#: standalone/drakbackup:2061 standalone/drakbackup:2066
+#: standalone/drakbackup:2071
 #, c-format
 msgid "custom"
 msgstr "isetehtud"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "January"
 msgstr "Jaanuar"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "February"
 msgstr "Veebruar"
 
-#: standalone/drakbackup:2069
+#: standalone/drakbackup:2075
 #, c-format
 msgid "March"
 msgstr "Märts"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "April"
 msgstr "Aprill"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "May"
 msgstr "Mai"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "June"
 msgstr "Juuni"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "July"
 msgstr "Juuli"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "August"
 msgstr "August"
 
-#: standalone/drakbackup:2070
+#: standalone/drakbackup:2076
 #, c-format
 msgid "September"
 msgstr "September"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "October"
 msgstr "Oktoober"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "November"
 msgstr "November"
 
-#: standalone/drakbackup:2071
+#: standalone/drakbackup:2077
 #, c-format
 msgid "December"
 msgstr "Detsember"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: standalone/drakbackup:2074
+#: standalone/drakbackup:2080
 #, c-format
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Friday"
 msgstr "Reede"
 
-#: standalone/drakbackup:2075
+#: standalone/drakbackup:2081
 #, c-format
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: standalone/drakbackup:2107
+#: standalone/drakbackup:2113
 #, c-format
 msgid "Use daemon"
 msgstr "Deemoni kasutamine"
 
-#: standalone/drakbackup:2112
+#: standalone/drakbackup:2117
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Valige palun varundamiste vaheline ajaline intervall"
 
-#: standalone/drakbackup:2118
+#: standalone/drakbackup:2123
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Isetehtud setup/crontab kirje:"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:2128
 #, c-format
 msgid "Minute"
 msgstr "Minutit"
 
-#: standalone/drakbackup:2127
+#: standalone/drakbackup:2132
 #, c-format
 msgid "Hour"
 msgstr "Tundi"
 
-#: standalone/drakbackup:2131
+#: standalone/drakbackup:2136
 #, c-format
 msgid "Day"
 msgstr "Päev"
 
-#: standalone/drakbackup:2135
+#: standalone/drakbackup:2140
 #, c-format
 msgid "Month"
 msgstr "Kuu"
 
-#: standalone/drakbackup:2139
+#: standalone/drakbackup:2144
 #, c-format
 msgid "Weekday"
 msgstr "Nädalapäev"
 
-#: standalone/drakbackup:2145
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Valige palun varundamiseks kasutatav andmekandja"
 
-#: standalone/drakbackup:2152
+#: standalone/drakbackup:2156
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Kontrollige palun, et cron-deemon on teenuste seas ja töötab."
 
-#: standalone/drakbackup:2153
+#: standalone/drakbackup:2157
+#, c-format
+msgid ""
+"If your machine is not on all the time, you might want to install anacron."
+msgstr "Kui Teie masin ei ole kogu aeg sees, võiks paigaldada paketi anacron."
+
+#: standalone/drakbackup:2158
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
-msgstr ""
-"Arvestage, et praegu kasutavad kõvaketast ka kõik 'võrgu'-andmekandjad."
+msgstr "Arvestage, et praegu kasutavad kõvaketast ka kõik võrgu-andmekandjad."
 
-#: standalone/drakbackup:2201
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Please choose the compression type"
 msgstr "Palun valige tihendamise meetod"
 
-#: standalone/drakbackup:2205
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Kasutatakse .backupignore faile"
 
-#: standalone/drakbackup:2207
+#: standalone/drakbackup:2211
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Pärast iga varundamist saadetakse raport:"
 
-#: standalone/drakbackup:2213
+#: standalone/drakbackup:2217
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "SMB serveri nimi:"
 
-#: standalone/drakbackup:2218
+#: standalone/drakbackup:2222
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 "Tar-failid kustutatakse kõvakettalt pärast varundamist muule andmekandjale"
 
-#: standalone/drakbackup:2258
+#: standalone/drakbackup:2262
 #, c-format
 msgid "What"
 msgstr "Mis"
 
-#: standalone/drakbackup:2263
+#: standalone/drakbackup:2267
 #, c-format
 msgid "Where"
 msgstr "Kus"
 
-#: standalone/drakbackup:2268
+#: standalone/drakbackup:2272
 #, c-format
 msgid "When"
 msgstr "Millal"
 
-#: standalone/drakbackup:2273
+#: standalone/drakbackup:2277
 #, c-format
 msgid "More Options"
 msgstr "Rohkem valikuid"
 
-#: standalone/drakbackup:2286
+#: standalone/drakbackup:2290
 #, c-format
 msgid "Backup destination not configured..."
 msgstr "Varukoopiate sihtkoht on määramata..."
 
-#: standalone/drakbackup:2306 standalone/drakbackup:4229
+#: standalone/drakbackup:2310 standalone/drakbackup:4234
 #, c-format
 msgid "Drakbackup Configuration"
-msgstr "Drakbackupi seadistused"
+msgstr "Drakbackupi seadistamine"
 
-#: standalone/drakbackup:2322
+#: standalone/drakbackup:2326
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Valige palun, kuhu soovite varukoopia salvestada"
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 "kõvakettale (seda kasutatakse kõigi andmekandjate varukoopiate "
 "ettevalmistamiseks)"
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "Across Network"
 msgstr "üle võrgu"
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "On CD-R"
 msgstr "CD-R-ile"
 
-#: standalone/drakbackup:2325
+#: standalone/drakbackup:2329
 #, c-format
 msgid "On Tape Device"
 msgstr "lindiseadmele"
 
-#: standalone/drakbackup:2371
+#: standalone/drakbackup:2375
 #, c-format
 msgid "Backup Users"
 msgstr "kasutajate faile"
 
-#: standalone/drakbackup:2372
+#: standalone/drakbackup:2376
 #, c-format
 msgid " (Default is all users)"
-msgstr " ('vaikimisi' tähendab kõiki kasutajaid)"
+msgstr " (vaikimisi tähendab kõiki kasutajaid)"
 
-#: standalone/drakbackup:2384
+#: standalone/drakbackup:2389
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Valige palun, mida soovite varundada"
 
-#: standalone/drakbackup:2385
+#: standalone/drakbackup:2390
 #, c-format
 msgid "Backup System"
 msgstr "süsteemseid faile"
 
-#: standalone/drakbackup:2387
+#: standalone/drakbackup:2392
 #, c-format
 msgid "Select user manually"
 msgstr "Kasutaja valik käsitsi"
 
-#: standalone/drakbackup:2416
+#: standalone/drakbackup:2421
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Valige palun varundamiseks andmed..."
 
-#: standalone/drakbackup:2488
+#: standalone/drakbackup:2493
 #, c-format
 msgid ""
 "\n"
@@ -18782,7 +19347,7 @@ msgstr ""
 "\n"
 "Varundusallikad: \n"
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2494
 #, c-format
 msgid ""
 "\n"
@@ -18791,7 +19356,7 @@ msgstr ""
 "\n"
 "- Süsteemsed failid:\n"
 
-#: standalone/drakbackup:2491
+#: standalone/drakbackup:2496
 #, c-format
 msgid ""
 "\n"
@@ -18800,7 +19365,7 @@ msgstr ""
 "\n"
 "- Kasutaja failid.\n"
 
-#: standalone/drakbackup:2493
+#: standalone/drakbackup:2498
 #, c-format
 msgid ""
 "\n"
@@ -18809,7 +19374,7 @@ msgstr ""
 "\n"
 "- Muud failid:\n"
 
-#: standalone/drakbackup:2495
+#: standalone/drakbackup:2500
 #, c-format
 msgid ""
 "\n"
@@ -18818,12 +19383,12 @@ msgstr ""
 "\n"
 "- Salvestamine kõvakettale asukohta: %s\n"
 
-#: standalone/drakbackup:2496
+#: standalone/drakbackup:2501
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tKettast lubatakse kasutada %s Mb\n"
 
-#: standalone/drakbackup:2499
+#: standalone/drakbackup:2504
 #, c-format
 msgid ""
 "\n"
@@ -18832,7 +19397,7 @@ msgstr ""
 "\n"
 "- Pärast varundamist kustutatakse kõvakettalt tar-failid.\n"
 
-#: standalone/drakbackup:2504
+#: standalone/drakbackup:2509
 #, c-format
 msgid ""
 "\n"
@@ -18841,22 +19406,22 @@ msgstr ""
 "\n"
 "- Kirjutamine CD-le"
 
-#: standalone/drakbackup:2505
+#: standalone/drakbackup:2510
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2511
 #, c-format
 msgid " on device: %s"
 msgstr " seadmel: %s"
 
-#: standalone/drakbackup:2507
+#: standalone/drakbackup:2512
 #, c-format
 msgid " (multi-session)"
 msgstr " (mitmeseansiline)"
 
-#: standalone/drakbackup:2508
+#: standalone/drakbackup:2513
 #, c-format
 msgid ""
 "\n"
@@ -18865,26 +19430,26 @@ msgstr ""
 "\n"
 "- Salvestamine lindile seadmel: %s"
 
-#: standalone/drakbackup:2509
+#: standalone/drakbackup:2514
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tPuhasta=%s"
 
-#: standalone/drakbackup:2511
+#: standalone/drakbackup:2516
 #, c-format
 msgid "\tBackup directly to Tape\n"
 msgstr "\tVarundamine otse lindile\n"
 
-#: standalone/drakbackup:2513
+#: standalone/drakbackup:2518
 #, c-format
 msgid ""
 "\n"
 "- Save via %s on host: %s\n"
 msgstr ""
 "\n"
-"- Salvestamine %s vahendusel masinale: %s\n"
+"- Salvestamine %s vahendusel masinas: %s\n"
 
-#: standalone/drakbackup:2514
+#: standalone/drakbackup:2519
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -18893,7 +19458,7 @@ msgstr ""
 "\t\t kasutajatunnus: %s\n"
 "\t\t asukohas: %s \n"
 
-#: standalone/drakbackup:2515
+#: standalone/drakbackup:2520
 #, c-format
 msgid ""
 "\n"
@@ -18902,42 +19467,42 @@ msgstr ""
 "\n"
 "- Valikud:\n"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2521
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tsüsteemsete failide kõrvalejätmine\n"
 
-#: standalone/drakbackup:2518
+#: standalone/drakbackup:2523
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tvarukoopiad tar- ja bzip2-vormingus\n"
 
-#: standalone/drakbackup:2519
+#: standalone/drakbackup:2524
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tvarukoopiad tar- ja gzip-vormingus\n"
 
-#: standalone/drakbackup:2520
+#: standalone/drakbackup:2525
 #, c-format
 msgid "\tBackups use tar only\n"
 msgstr "\tvarukoopiad ainult tar-vormingus\n"
 
-#: standalone/drakbackup:2522
+#: standalone/drakbackup:2527
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tkasutatakse .backupignore faile\n"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2528
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\traport saadetakse %s-le\n"
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2529
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tkasutatakse SMTP serverit %s\n"
 
-#: standalone/drakbackup:2526
+#: standalone/drakbackup:2531
 #, c-format
 msgid ""
 "\n"
@@ -18946,205 +19511,205 @@ msgstr ""
 "\n"
 "- Deemon (%s) vahendusel:\n"
 
-#: standalone/drakbackup:2527
+#: standalone/drakbackup:2532
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-kõvaketas.\n"
 
-#: standalone/drakbackup:2528
+#: standalone/drakbackup:2533
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R.\n"
 
-#: standalone/drakbackup:2529
+#: standalone/drakbackup:2534
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-lint \n"
 
-#: standalone/drakbackup:2530
+#: standalone/drakbackup:2535
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-võrk FTP vahendusel.\n"
 
-#: standalone/drakbackup:2531
+#: standalone/drakbackup:2536
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-võrk SSH vahendusel.\n"
 
-#: standalone/drakbackup:2532
+#: standalone/drakbackup:2537
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-võrk rsync vahendusel.\n"
 
-#: standalone/drakbackup:2533
+#: standalone/drakbackup:2538
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-võrk webdavi vahendusel.\n"
 
-#: standalone/drakbackup:2535
+#: standalone/drakbackup:2540
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr "Seadistus puudub, klõpsake palun nupul 'Nõustaja' või 'Muud'.\n"
+msgstr "Seadistus puudub, klõpsake palun nupul \"Nõustaja\" või \"Muud\".\n"
 
-#: standalone/drakbackup:2540
+#: standalone/drakbackup:2545
 #, c-format
 msgid ""
 "List of data to restore:\n"
 "\n"
 msgstr ""
-"Taastatavate andmete loend:\n"
+"Taastatavate andmete nimekiri:\n"
 "\n"
 
-#: standalone/drakbackup:2542
+#: standalone/drakbackup:2547
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Süsteemsete failide taastamine.\n"
 
-#: standalone/drakbackup:2544 standalone/drakbackup:2554
+#: standalone/drakbackup:2549 standalone/drakbackup:2559
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - kuupäevast %s %s\n"
 
-#: standalone/drakbackup:2547
+#: standalone/drakbackup:2552
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Kasutaja failide taastamine: \n"
 
-#: standalone/drakbackup:2552
+#: standalone/drakbackup:2557
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Muude failide taastamine: \n"
 
-#: standalone/drakbackup:2731
+#: standalone/drakbackup:2736
 #, c-format
 msgid ""
 "List of data corrupted:\n"
 "\n"
 msgstr ""
-"Vigaste andmete loend:\n"
+"Vigaste andmete nimekiri:\n"
 "\n"
 
-#: standalone/drakbackup:2733
+#: standalone/drakbackup:2738
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Palun tühistage valik või eemaldage järgmisel korral"
 
-#: standalone/drakbackup:2743
+#: standalone/drakbackup:2748
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Varukoopia failid on vigased"
 
-#: standalone/drakbackup:2764
+#: standalone/drakbackup:2769
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Kõik valitud andmed on           "
 
-#: standalone/drakbackup:2765
+#: standalone/drakbackup:2770
 #, c-format
 msgid "          Successfully Restored on %s       "
 msgstr "         edukalt taastatud %s -l       "
 
-#: standalone/drakbackup:2885
+#: standalone/drakbackup:2890
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Taastamise seadistamine       "
 
-#: standalone/drakbackup:2913
+#: standalone/drakbackup:2918
 #, c-format
 msgid "OK to restore the other files."
-msgstr "Muude failide taastamiseks vajutage 'Olgu'."
+msgstr "Muude failide taastamiseks klõpsake nupule \"Olgu\"."
 
-#: standalone/drakbackup:2929
+#: standalone/drakbackup:2934
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "Taastatavad kasutajate failid (olulised on ainult kõige uuemad andmed)"
 
-#: standalone/drakbackup:2994
+#: standalone/drakbackup:2999
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "valige palun kuupäev, kust taastada"
 
-#: standalone/drakbackup:3031
+#: standalone/drakbackup:3036
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Taastamine kõvakettalt"
 
-#: standalone/drakbackup:3033
+#: standalone/drakbackup:3038
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Kataloog, kuhu varukoopiad on salvestatud"
 
-#: standalone/drakbackup:3037
+#: standalone/drakbackup:3042
 #, c-format
 msgid "Directory with backups"
 msgstr "Varukoopiate kataloog"
 
-#: standalone/drakbackup:3091
+#: standalone/drakbackup:3096
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Muu andmekandja, millelt taastada"
 
-#: standalone/drakbackup:3093
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Other Media"
 msgstr "Muu andmekandja"
 
-#: standalone/drakbackup:3098
+#: standalone/drakbackup:3103
 #, c-format
 msgid "Restore system"
 msgstr "Süsteemi taastamine"
 
-#: standalone/drakbackup:3099
+#: standalone/drakbackup:3104
 #, c-format
 msgid "Restore Users"
 msgstr "Kasutajate taastamine"
 
-#: standalone/drakbackup:3100
+#: standalone/drakbackup:3105
 #, c-format
 msgid "Restore Other"
 msgstr "Muu taastamine"
 
-#: standalone/drakbackup:3102
+#: standalone/drakbackup:3107
 #, c-format
 msgid "Select path to restore (instead of /)"
 msgstr "Asukoht, kuhu taastada (kui ei ole /)"
 
-#: standalone/drakbackup:3106 standalone/drakbackup:3388
+#: standalone/drakbackup:3111 standalone/drakbackup:3393
 #, c-format
 msgid "Path To Restore To"
 msgstr "Taastamise asukoht"
 
-#: standalone/drakbackup:3109
+#: standalone/drakbackup:3114
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "Uus varundamine enne taastamist (ainult muutvarunduse puhul)"
 
-#: standalone/drakbackup:3111
+#: standalone/drakbackup:3116
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Kasutaja kataloogid eemaldatakse enne taastamist"
 
-#: standalone/drakbackup:3196
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "Otsitava faili nimi (tühjaks jätmisel sobivad kõik):"
 
-#: standalone/drakbackup:3199
+#: standalone/drakbackup:3204
 #, c-format
 msgid "Search Backups"
 msgstr "Varukoopiate otsimine"
 
-#: standalone/drakbackup:3217
+#: standalone/drakbackup:3222
 #, c-format
 msgid "No matches found..."
 msgstr "Ühtegi sobivust ei leitud..."
 
-#: standalone/drakbackup:3221
+#: standalone/drakbackup:3226
 #, c-format
 msgid "Restore Selected"
 msgstr "Taasta valitud"
 
-#: standalone/drakbackup:3356
+#: standalone/drakbackup:3361
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -19153,7 +19718,7 @@ msgstr ""
 "Klõpsake kuupäevale/ajale varundatud failide vaatamiseks.\n"
 "Ctrl+klõps võimaldab valida mitu faili korraga."
 
-#: standalone/drakbackup:3362
+#: standalone/drakbackup:3367
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19162,7 +19727,7 @@ msgstr ""
 "Taasta valitud\n"
 "kataloogikirje"
 
-#: standalone/drakbackup:3371
+#: standalone/drakbackup:3376
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -19171,17 +19736,17 @@ msgstr ""
 "Taasta valitud\n"
 "failid"
 
-#: standalone/drakbackup:3448
+#: standalone/drakbackup:3453
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "%s ei sisaldanud varukoopiafaile."
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3466
 #, c-format
 msgid "Restore From CD"
 msgstr "Taastamine CD-lt"
 
-#: standalone/drakbackup:3461
+#: standalone/drakbackup:3466
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -19190,17 +19755,17 @@ msgstr ""
 "Sisestage CD nimega %s\n"
 " CD-seadmesse haakepunktis /mnt/cdrom"
 
-#: standalone/drakbackup:3463
+#: standalone/drakbackup:3468
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "CD nimi pole korrektne. Ketta nimi on %s."
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3478
 #, c-format
 msgid "Restore From Tape"
 msgstr "Taastamine lindilt"
 
-#: standalone/drakbackup:3473
+#: standalone/drakbackup:3478
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -19209,228 +19774,222 @@ msgstr ""
 "Sisestage lint nimega %s\n"
 " lindiseadmesse %s"
 
-#: standalone/drakbackup:3475
+#: standalone/drakbackup:3480
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Lindi nimi pole korrektne. Lint kannab nime %s."
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3491
 #, c-format
 msgid "Restore Via Network"
 msgstr "Taastamine võrgust"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3491
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Taastamine võrguprotokolli abil: %s"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3492
 #, c-format
 msgid "Host Name"
 msgstr "Masinanimi"
 
-#: standalone/drakbackup:3488
+#: standalone/drakbackup:3493
 #, c-format
 msgid "Host Path or Module"
 msgstr "Masina kataloog või moodul"
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3500
 #, c-format
 msgid "Password required"
 msgstr "Parooli nõudmine"
 
-#: standalone/drakbackup:3501
+#: standalone/drakbackup:3506
 #, c-format
 msgid "Username required"
 msgstr "Kasutajatunnuse nõudmine"
 
-#: standalone/drakbackup:3504
+#: standalone/drakbackup:3509
 #, c-format
 msgid "Hostname required"
 msgstr "Masinanime nõudmine"
 
-#: standalone/drakbackup:3509
+#: standalone/drakbackup:3514
 #, c-format
 msgid "Path or Module required"
 msgstr "Kataloogi või mooduli nõudmine"
 
-#: standalone/drakbackup:3522
+#: standalone/drakbackup:3527
 #, c-format
 msgid "Files Restored..."
 msgstr "Taastatud failid..."
 
-#: standalone/drakbackup:3525
+#: standalone/drakbackup:3530
 #, c-format
 msgid "Restore Failed..."
 msgstr "Taastamine ebaõnnestus..."
 
-#: standalone/drakbackup:3543
+#: standalone/drakbackup:3548
 #, c-format
 msgid "%s not retrieved..."
 msgstr "%s jäi hankimata..."
 
-#: standalone/drakbackup:3765 standalone/drakbackup:3834
+#: standalone/drakbackup:3770 standalone/drakbackup:3839
 #, c-format
 msgid "Search for files to restore"
 msgstr "Taastatavate failide otsimine"
 
-#: standalone/drakbackup:3769
+#: standalone/drakbackup:3774
 #, c-format
 msgid "Restore all backups"
 msgstr "Taasta kõik varukoopiad"
 
-#: standalone/drakbackup:3777
+#: standalone/drakbackup:3782
 #, c-format
 msgid "Custom Restore"
 msgstr "Taastamise kohandamine"
 
-#: standalone/drakbackup:3781 standalone/drakbackup:3830
+#: standalone/drakbackup:3786 standalone/drakbackup:3835
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Taastamine kataloogist"
 
-#: standalone/drakbackup:3802
+#: standalone/drakbackup:3807
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Varukoopiaid taastamiseks ei leitud...\n"
 
-#: standalone/drakbackup:3803
+#: standalone/drakbackup:3808
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Kontrollige, et %s on korrektne otsingutee"
 
-#: standalone/drakbackup:3804
+#: standalone/drakbackup:3809
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " ja CD on sisse pandud"
 
-#: standalone/drakbackup:3806
+#: standalone/drakbackup:3811
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "Varukoopiad haakimata andmekandjal - taastamiseks kasutatakse kataloogi"
 
-#: standalone/drakbackup:3822
+#: standalone/drakbackup:3827
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD on kohal - jätka"
 
-#: standalone/drakbackup:3827
+#: standalone/drakbackup:3832
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Uue taastamishoidla valimine"
 
-#: standalone/drakbackup:3828
+#: standalone/drakbackup:3833
 #, c-format
 msgid "Directory To Restore From"
 msgstr "Taastamine kataloogist"
 
-#: standalone/drakbackup:3864
+#: standalone/drakbackup:3869
 #, c-format
 msgid "Restore Progress"
 msgstr "Taastamise edenemine"
 
-#: standalone/drakbackup:3919 standalone/drakbackup:3992
-#: standalone/logdrake:173
-#, c-format
-msgid "Save"
-msgstr "Salvesta"
-
-#: standalone/drakbackup:3975
+#: standalone/drakbackup:3980
 #, c-format
 msgid "Build Backup"
 msgstr "Loo varukoopia"
 
-#: standalone/drakbackup:4008 standalone/drakbackup:4328
+#: standalone/drakbackup:4013 standalone/drakbackup:4333
 #, c-format
 msgid "Restore"
 msgstr "Taastamine"
 
-#: standalone/drakbackup:4096
+#: standalone/drakbackup:4101
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Paigaldada tuleb järgmised paketid:\n"
 
-#: standalone/drakbackup:4123
+#: standalone/drakbackup:4128
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Valige palun taastatavad andmed..."
 
-#: standalone/drakbackup:4163
+#: standalone/drakbackup:4168
 #, c-format
 msgid "Backup system files"
 msgstr "Süsteemsete failide varundamine"
 
-#: standalone/drakbackup:4166
+#: standalone/drakbackup:4171
 #, c-format
 msgid "Backup user files"
 msgstr "Kasutaja failide varundamine"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:4174
 #, c-format
 msgid "Backup other files"
 msgstr "Muude failide varundamine"
 
-#: standalone/drakbackup:4172 standalone/drakbackup:4206
+#: standalone/drakbackup:4177 standalone/drakbackup:4211
 #, c-format
 msgid "Total Progress"
 msgstr "Edenemine kokku"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:4203
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Failide saatmine FTP vahendusel"
 
-#: standalone/drakbackup:4201
+#: standalone/drakbackup:4206
 #, c-format
 msgid "Sending files..."
 msgstr "Failide saatmine..."
 
-#: standalone/drakbackup:4271
+#: standalone/drakbackup:4276
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Varunda seadistustefail kohe!"
 
-#: standalone/drakbackup:4276
+#: standalone/drakbackup:4281
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Varundamise seadistuste vaatamine"
 
-#: standalone/drakbackup:4302
+#: standalone/drakbackup:4307
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Nõustaja seadistused"
 
-#: standalone/drakbackup:4307
+#: standalone/drakbackup:4312
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Muud seadistused"
 
-#: standalone/drakbackup:4312
+#: standalone/drakbackup:4317
 #, c-format
 msgid "View Configuration"
 msgstr "Seadistuse vaatamine"
 
-#: standalone/drakbackup:4316
+#: standalone/drakbackup:4321
 #, c-format
 msgid "View Last Log"
 msgstr "Viimase logi vaatamine"
 
-#: standalone/drakbackup:4321
+#: standalone/drakbackup:4326
 #, c-format
 msgid "Backup Now"
 msgstr "Varunda nüüd!"
 
-#: standalone/drakbackup:4325
+#: standalone/drakbackup:4330
 #, c-format
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
 msgstr ""
 "Seadistustefaili ei leitud, \n"
-"klõpsake palun nupul 'Nõustaja' või 'Muud'."
+"klõpsake palun nupul \"Nõustaja\" või \"Muud\"."
 
-#: standalone/drakbackup:4345 standalone/drakbackup:4348
+#: standalone/drakbackup:4350 standalone/drakbackup:4353
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
@@ -19445,10 +20004,10 @@ msgstr "Graafilise algkäivitusteema valik"
 msgid "System mode"
 msgstr "Töömood"
 
-#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:171
-#: standalone/harddrake2:172 standalone/logdrake:70
-#: standalone/printerdrake:156 standalone/printerdrake:157
-#: standalone/printerdrake:158
+#: standalone/drakboot:74 standalone/drakfloppy:47 standalone/harddrake2:187
+#: standalone/harddrake2:188 standalone/logdrake:70
+#: standalone/printerdrake:138 standalone/printerdrake:139
+#: standalone/printerdrake:140
 #, c-format
 msgid "/_File"
 msgstr "/_Fail"
@@ -19458,8 +20017,8 @@ msgstr "/_Fail"
 msgid "/File/_Quit"
 msgstr "/Fail/_Välju"
 
-#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:172
-#: standalone/logdrake:76 standalone/printerdrake:158
+#: standalone/drakboot:75 standalone/drakfloppy:48 standalone/harddrake2:188
+#: standalone/logdrake:76 standalone/printerdrake:140
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -19485,8 +20044,8 @@ msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
 msgstr ""
-"Teie süsteemi alglaadur ei tööta konsooliresiimis. Graafilise alglaadimise "
-"kasutamiseks valige meelepärane resiim alglaaduri seadistusvahendiga."
+"Teie süsteemi alglaadur ei tööta konsoolirežiimis. Graafilise alglaadimise "
+"kasutamiseks valige sobiv režiim alglaaduri seadistusvahendiga."
 
 #: standalone/drakboot:167
 #, c-format
@@ -19514,7 +20073,7 @@ msgstr "X Windows käivitatakse alglaadimisel"
 
 #: standalone/drakboot:197
 #, c-format
-msgid "No, I don't want autologin"
+msgid "No, I do not want autologin"
 msgstr "Ei taha automaatselt siseneda"
 
 #: standalone/drakboot:198
@@ -19559,8 +20118,8 @@ msgstr "Mandrakelinuxi juhtimiskeskus"
 msgid "Synchronization tool"
 msgstr "Sünkroniseerimisvahend"
 
-#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:176
-#: standalone/drakbug:178 standalone/drakbug:182
+#: standalone/drakbug:49 standalone/drakbug:63 standalone/drakbug:148
+#: standalone/drakbug:150 standalone/drakbug:154
 #, c-format
 msgid "Standalone Tools"
 msgstr "Autonoomsed vahendid"
@@ -19588,7 +20147,7 @@ msgstr "Msec"
 #: standalone/drakbug:54
 #, c-format
 msgid "Remote Control"
-msgstr "Kaugjuhtimine"
+msgstr "Võrguhaldus"
 
 #: standalone/drakbug:55
 #, c-format
@@ -19615,160 +20174,107 @@ msgstr "Userdrake"
 msgid "Configuration Wizards"
 msgstr "Seadistamise nõustajad"
 
-#: standalone/drakbug:83
+#: standalone/drakbug:81
 #, c-format
-msgid "Application:"
-msgstr "Rakendus:"
+msgid "Select Mandrakesoft Tool:"
+msgstr "Valige Mandrakesofti tööriist:"
 
-#: standalone/drakbug:84 standalone/drakbug:96
-#, c-format
-msgid "Package: "
-msgstr "Pakett: "
-
-#: standalone/drakbug:85
-#, c-format
-msgid "Kernel:"
-msgstr "Kernel:"
-
-#: standalone/drakbug:86 standalone/drakbug:97
-#, c-format
-msgid "Release: "
-msgstr "Väljalase: "
-
-#: standalone/drakbug:91
+#: standalone/drakbug:82
 #, c-format
 msgid ""
-"Application Name\n"
-"or Full Path:"
+"or Application Name\n"
+"(or Full Path):"
 msgstr ""
-"Rakenduse nimi\n"
-"või täielik otsingutee:"
+"või andke rakenduse nimi\n"
+"(või täielik otsingutee):"
 
-#: standalone/drakbug:94
+#: standalone/drakbug:85
 #, c-format
 msgid "Find Package"
 msgstr "Paketi otsimine"
 
-#: standalone/drakbug:98
+#: standalone/drakbug:87
 #, c-format
-msgid "Summary: "
-msgstr "Kokkuvõte: "
-
-#: standalone/drakbug:104
-#, c-format
-msgid "Bug Description/System Information"
-msgstr "Vea kirjeldus/süsteemi info"
-
-#: standalone/drakbug:105
-#, c-format
-msgid "YOUR TEXT HERE"
-msgstr "SIIA TULEB TEIE TEKST"
-
-#: standalone/drakbug:108
-#, c-format
-msgid "Submit kernel version"
-msgstr "Kerneli versiooni edastamine"
-
-#: standalone/drakbug:109
-#, c-format
-msgid "Submit cpuinfo"
-msgstr "cpuinfo edastamine"
+msgid "Package: "
+msgstr "Pakett: "
 
-#: standalone/drakbug:110
+#: standalone/drakbug:88
 #, c-format
-msgid "Submit lspci"
-msgstr "lspci edastamine"
+msgid "Kernel:"
+msgstr "Kernel:"
 
-#: standalone/drakbug:124
+#: standalone/drakbug:100
 #, c-format
 msgid ""
-"To submit a bug report, click on the report button.\n"
-"This will open  a web browser window on %s\n"
-" where you'll find a form to fill in.  The information displayed above will "
-"be \n"
-"transferred to that server."
+"To submit a bug report, click on the report button.  \n"
+"This will open a web browser window on %s where you'll find a form to fill "
+"in.  The information displayed above will be transferred to that server.  \n"
+"Things useful to include in your report are the output of lspci, kernel "
+"version, and /proc/cpuinfo."
 msgstr ""
-"Veateate edastamiseks vajutage nupule 'Raport'.\n"
-"See avab veebilehitseja akna aadressil %s,\n"
-"kus leiate eest täitmist ootava vormi. Ülal näidatud info kantakse\n"
-"serverile üle."
+"Veateate edastamiseks klõpsake nupule \"Raport\". \n"
+"See avab veebilehitseja akna aadressil %s, kus leiate eest täitmist ootava "
+"vormi. \n"
+"Ülal näidatud info edastatakse serverisse. \n"
+"Muu hulgas tasuks raportis ära näidata näiteks käsu lspci väljund, kerneli "
+"versioon ja /proc/cpuinfo sisu."
 
-#: standalone/drakbug:130
+#: standalone/drakbug:106
 #, c-format
 msgid "Report"
 msgstr "Raport"
 
-#: standalone/drakbug:191
+#: standalone/drakbug:163
 #, c-format
 msgid "Not installed"
 msgstr "Pole paigaldatud"
 
-#: standalone/drakbug:203
+#: standalone/drakbug:175
 #, c-format
 msgid "Package not installed"
 msgstr "Pakett ei ole paigaldatud"
 
-#: standalone/drakbug:220
-#, c-format
-msgid "NOT FOUND"
-msgstr "EI LEITUD"
-
-#: standalone/drakbug:227
-#, c-format
-msgid "connecting to %s..."
-msgstr "ühenduse loomine: %s ..."
-
-#: standalone/drakbug:235
+#: standalone/drakbug:191
 #, c-format
 msgid "No browser available! Please install one"
 msgstr "Brauserit ei leitud! Palun paigaldage mõni"
 
-#: standalone/drakbug:254
-#, c-format
-msgid "Please enter a package name."
-msgstr "Palun sisestage paketi nimi."
-
-#: standalone/drakbug:260
-#, c-format
-msgid "Please enter summary text."
-msgstr "Palun sisestage kokkuvõte."
-
-#: standalone/drakclock:30
+#: standalone/drakclock:29
 #, c-format
 msgid "DrakClock"
 msgstr "DrakClock"
 
-#: standalone/drakclock:40
+#: standalone/drakclock:39
 #, c-format
 msgid "not defined"
 msgstr "määramata"
 
-#: standalone/drakclock:42
+#: standalone/drakclock:41
 #, c-format
 msgid "Change Time Zone"
 msgstr "Ajavööndi muutmine"
 
-#: standalone/drakclock:46
+#: standalone/drakclock:45
 #, c-format
 msgid "Timezone - DrakClock"
 msgstr "Ajavöönd - DrakClock"
 
-#: standalone/drakclock:48
+#: standalone/drakclock:47
 #, c-format
 msgid "GMT - DrakClock"
 msgstr "GMT - DrakClock"
 
-#: standalone/drakclock:48
+#: standalone/drakclock:47
 #, c-format
 msgid "Is your hardware clock set to GMT?"
 msgstr "Kas arvuti sisekell on seatud GMT ajale?"
 
-#: standalone/drakclock:76
+#: standalone/drakclock:75
 #, c-format
 msgid "Network Time Protocol"
 msgstr "Võrguajaprotokoll"
 
-#: standalone/drakclock:78
+#: standalone/drakclock:77
 #, c-format
 msgid ""
 "Your computer can synchronize its clock\n"
@@ -19777,27 +20283,27 @@ msgstr ""
 "Teie arvuti võib sünkroniseerida oma aja\n"
 "mõne internetis asuva ajaserveriga NTP vahendusel"
 
-#: standalone/drakclock:79
+#: standalone/drakclock:78
 #, c-format
 msgid "Enable Network Time Protocol"
 msgstr "Võrguajaprotokolli lubamine"
 
-#: standalone/drakclock:87
+#: standalone/drakclock:86
 #, c-format
 msgid "Server:"
 msgstr "Server:"
 
-#: standalone/drakclock:125
+#: standalone/drakclock:124
 #, c-format
 msgid "Could not synchronize with %s."
 msgstr "Sünkroniseerimine serveriga %s ebaõnnestus."
 
-#: standalone/drakclock:147 standalone/drakclock:157
+#: standalone/drakclock:146 standalone/drakclock:156
 #, c-format
 msgid "Reset"
 msgstr "Lähtesta"
 
-#: standalone/drakclock:225
+#: standalone/drakclock:224
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -19813,14 +20319,14 @@ msgstr ""
 #: standalone/drakconnect:85
 #, c-format
 msgid "Network configuration (%d adapters)"
-msgstr "Võrguseadistused (%d liidest)"
+msgstr "Võrgu seadistamine (%d liidest)"
 
-#: standalone/drakconnect:96 standalone/drakconnect:787
+#: standalone/drakconnect:96 standalone/drakconnect:786
 #, c-format
 msgid "Gateway:"
 msgstr "Vaikelüüs:"
 
-#: standalone/drakconnect:96 standalone/drakconnect:787
+#: standalone/drakconnect:96 standalone/drakconnect:786
 #, c-format
 msgid "Interface:"
 msgstr "Liides:"
@@ -19835,8 +20341,8 @@ msgstr "Palun oodake"
 msgid "Interface"
 msgstr "Liides"
 
-#: standalone/drakconnect:116 standalone/printerdrake:218
-#: standalone/printerdrake:225
+#: standalone/drakconnect:116 standalone/printerdrake:211
+#: standalone/printerdrake:218
 #, c-format
 msgid "State"
 msgstr "Olek"
@@ -19849,12 +20355,12 @@ msgstr "Masinanimi: "
 #: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
-msgstr "Masinanime seadmine..."
+msgstr "Masinanime seadistamine..."
 
-#: standalone/drakconnect:149 standalone/drakconnect:843
+#: standalone/drakconnect:149 standalone/drakconnect:842
 #, c-format
 msgid "LAN configuration"
-msgstr "LAN seadistused"
+msgstr "LAN-i seadistamine"
 
 #: standalone/drakconnect:154
 #, c-format
@@ -19882,103 +20388,103 @@ msgstr "Seade valitud"
 msgid "IP configuration"
 msgstr "IP seadistus"
 
-#: standalone/drakconnect:342
+#: standalone/drakconnect:344
 #, c-format
 msgid "DNS servers"
 msgstr "Nimeserverid"
 
-#: standalone/drakconnect:350
+#: standalone/drakconnect:352
 #, c-format
 msgid "Search Domain"
 msgstr "Otsingudomeen"
 
-#: standalone/drakconnect:358
+#: standalone/drakconnect:360
 #, c-format
 msgid "static"
 msgstr "staatiline"
 
-#: standalone/drakconnect:358
+#: standalone/drakconnect:360
 #, c-format
 msgid "DHCP"
 msgstr "DHCP"
 
-#: standalone/drakconnect:436
+#: standalone/drakconnect:438
 #, c-format
 msgid "Metric"
 msgstr "Meetrika"
 
-#: standalone/drakconnect:491
+#: standalone/drakconnect:493
 #, c-format
 msgid "Flow control"
 msgstr "Vookontroll"
 
-#: standalone/drakconnect:492
+#: standalone/drakconnect:494
 #, c-format
 msgid "Line termination"
 msgstr "Rea lõpp"
 
-#: standalone/drakconnect:503
+#: standalone/drakconnect:505
 #, c-format
 msgid "Modem timeout"
 msgstr "Modemi aegumine"
 
-#: standalone/drakconnect:507
+#: standalone/drakconnect:509
 #, c-format
 msgid "Use lock file"
 msgstr "Kasutatakse lukustusfaili"
 
-#: standalone/drakconnect:509
+#: standalone/drakconnect:511
 #, c-format
 msgid "Wait for dialup tone before dialing"
 msgstr "Enne valimist oodatakse tooni"
 
-#: standalone/drakconnect:512
+#: standalone/drakconnect:514
 #, c-format
 msgid "Busy wait"
 msgstr "Oodatakse kinnise tooni puhul"
 
-#: standalone/drakconnect:517
+#: standalone/drakconnect:519
 #, c-format
 msgid "Modem sound"
 msgstr "Modemi heli"
 
-#: standalone/drakconnect:518
+#: standalone/drakconnect:520
 #, c-format
 msgid "Enable"
 msgstr "Lubatud"
 
-#: standalone/drakconnect:518
+#: standalone/drakconnect:520
 #, c-format
 msgid "Disable"
 msgstr "Keelatud"
 
-#: standalone/drakconnect:569 standalone/harddrake2:45
+#: standalone/drakconnect:571 standalone/harddrake2:48
 #, c-format
 msgid "Media class"
 msgstr "Andmekandja klass"
 
-#: standalone/drakconnect:570 standalone/drakfloppy:136
+#: standalone/drakconnect:572 standalone/drakfloppy:136
 #, c-format
 msgid "Module name"
 msgstr "Mooduli nimi"
 
-#: standalone/drakconnect:571
+#: standalone/drakconnect:573
 #, c-format
 msgid "Mac Address"
 msgstr "MAC aadress"
 
-#: standalone/drakconnect:572 standalone/harddrake2:23
-#: standalone/harddrake2:104
+#: standalone/drakconnect:574 standalone/harddrake2:26
+#: standalone/harddrake2:118
 #, c-format
 msgid "Bus"
 msgstr "Siin"
 
-#: standalone/drakconnect:573 standalone/harddrake2:29
+#: standalone/drakconnect:575 standalone/harddrake2:32
 #, c-format
 msgid "Location on the bus"
 msgstr "Asukoht siinil"
 
-#: standalone/drakconnect:670 standalone/drakgw:250 standalone/drakpxe:138
+#: standalone/drakconnect:671 standalone/drakgw:247 standalone/drakpxe:138
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
@@ -19987,17 +20493,17 @@ msgstr ""
 "Ühtki võrgukaarti ei suudetud tuvastada. Palun kasutage selleks riistvara "
 "seadistajat."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:679
 #, c-format
 msgid "Remove a network interface"
 msgstr "Eemalda võrguliides"
 
-#: standalone/drakconnect:682
+#: standalone/drakconnect:683
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Valige eemaldatav võrguliides:"
 
-#: standalone/drakconnect:713
+#: standalone/drakconnect:715
 #, c-format
 msgid ""
 "An error occurred while deleting the \"%s\" network interface:\n"
@@ -20008,7 +20514,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:715
+#: standalone/drakconnect:716
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been successfully deleted"
@@ -20024,84 +20530,84 @@ msgstr "IP puudub"
 msgid "No Mask"
 msgstr "Mask puudub"
 
-#: standalone/drakconnect:734 standalone/drakconnect:914
+#: standalone/drakconnect:734 standalone/drakconnect:913
 #, c-format
 msgid "up"
 msgstr "ühendatud"
 
-#: standalone/drakconnect:734 standalone/drakconnect:914
+#: standalone/drakconnect:734 standalone/drakconnect:913
 #, c-format
 msgid "down"
 msgstr "pole ühendatud"
 
-#: standalone/drakconnect:777 standalone/net_monitor:468
+#: standalone/drakconnect:776 standalone/net_monitor:470
 #, c-format
 msgid "Connected"
 msgstr "Ühendatud"
 
-#: standalone/drakconnect:777 standalone/net_monitor:468
+#: standalone/drakconnect:776 standalone/net_monitor:470
 #, c-format
 msgid "Not connected"
 msgstr "Ei ole ühendatud"
 
-#: standalone/drakconnect:779
+#: standalone/drakconnect:778
 #, c-format
 msgid "Disconnect..."
 msgstr "Lahuta..."
 
-#: standalone/drakconnect:779
+#: standalone/drakconnect:778
 #, c-format
 msgid "Connect..."
 msgstr "Ühenda..."
 
-#: standalone/drakconnect:808
+#: standalone/drakconnect:807
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
-"Hoiatus, avastati veel üks Internetiühendus, mis võib-olla kasutab Teie võrku"
+"Hoiatus, leiti veel üks Internetiühendus, mis võib-olla kasutab Teie võrku"
 
-#: standalone/drakconnect:839
+#: standalone/drakconnect:838
 #, c-format
 msgid "Deactivate now"
 msgstr "Peata nüüd"
 
-#: standalone/drakconnect:839
+#: standalone/drakconnect:838
 #, c-format
 msgid "Activate now"
 msgstr "Aktiveeri nüüd"
 
-#: standalone/drakconnect:847
+#: standalone/drakconnect:846
 #, c-format
 msgid ""
-"You don't have any configured interface.\n"
+"You do not have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
 "Ühtegi liidest ei ole seadistatud.\n"
-"Esmalt tuleb need seadistada, klõpsake selleks nupul 'Seadista'"
+"Esmalt tuleb need seadistada, klõpsake selleks nupul \"Seadista\""
 
-#: standalone/drakconnect:861
+#: standalone/drakconnect:860
 #, c-format
 msgid "LAN Configuration"
-msgstr "LAN seadistused"
+msgstr "LAN-i seadistamine"
 
-#: standalone/drakconnect:873
+#: standalone/drakconnect:872
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Võrgukaart %s: %s"
 
-#: standalone/drakconnect:882
+#: standalone/drakconnect:881
 #, c-format
 msgid "Boot Protocol"
 msgstr "Laadimisprotokoll"
 
-#: standalone/drakconnect:883
+#: standalone/drakconnect:882
 #, c-format
 msgid "Started on boot"
 msgstr "Käivitub laadimisel"
 
-#: standalone/drakconnect:919
+#: standalone/drakconnect:918
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -20111,41 +20617,46 @@ msgstr ""
 "Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"Liidese lisamine\""
 
 #. -PO: here "Add Connection" should be translated the same was as in control-center
-#: standalone/drakconnect:974 standalone/net_applet:46
+#: standalone/drakconnect:973 standalone/net_applet:50
 #, c-format
 msgid ""
-"You don't have any configured Internet connection.\n"
-"Run the \"Add Connection\" assistant from the Mandrakelinux Control Center"
+"You do not have any configured Internet connection.\n"
+"Run the \"%s\" assistant from the Mandrakelinux Control Center"
 msgstr ""
 "Internetiühendust ei ole veel seadistatud.\n"
-"Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"Ühenduse lisamine\""
+"Käivitage Mandrakelinuxi juhtimiskeskuses nõustaja \"%s\""
+
+#: standalone/drakconnect:974 standalone/net_applet:51
+#, c-format
+msgid "Set up a new network interface (LAN, ISDN, ADSL, ...)"
+msgstr "Uue võrguliidese seadistamine (LAN, ISDN, ADSL...)"
 
-#: standalone/drakconnect:982
+#: standalone/drakconnect:981
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internetiühenduse seadistamine"
 
-#: standalone/drakconnect:1000
+#: standalone/drakconnect:999
 #, c-format
 msgid "Third DNS server (optional)"
 msgstr "Kolmas nimeserver (pole kohustuslik)"
 
-#: standalone/drakconnect:1022
+#: standalone/drakconnect:1021
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Internetiühenduse seadistamine"
 
-#: standalone/drakconnect:1023
+#: standalone/drakconnect:1022
 #, c-format
 msgid "Internet access"
 msgstr "Internetiühendus"
 
-#: standalone/drakconnect:1025 standalone/net_monitor:101
+#: standalone/drakconnect:1024 standalone/net_monitor:101
 #, c-format
 msgid "Connection type: "
 msgstr "Ühenduse tüüp: "
 
-#: standalone/drakconnect:1028
+#: standalone/drakconnect:1027
 #, c-format
 msgid "Status:"
 msgstr "Olek:"
@@ -20215,7 +20726,7 @@ msgstr "Alglaadimisketta loomine"
 msgid "General"
 msgstr "Üldine"
 
-#: standalone/drakfloppy:82 standalone/harddrake2:131
+#: standalone/drakfloppy:82 standalone/harddrake2:145
 #, c-format
 msgid "Device"
 msgstr "Seade"
@@ -20289,23 +20800,23 @@ msgstr ""
 "Andmekandja puudub seadmes %s või on kirjutuskaitsega.\n"
 "Sisestage palun andmekandja."
 
-#: standalone/drakfloppy:301
+#: standalone/drakfloppy:300
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Fork ebaõnnestus: %s"
 
-#: standalone/drakfloppy:304
+#: standalone/drakfloppy:303
 #, c-format
 msgid "Floppy creation completed"
 msgstr "Disketi loomine lõpetatud"
 
-#: standalone/drakfloppy:304
+#: standalone/drakfloppy:303
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
 msgstr "Alglaadimisdisketi loomine edukalt lõpetatud \n"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/drakfloppy:309
+#: standalone/drakfloppy:308
 #, c-format
 msgid ""
 "Unable to properly close mkbootdisk:\n"
@@ -20316,109 +20827,109 @@ msgstr ""
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:182
 #, c-format
 msgid "Search installed fonts"
 msgstr "Paigaldatud fontide otsimine"
 
-#: standalone/drakfont:185
+#: standalone/drakfont:184
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "Paigaldatud fontide valiku tühistamine"
 
-#: standalone/drakfont:208
+#: standalone/drakfont:207
 #, c-format
 msgid "parse all fonts"
 msgstr "kõigi fontide parsimine"
 
-#: standalone/drakfont:210
+#: standalone/drakfont:209
 #, c-format
 msgid "No fonts found"
 msgstr "Fonte ei leitud"
 
-#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
-#: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
-#: standalone/drakfont:410 standalone/drakfont:424
+#: standalone/drakfont:217 standalone/drakfont:257 standalone/drakfont:324
+#: standalone/drakfont:357 standalone/drakfont:365 standalone/drakfont:391
+#: standalone/drakfont:409 standalone/drakfont:423
 #, c-format
 msgid "done"
 msgstr "tehtud"
 
-#: standalone/drakfont:223
+#: standalone/drakfont:222
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "Haagitud partitsioonidel ei leitud ühtegi fonti"
 
-#: standalone/drakfont:256
+#: standalone/drakfont:255
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "Korrektsete fontide uuestivalimine"
 
-#: standalone/drakfont:259
+#: standalone/drakfont:258
 #, c-format
 msgid "Could not find any font.\n"
 msgstr "Ei õnnestunud fonte leida.\n"
 
-#: standalone/drakfont:269
+#: standalone/drakfont:268
 #, c-format
 msgid "Search for fonts in installed list"
-msgstr "Fontide otsing paigaldatute loendis"
+msgstr "Fontide otsing paigaldatute nimekirjas"
 
-#: standalone/drakfont:294
+#: standalone/drakfont:293
 #, c-format
 msgid "%s fonts conversion"
 msgstr "%s fontide teisendamine"
 
-#: standalone/drakfont:323
+#: standalone/drakfont:322
 #, c-format
 msgid "Fonts copy"
 msgstr "Fontide kopeerimine"
 
-#: standalone/drakfont:326
+#: standalone/drakfont:325
 #, c-format
 msgid "True Type fonts installation"
 msgstr "TrueType fontide paigaldamine"
 
-#: standalone/drakfont:333
+#: standalone/drakfont:332
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "palun oodake, käib ttmkdir..."
 
-#: standalone/drakfont:334
+#: standalone/drakfont:333
 #, c-format
 msgid "True Type install done"
-msgstr "TrueType paigaldus tehtud"
+msgstr "TrueType paigaldamine tehtud"
 
-#: standalone/drakfont:340 standalone/drakfont:355
+#: standalone/drakfont:339 standalone/drakfont:354
 #, c-format
 msgid "type1inst building"
 msgstr "type1inst loomine"
 
-#: standalone/drakfont:349
+#: standalone/drakfont:348
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Ghostcsripti määratlused"
 
-#: standalone/drakfont:359
+#: standalone/drakfont:358
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "Ajutiste failide kustutamine"
 
-#: standalone/drakfont:362
+#: standalone/drakfont:361
 #, c-format
 msgid "Restart XFS"
 msgstr "XFS taaskäivitamine"
 
-#: standalone/drakfont:408 standalone/drakfont:418
+#: standalone/drakfont:407 standalone/drakfont:417
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "Fondifailide kustutamine"
 
-#: standalone/drakfont:420
+#: standalone/drakfont:419
 #, c-format
 msgid "xfs restart"
 msgstr "xfs taaskäivitamine"
 
-#: standalone/drakfont:428
+#: standalone/drakfont:427
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -20430,36 +20941,36 @@ msgstr ""
 "Enne fontide paigaldamist kontrollige, et Teil on õigus neid oma süsteemis "
 "kasutada ja paigaldada.\n"
 "\n"
-"Fonte saab paigaldada normaalsel meetodil. Haruharva võivad vigased fondid "
-"panna küll X-serveri hanguma."
+"Fontide paigaldamine ei nõua mingeid eritingimusi. Haruharva võivad siiski "
+"vigased fondid tuua kaasa X-serveri hangumise."
 
-#: standalone/drakfont:477 standalone/drakfont:486
+#: standalone/drakfont:476 standalone/drakfont:485
 #, c-format
 msgid "DrakFont"
 msgstr "DrakFont"
 
-#: standalone/drakfont:487
+#: standalone/drakfont:486
 #, c-format
 msgid "Font List"
-msgstr "Fontide loend"
+msgstr "Fontide nimekiri"
 
-#: standalone/drakfont:493
+#: standalone/drakfont:492
 #, c-format
 msgid "About"
 msgstr "Misvärk"
 
-#: standalone/drakfont:495 standalone/drakfont:691 standalone/drakfont:729
+#: standalone/drakfont:494 standalone/drakfont:692 standalone/drakfont:730
 #, c-format
 msgid "Uninstall"
 msgstr "Eemalda"
 
-#: standalone/drakfont:496
+#: standalone/drakfont:495
 #, c-format
 msgid "Import"
 msgstr "Import"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakfont:514
+#: standalone/drakfont:513
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by Mandrakesoft \n"
@@ -20480,7 +20991,7 @@ msgstr ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:523
+#: standalone/drakfont:522
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -20516,7 +21027,7 @@ msgstr ""
 "Free Software Foundation, 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA."
 
-#: standalone/drakfont:539
+#: standalone/drakfont:538
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -20547,12 +21058,12 @@ msgstr ""
 "\t  autorid: Andrew Weeks, Frank Siegert, Thomas Henlich, Sergei Babkin  \n"
 "             teisendab ttf-fondifailid afm- ja pfb-fontideks\n"
 
-#: standalone/drakfont:558
+#: standalone/drakfont:557
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Valige rakendused, millel on fontide tugi:"
 
-#: standalone/drakfont:559
+#: standalone/drakfont:558
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -20567,32 +21078,32 @@ msgstr ""
 "Fonte saab paigaldada normaalsel meetodil. Haruharva võivad vigased fondid "
 "panna küll X-serveri hanguma."
 
-#: standalone/drakfont:569
+#: standalone/drakfont:568
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:570
+#: standalone/drakfont:569
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:571
+#: standalone/drakfont:570
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:572
+#: standalone/drakfont:571
 #, c-format
 msgid "Generic Printers"
 msgstr "Tavalised printerid"
 
-#: standalone/drakfont:588
+#: standalone/drakfont:587
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
-msgstr "Valige fondifail või kataloog ja klõpsake 'Lisa'"
+msgstr "Valige fondifail või kataloog ja klõpsake \"Lisa\""
 
-#: standalone/drakfont:589
+#: standalone/drakfont:588
 #, c-format
 msgid "File Selection"
 msgstr "Failivalik"
@@ -20602,92 +21113,92 @@ msgstr "Failivalik"
 msgid "You've not selected any font"
 msgstr "Ühtegi fonti ei ole valitud!"
 
-#: standalone/drakfont:656
+#: standalone/drakfont:657
 #, c-format
 msgid "Import fonts"
 msgstr "Fontide importimine"
 
-#: standalone/drakfont:661
+#: standalone/drakfont:662
 #, c-format
 msgid "Install fonts"
 msgstr "Fontide paigaldamine"
 
-#: standalone/drakfont:696
+#: standalone/drakfont:697
 #, c-format
 msgid "click here if you are sure."
 msgstr "kui olete kindel, klõpsake siia."
 
-#: standalone/drakfont:698
+#: standalone/drakfont:699
 #, c-format
 msgid "here if no."
 msgstr "kui mitte, siis siia."
 
-#: standalone/drakfont:737
+#: standalone/drakfont:738
 #, c-format
 msgid "Unselected All"
 msgstr "Tühista kõigi valimine"
 
-#: standalone/drakfont:740
+#: standalone/drakfont:741
 #, c-format
 msgid "Selected All"
 msgstr "Kõigi valimine"
 
-#: standalone/drakfont:743
+#: standalone/drakfont:744
 #, c-format
 msgid "Remove List"
-msgstr "Eemalda loend"
+msgstr "Eemalda nimekiri"
 
-#: standalone/drakfont:754 standalone/drakfont:773
+#: standalone/drakfont:755 standalone/drakfont:774
 #, c-format
 msgid "Importing fonts"
 msgstr "Fontide importimine"
 
-#: standalone/drakfont:758 standalone/drakfont:778
+#: standalone/drakfont:759 standalone/drakfont:779
 #, c-format
 msgid "Initial tests"
 msgstr "Käivitustestid"
 
-#: standalone/drakfont:759
+#: standalone/drakfont:760
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Fontide kopeerimine Teie süsteemi"
 
-#: standalone/drakfont:760
+#: standalone/drakfont:761
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Fontide paigaldamine ja teisendamine"
 
-#: standalone/drakfont:761
+#: standalone/drakfont:762
 #, c-format
 msgid "Post Install"
-msgstr "Paigaldusjärgsed seadistused"
+msgstr "Paigaldamisjärgne seadistamine"
 
-#: standalone/drakfont:779
+#: standalone/drakfont:780
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Fontide eemaldamine Teie süsteemist"
 
-#: standalone/drakfont:780
+#: standalone/drakfont:781
 #, c-format
 msgid "Post Uninstall"
-msgstr "Eemaldamisjärgsed seadistused"
+msgstr "Eemaldamisjärgne seadistamine"
 
-#: standalone/drakgw:58 standalone/drakgw:194
+#: standalone/drakgw:58 standalone/drakgw:191
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Internetiühenduse jagamine"
 
-#: standalone/drakgw:114 standalone/drakvpn:51
+#: standalone/drakgw:111 standalone/drakvpn:51
 #, c-format
 msgid "Sorry, we support only 2.4 and above kernels."
 msgstr "Vabandust, me toetame ainult 2.4 ja uuemaid kerneleid."
 
-#: standalone/drakgw:125
+#: standalone/drakgw:122
 #, c-format
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Internetiühendust hetkel ei jagata"
 
-#: standalone/drakgw:126
+#: standalone/drakgw:123
 #, c-format
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
@@ -20700,39 +21211,39 @@ msgstr ""
 "\n"
 "Mida soovite ette võtta?"
 
-#: standalone/drakgw:130 standalone/drakvpn:127
+#: standalone/drakgw:127 standalone/drakvpn:127
 #, c-format
 msgid "enable"
 msgstr "lubada"
 
-#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
 #: standalone/drakvpn:127
 #, c-format
 msgid "reconfigure"
 msgstr "uuesti seadistada"
 
-#: standalone/drakgw:130 standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:127 standalone/drakgw:154 standalone/drakvpn:101
 #: standalone/drakvpn:127 standalone/drakvpn:376 standalone/drakvpn:735
 #, c-format
 msgid "dismiss"
 msgstr "tühistada"
 
-#: standalone/drakgw:137
+#: standalone/drakgw:134
 #, c-format
 msgid "Enabling servers..."
 msgstr "Serverite käivitamine..."
 
-#: standalone/drakgw:149
+#: standalone/drakgw:146
 #, c-format
 msgid "Internet Connection Sharing is now enabled."
 msgstr "Internetiühenduse jagamine on nüüd lubatud."
 
-#: standalone/drakgw:152
+#: standalone/drakgw:149
 #, c-format
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Internetiühenduse jagamine on lubatud"
 
-#: standalone/drakgw:153
+#: standalone/drakgw:150
 #, c-format
 msgid ""
 "The setup of Internet Connection Sharing has already been done.\n"
@@ -20745,22 +21256,22 @@ msgstr ""
 "\n"
 "Mida soovite ette võtta?"
 
-#: standalone/drakgw:157 standalone/drakvpn:101
+#: standalone/drakgw:154 standalone/drakvpn:101
 #, c-format
 msgid "disable"
 msgstr "keelata"
 
-#: standalone/drakgw:160
+#: standalone/drakgw:157
 #, c-format
 msgid "Disabling servers..."
 msgstr "Serverite peatamine..."
 
-#: standalone/drakgw:175
+#: standalone/drakgw:172
 #, c-format
 msgid "Internet Connection Sharing is now disabled."
 msgstr "Internetiühendust nüüd enam ei jagata."
 
-#: standalone/drakgw:195
+#: standalone/drakgw:192
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -20782,27 +21293,27 @@ msgstr ""
 "\n"
 "Märkus: kohtvõrgu (LAN) jaoks on vajalik eraldi võrgukaardi olemasolu."
 
-#: standalone/drakgw:239
+#: standalone/drakgw:236
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Liides %s (kasutab moodulit %s)"
 
-#: standalone/drakgw:240
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s"
 msgstr "Liides %s"
 
-#: standalone/drakgw:249 standalone/drakpxe:137
+#: standalone/drakgw:246 standalone/drakpxe:137
 #, c-format
 msgid "No network adapter on your system!"
 msgstr "Teie süsteemis ei ole võrgukaarti!"
 
-#: standalone/drakgw:256
+#: standalone/drakgw:253
 #, c-format
 msgid "Network interface"
 msgstr "Võrguliides"
 
-#: standalone/drakgw:257
+#: standalone/drakgw:254
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -20817,24 +21328,24 @@ msgstr ""
 "\n"
 "Kohtvõrgu seadistused seotakse selle liidesega."
 
-#: standalone/drakgw:263 standalone/drakpxe:142
+#: standalone/drakgw:260 standalone/drakpxe:142
 #, c-format
 msgid "Choose the network interface"
 msgstr "Valige võrgukaart"
 
-#: standalone/drakgw:264
+#: standalone/drakgw:261
 #, c-format
 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."
 
-#: standalone/drakgw:293
+#: standalone/drakgw:290
 #, c-format
 msgid "Network interface already configured"
 msgstr "Võrguliides on juba seadistatud"
 
-#: standalone/drakgw:294
+#: standalone/drakgw:291
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -20849,27 +21360,27 @@ msgstr ""
 "\n"
 "Seda saab teha ka käsitsi, aga siis peate kindlasti teadma, mida teete."
 
-#: standalone/drakgw:299
+#: standalone/drakgw:296
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Automaatne ümberseadistamine"
 
-#: standalone/drakgw:299
+#: standalone/drakgw:296
 #, c-format
 msgid "No (experts only)"
 msgstr "Ei (ainult eksperdile)"
 
-#: standalone/drakgw:300
+#: standalone/drakgw:297
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Liidese praeguste seadistuste näitamine"
 
-#: standalone/drakgw:301
+#: standalone/drakgw:298
 #, c-format
 msgid "Current interface configuration"
 msgstr "Liidese praegune seadistus"
 
-#: standalone/drakgw:302
+#: standalone/drakgw:299
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -20879,14 +21390,14 @@ msgid ""
 "IP attribution: %s\n"
 "Driver: %s"
 msgstr ""
-"'%s' praegused seadistused:\n"
+"\"%s\" praegused seadistused:\n"
 "\n"
 "Võrk: %s\n"
-"IP aadress: %s\n"
+"IP-aadress: %s\n"
 "IP omistamine: %s\n"
 "Draiver: %s"
 
-#: standalone/drakgw:315
+#: standalone/drakgw:312
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -20913,90 +21424,90 @@ msgstr ""
 "DHCP server.\n"
 "\n"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:319
 #, c-format
 msgid "Local Network adress"
 msgstr "Kohtvõrgu aadress"
 
-#: standalone/drakgw:326
+#: standalone/drakgw:323
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
 "Here you can select different options for the DHCP server configuration.\n"
-"If you don't know the meaning of an option, simply leave it as it is."
+"If you do not know the meaning of an option, simply leave it as it is."
 msgstr ""
 "DHCP serveri seadistused.\n"
 "\n"
 "Siin saab valida erinevaid võimalusi DHCP serveri seadistustele.\n"
 "Kui te ei tea mõne valiku tähendust, jätke see puutumata."
 
-#: standalone/drakgw:330
+#: standalone/drakgw:327
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Selle) DHCP serveri IP"
 
-#: standalone/drakgw:331
+#: standalone/drakgw:328
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Nimeserveri IP"
 
-#: standalone/drakgw:332
+#: standalone/drakgw:329
 #, c-format
 msgid "The internal domain name"
 msgstr "Sisemine domeeninimi"
 
-#: standalone/drakgw:333
+#: standalone/drakgw:330
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP vahemiku algus"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP vahemiku lõpp"
 
-#: standalone/drakgw:335
+#: standalone/drakgw:332
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Rendiaeg vaikimisi (sekundites)"
 
-#: standalone/drakgw:336
+#: standalone/drakgw:333
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Maksimaalne rendiaeg (sekundites)"
 
-#: standalone/drakgw:337
+#: standalone/drakgw:334
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Liidese ja DHCP serveri ümberseadistamine"
 
-#: standalone/drakgw:344
+#: standalone/drakgw:341
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
-msgstr "Kohtvõrgu lõpus ei seisa '0', visatakse minema."
+msgstr "Kohtvõrgu lõpus ei seisa \"0\", visatakse minema."
 
-#: standalone/drakgw:354
+#: standalone/drakgw:351
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Võimalik kohtvõrgu aadressi konflikt %s seadistuses!\n"
 
-#: standalone/drakgw:364
+#: standalone/drakgw:361
 #, c-format
 msgid "Configuring..."
 msgstr "Seadistamine..."
 
-#: standalone/drakgw:365
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Häälestan skriptid, paigaldan tarkvara, käivitan serverid..."
 
-#: standalone/drakgw:405 standalone/drakpxe:231 standalone/drakvpn:278
+#: standalone/drakgw:402 standalone/drakpxe:231 standalone/drakvpn:278
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Probleemid paketi %s paigaldamisel"
 
-#: standalone/drakgw:601
+#: standalone/drakgw:598
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -21006,7 +21517,7 @@ msgid ""
 msgstr ""
 "Kõik on seadistatud.\n"
 "Nüüd saate Internetiühendust jagada teistele kohtvõrgu arvutitele, kasutades "
-"automaatset võrguseadistust (DHCP) ja läbipaistvat vahendajaserverit (SQUID)."
+"automaatset võrguseadistust (DHCP) ja läbipaistvat puhverserverit (SQUID)."
 
 #: standalone/drakhelp:17
 #, c-format
@@ -21049,7 +21560,7 @@ msgstr ""
 #: standalone/drakhelp:36
 #, c-format
 msgid "Mandrakelinux Help Center"
-msgstr "Mandrakelinux abifailide käivitaja"
+msgstr "Mandrakelinuxi abikeskus"
 
 #: standalone/drakhelp:36
 #, c-format
@@ -21166,7 +21677,7 @@ msgstr "Kustuta valitud reegel"
 #. -PO: "Edit" is a button text and the translation has to be AS SHORT AS POSSIBLE
 #: standalone/drakperm:125 standalone/drakups:298 standalone/drakups:358
 #: standalone/drakups:378 standalone/drakvpn:333 standalone/drakvpn:694
-#: standalone/printerdrake:239
+#: standalone/printerdrake:232
 #, c-format
 msgid "Edit"
 msgstr "Muuda"
@@ -21251,7 +21762,7 @@ msgstr "Set-UID"
 #: standalone/drakperm:273
 #, c-format
 msgid "Use owner id for execution"
-msgstr "Käivitamiseks kasutatakse omaniku id-d"
+msgstr "Käivitamiseks kasutatakse omaniku ID-d"
 
 #: standalone/drakperm:274
 #, c-format
@@ -21261,7 +21772,7 @@ msgstr "Set-GID"
 #: standalone/drakperm:274
 #, c-format
 msgid "Use group id for execution"
-msgstr "Käivitamiseks kasutatakse grupi id-d"
+msgstr "Käivitamiseks kasutatakse grupi ID-d"
 
 #: standalone/drakperm:290 standalone/drakxtv:89
 #, c-format
@@ -21280,7 +21791,7 @@ msgstr "Praegune kasutaja"
 
 #: standalone/drakperm:297
 #, c-format
-msgid "When checked, owner and group won't be changed"
+msgid "When checked, owner and group will not be changed"
 msgstr "Märkimise korral ei muudeta omanikku ja gruppi"
 
 #: standalone/drakperm:307
@@ -21406,7 +21917,7 @@ msgid ""
 msgstr ""
 "Andke palun faili auto_install.cfg asukoht.\n"
 "\n"
-"Jätke tühjaks, kui Te ei soovi määrata automaatpaigalduse resiimi.\n"
+"Jätke tühjaks, kui Te ei soovi määrata automaatpaigaldamise režiimi.\n"
 "\n"
 
 #: standalone/drakpxe:215
@@ -21499,9 +22010,9 @@ msgstr ""
 "serverirakendustele:\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Vähene</span>: See ei ole üldse turvaline,\n"
+"<span foreground=\"royalblue3\">Vähene</span>: see ei ole üldse turvaline,\n"
 "kuid muudab arvuti kasutamise väga hõlpsaks. Seda tuleks kasutada ainult\n"
-"masinatel, mis ei ole võrku ühendatud ja millele ei pääse hõlpsasti ligi.\n"
+"masinates, mis ei ole võrku ühendatud ja millele ei pääse hõlpsasti ligi.\n"
 "\n"
 "\n"
 "<span foreground=\"royalblue3\">Standardne</span>: see on tavaline "
@@ -21509,21 +22020,20 @@ msgstr ""
 "mida võib soovitada arvutile, mis on Internetti ühendatud kliendina.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Kõrge</span>: On juba mõningaid piiranguid,\n"
-"igal ööl sooritatakse märksa rohkem automaatseid kontrollimisi.\n"
+"<span foreground=\"royalblue3\">Kõrge</span>: on juba mõningaid piiranguid,\n"
+"igal ööl kontrollitakse automaatselt turvalisuse mitmeid aspekte.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Väga kõrge</span>: Turvalisus on piisav, et\n"
+"<span foreground=\"royalblue3\">Väga kõrge</span>: turvalisus on piisav, et\n"
 "süsteemi saaks kasutada serverina, mis võib vastu võtta ühendusi paljudelt\n"
 "klientidelt. Kui Teie masin on Internetis vaid kui klient, oleks mõttekam\n"
 "valida madalam tase.\n"
 "\n"
 "\n"
-"<span foreground=\"royalblue3\">Paranoiline</span>: See sarnaneb eelmisele\n"
-"tasemele, ainult et süsteem on täiesti suletud ja turvaseadistused\n"
-"maksimumi peale keeratud."
+"<span foreground=\"royalblue3\">Paranoiline</span>: see sarnaneb eelmisele\n"
+"tasemele, ainult et süsteem on täiesti suletud ja turvalisus maksimaalne."
 
-#: standalone/draksec:154 standalone/harddrake2:184
+#: standalone/draksec:154 standalone/harddrake2:202
 #, c-format
 msgid ""
 "Description of the fields:\n"
@@ -21567,12 +22077,12 @@ msgstr "Süsteemi parameetrid"
 msgid "Periodic Checks"
 msgstr "Perioodiline kontroll"
 
-#: standalone/draksec:299
+#: standalone/draksec:298
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Palun oodake, kehtestan turvataseme..."
 
-#: standalone/draksec:305
+#: standalone/draksec:304
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Palun oodake, kehtestan turvaparameetrid..."
@@ -21625,8 +22135,8 @@ msgid ""
 "package 'ImageMagick' is required to be able to complete configuration.\n"
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
 msgstr ""
-"korrektseks töötamiseks on vajalik pakett 'ImageMagick'.\n"
-"Klõpsake \"Olgu\" paketi 'ImageMagick' paigaldamiseks\n"
+"korrektseks töötamiseks on vajalik pakett ImageMagick.\n"
+"Klõpsake \"Olgu\" paketi ImageMagick paigaldamiseks\n"
 "või \"Loobu\" väljumiseks."
 
 #: standalone/draksplash:68
@@ -21637,7 +22147,7 @@ msgstr "esimene samm loomine"
 #: standalone/draksplash:71
 #, c-format
 msgid "final resolution"
-msgstr "lõplik kuvatihedus"
+msgstr "lõplik ekraanilahutus"
 
 #: standalone/draksplash:72
 #, c-format
@@ -21665,7 +22175,7 @@ msgid ""
 "x coordinate of text box\n"
 "in number of characters"
 msgstr ""
-"tekstikasti x-koordinaat\n"
+"tekstikasti X-koordinaat\n"
 "arvulises väljenduses"
 
 #: standalone/draksplash:97
@@ -21674,7 +22184,7 @@ msgid ""
 "y coordinate of text box\n"
 "in number of characters"
 msgstr ""
-"tekstikasti y-koordinaat\n"
+"tekstikasti Y-koordinaat\n"
 "arvulises väljenduses"
 
 #: standalone/draksplash:98
@@ -21694,7 +22204,7 @@ msgid ""
 "of its upper left corner"
 msgstr ""
 "edenemisriba ülemise vasaku\n"
-"nurga x-koordinaat"
+"nurga X-koordinaat"
 
 #: standalone/draksplash:101
 #, c-format
@@ -21703,7 +22213,7 @@ msgid ""
 "of its upper left corner"
 msgstr ""
 "edenemisriba ülemise vasaku\n"
-"nurga y-koordinaat"
+"nurga Y-koordinaat"
 
 #: standalone/draksplash:102
 #, c-format
@@ -21838,7 +22348,7 @@ msgstr ""
 msgid "Autodetection"
 msgstr "Automaattuvastus"
 
-#: standalone/drakups:101 standalone/harddrake2:211
+#: standalone/drakups:101 standalone/harddrake2:231
 #, c-format
 msgid "Detection in progress"
 msgstr "Toimub tuvastamine..."
@@ -21862,7 +22372,7 @@ msgstr "Ühtegi UPS-i ei leitud!"
 #: standalone/drakups:128 standalone/drakups:140
 #, c-format
 msgid "UPS driver configuration"
-msgstr "UPS-i draiveri seadistused"
+msgstr "UPS-i draiveri seadistamine"
 
 #: standalone/drakups:128
 #, c-format
@@ -21919,7 +22429,8 @@ msgid "UPS devices"
 msgstr "UPS-id"
 
 #: standalone/drakups:247 standalone/drakups:266 standalone/drakups:282
-#: standalone/harddrake2:80 standalone/harddrake2:102
+#: standalone/harddrake2:83 standalone/harddrake2:109
+#: standalone/harddrake2:116
 #, c-format
 msgid "Name"
 msgstr "Nimi"
@@ -21932,7 +22443,7 @@ msgstr "UPS-i kasutajad"
 #: standalone/drakups:281
 #, c-format
 msgid "Access Control Lists"
-msgstr "Ligipääsu kontrolli loend (ACL)"
+msgstr "Ligipääsu kontrolli nimekiri (ACL)"
 
 #: standalone/drakups:282
 #, c-format
@@ -21949,7 +22460,7 @@ msgstr "Reeglid"
 msgid "Action"
 msgstr "Toiming"
 
-#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:77
+#: standalone/drakups:295 standalone/drakvpn:1146 standalone/harddrake2:80
 #, c-format
 msgid "Level"
 msgstr "Tase"
@@ -22035,7 +22546,7 @@ msgstr "VPN ühendus on nüüd sisse lülitatud."
 #: standalone/drakvpn:155 standalone/drakvpn:183
 #, c-format
 msgid "Simple VPN setup."
-msgstr "Lihtne VPN seadistus."
+msgstr "Lihtne VPN seadistamine."
 
 #: standalone/drakvpn:156
 #, c-format
@@ -22057,7 +22568,7 @@ msgstr ""
 "Selle võimalusega võivad arvutid Teie privaatvõrgus ja mõnes muus\n"
 "privaatvõrgus jagada ressursse üle oma tulemüüri väga turvaliselt.\n"
 "\n"
-"Internetiühendus on krüptitud. Kohalikud ja kaugmasinad paistavad\n"
+"Internetiühendus on krüptitud. Kohalikud ja võrgumasinad paistavad\n"
 "asuvat ühes ja samas võrgus.\n"
 "\n"
 "Kontrollige, et oleksite drakconnecti abil seadistanud võrgu- ja\n"
@@ -22108,7 +22619,7 @@ msgstr ""
 "\n"
 "Teil on %s kerneli versioon.\n"
 "\n"
-"Sel kernelil on '%s' toetus."
+"Sel kernelil on \"%s\" toetus."
 
 #: standalone/drakvpn:292
 #, c-format
@@ -22140,7 +22651,7 @@ msgstr ""
 "\n"
 "Teil tuleb määrata turvareeglid ja seejärel seadistada \n"
 "automaatse võtmevahetuse (IKE) deemon. \n"
-"Meie kasutatav KAME IKE deemon kannab nimetust 'racoon'.\n"
+"Meie kasutatav KAME IKE deemon kannab nime \"racoon\".\n"
 "\n"
 "Mida soovite seadistada?\n"
 
@@ -22155,7 +22666,7 @@ msgstr ""
 "Nüüd seadistame faili %s.\n"
 "\n"
 "\n"
-"Selleks klõpsake nupule 'Järgmine'.\n"
+"Selleks klõpsake nupule \"Edasi\".\n"
 
 #: standalone/drakvpn:325 standalone/drakvpn:685
 #, c-format
@@ -22218,7 +22729,7 @@ msgstr ""
 "\n"
 "See on ilmselt uus konfiguratsioon.\n"
 "\n"
-"Peaksite minema tagasi ja valima 'lisada'.\n"
+"Peaksite minema tagasi ja valima \"lisada\".\n"
 
 #: standalone/drakvpn:368
 #, c-format
@@ -22342,7 +22853,7 @@ msgid ""
 "\n"
 "Here you define the default settings. \n"
 "All the other sections will follow this one.\n"
-"The left settings are optional. If don't define\n"
+"The left settings are optional. If do not define\n"
 "them here, globally, you can define them in each\n"
 "section.\n"
 msgstr ""
@@ -22498,7 +23009,7 @@ msgstr ""
 "Failil %s on mitu sektsiooni või ühendust.\n"
 "\n"
 "Allpool saate valida, millist soovite redigeerida.\n"
-"Seejärel klõpsake nupule 'Järgmine'.\n"
+"Seejärel klõpsake nupule \"Edasi\".\n"
 
 #: standalone/drakvpn:580 standalone/drakvpn:660 standalone/drakvpn:831
 #: standalone/drakvpn:877
@@ -22508,7 +23019,7 @@ msgstr "Sektsiooni nimed"
 
 #: standalone/drakvpn:590
 #, c-format
-msgid "Can't edit!"
+msgid "Can not edit!"
 msgstr "Redigeerimine ebaõnnestus!"
 
 #: standalone/drakvpn:591
@@ -22598,7 +23109,7 @@ msgstr ""
 "Failil %s on mitu sektsiooni või ühendust.\n"
 "\n"
 "Valige allpool, millist sektsiooni soovite eemaldada\n"
-"ja klõpsake nupule 'Järgmine'.\n"
+"ja klõpsake nupule \"Edasi\".\n"
 
 #: standalone/drakvpn:686
 #, c-format
@@ -22761,7 +23272,7 @@ msgstr ""
 "Kontrollige, et asukohasektsioonid asuks alati\n"
 "faili racoon.conf alguses.\n"
 "\n"
-"Nüüd võite asuda määrama kaugvõrgu seadistusi.\n"
+"Nüüd võite asuda määrama võrguseadistusi.\n"
 "Kui olete valmis, jätkake või minge tagasi.\n"
 
 #: standalone/drakvpn:810
@@ -22791,7 +23302,7 @@ msgstr ""
 "Failil %s on mitu sektsiooni või ühendust.\n"
 "\n"
 "Vali allpool olevas nimekirjast, millist soovite\n"
-"redigeerida ja klõpsake nupule 'Järgmine'.\n"
+"redigeerida ja klõpsake nupule \"Edasi\".\n"
 
 #: standalone/drakvpn:838
 #, c-format
@@ -22806,7 +23317,7 @@ msgstr ""
 "Failil %s on mitu sektsiooni.\n"
 "\n"
 "\n"
-"Nüüd võite asuda kaugvõrgu sektsiooni juurde.\n"
+"Nüüd võite asuda võrgusektsiooni juurde.\n"
 "\n"
 "Kui olete valmis, jätkake andmete salvestamiseks.\n"
 
@@ -23192,7 +23703,7 @@ msgid ""
 "remote ::1 [8000]"
 msgstr ""
 "remote (aadress | anonymous) [[port]] { argumendid }\n"
-"määrab IKE faasi 1 parameetrid igale kaugsõlmele.\n"
+"määrab IKE faasi 1 parameetrid igale võrgusõlmele.\n"
 "Vaikeport on 500.  Kui määratud on anonüümne, rakenduvad\n"
 "argumendid kõigile partneritele, kes ei vasta mingile\n"
 "muule direktiivile.\n"
@@ -23205,7 +23716,7 @@ msgstr ""
 #: standalone/drakvpn:1052
 #, c-format
 msgid "Exchange mode"
-msgstr "Vahetusresiim"
+msgstr "Vahetusrežiim"
 
 #: standalone/drakvpn:1054
 #, c-format
@@ -23217,10 +23728,10 @@ msgid ""
 "modes are acceptable. The first exchange mode is what\n"
 "racoon uses when it is the initiator.\n"
 msgstr ""
-"määrab vahetusresiimi faasis 1, kui algataja on racoon.\n"
-"Samuti määrab vastuvõetava vahetusresiimi, kui racoon on\n"
-"vastaja. Määrata võib enam kui ühe resiimi, eraldajaks\n"
-"koma. Kõik resiimid on vastuvõetavad. Esimene resiim on see,\n"
+"määrab vahetusrežiimi faasis 1, kui algataja on racoon.\n"
+"Samuti määrab vastuvõetava vahetusrežiimi, kui racoon on\n"
+"vastaja. Määrata võib enam kui ühe režiimi, eraldajaks\n"
+"koma. Kõik režiimid on vastuvõetavad. Esimene režiim on see,\n"
 "mida racoon kasutab juhul, kui ta on algataja.\n"
 
 #: standalone/drakvpn:1060
@@ -23364,12 +23875,12 @@ msgid ""
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
-"määrab faasi 1 läbirääkimistel kaugmasinale saadetava\n"
+"määrab faasi 1 läbirääkimistel võrgumasinale saadetava\n"
 "identifikaatori ja kasutatava tübi.  aadress, FQDN,\n"
 "user_fqdn, keyid ja asn1dn on kasutatava ID tüübina.\n"
 "kasutamine on järgmine:\n"
 "\tmy_identifier address [aadress];\n"
-"\t\ttüüp on IP aadress.  See on vaiketüüp,\n"
+"\t\ttüüp on IP-aadress.  See on vaiketüüp,\n"
 "\t\tkui Te ei määra kasutatavat identifikaatorit.\n"
 "\tmy_identifier user_fqdn string;\n"
 "\t\ttüüp on USER_FQDN (kasutaja täielik\n"
@@ -23421,11 +23932,6 @@ msgstr ""
 msgid "Hash algorithm"
 msgstr "Räsialgoritm"
 
-#: standalone/drakvpn:1125
-#, c-format
-msgid "Authentication method"
-msgstr "Autentimisviis"
-
 #: standalone/drakvpn:1126
 #, c-format
 msgid "DH group"
@@ -23484,7 +23990,7 @@ msgstr "keelatud"
 #: standalone/drakvpn:1143
 #, c-format
 msgid "Mode"
-msgstr "Resiim"
+msgstr "Režiim"
 
 #: standalone/drakvpn:1143
 #, c-format
@@ -23625,13 +24131,13 @@ msgstr "Peatse jällenägemiseni!"
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Nüüd võite XawTV tööle panna (X Window keskkonnas!) !\n"
 
-#: standalone/drakxtv:134
+#: standalone/drakxtv:149
 #, c-format
 msgid "No TV Card detected!"
 msgstr "TV-kaarti ei leitud!"
 
 #. -PO: keep the double empty lines between sections, this is formatted a la LaTeX
-#: standalone/drakxtv:136
+#: standalone/drakxtv:151
 #, c-format
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
@@ -23643,7 +24149,7 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"Teie masinal ei leitud TV-kaarti. Kontrollige palun, et Linuxi toega video/"
+"Teie süsteemis ei leitud TV-kaarti. Kontrollige palun, et Linuxi toega video/"
 "TV-kaart on korrektselt ühendatud.\n"
 "\n"
 "\n"
@@ -23652,28 +24158,28 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: standalone/harddrake2:20
+#: standalone/harddrake2:23
 #, c-format
 msgid "Alternative drivers"
 msgstr "Alternatiivsed draiverid"
 
-#: standalone/harddrake2:21
+#: standalone/harddrake2:24
 #, c-format
 msgid "the list of alternative drivers for this sound card"
-msgstr "selle helikaardi alternatiivsete draiverite loend"
+msgstr "selle helikaardi alternatiivsete draiverite nimekiri"
 
-#: standalone/harddrake2:24
+#: standalone/harddrake2:27
 #, c-format
 msgid ""
 "this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
 msgstr "see on füüsiline siin, millega seade on ühendatud (nt: PCI, USB, ...)"
 
-#: standalone/harddrake2:26 standalone/harddrake2:130
+#: standalone/harddrake2:29 standalone/harddrake2:144
 #, c-format
 msgid "Bus identification"
 msgstr "Siinitunnus"
 
-#: standalone/harddrake2:27
+#: standalone/harddrake2:30
 #, c-format
 msgid ""
 "- PCI and USB devices: this lists the vendor, device, subvendor and "
@@ -23681,7 +24187,7 @@ msgid ""
 msgstr ""
 "- PCI- ja USB-seadmed: tootja, seade, allettevõtja ja allseadme PCI/USB ID-d"
 
-#: standalone/harddrake2:30
+#: standalone/harddrake2:33
 #, c-format
 msgid ""
 "- pci devices: this gives the PCI slot, device and function of this card\n"
@@ -23692,204 +24198,204 @@ msgstr ""
 "- eide seadmed: seade on kas ülem või allutatu\n"
 "- scsi seadmed: scsi siin ja scsi seadme id-d"
 
-#: standalone/harddrake2:33
+#: standalone/harddrake2:36
 #, c-format
 msgid "Drive capacity"
 msgstr "Ketta eriomadused"
 
-#: standalone/harddrake2:33
+#: standalone/harddrake2:36
 #, c-format
 msgid "special capacities of the driver (burning ability and or DVD support)"
 msgstr "ketta eriomadused (nt. kirjutamine ja/või DVD tugi)"
 
-#: standalone/harddrake2:34
+#: standalone/harddrake2:37
 #, c-format
 msgid "this field describes the device"
 msgstr "see väli kirjeldab seadet"
 
-#: standalone/harddrake2:35
+#: standalone/harddrake2:38
 #, c-format
 msgid "Old device file"
 msgstr "Vana seadmefail"
 
-#: standalone/harddrake2:36
+#: standalone/harddrake2:39
 #, c-format
 msgid "old static device name used in dev package"
 msgstr "vana staatiline seadmenimi, mis oli kasutusel paketis dev"
 
-#: standalone/harddrake2:37
+#: standalone/harddrake2:40
 #, c-format
 msgid "New devfs device"
 msgstr "Uus devfs seade"
 
-#: standalone/harddrake2:38
+#: standalone/harddrake2:41
 #, c-format
 msgid "new dynamic device name generated by core kernel devfs"
 msgstr "uus dünaamiline seadmenimi, mille genereerib kerneli devfs"
 
 #. -PO: here "module" is the "jargon term" for a kernel driver
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
 #, c-format
 msgid "Module"
 msgstr "Moodul"
 
-#: standalone/harddrake2:41
+#: standalone/harddrake2:44
 #, c-format
 msgid "the module of the GNU/Linux kernel that handles the device"
 msgstr "GNU/Linuxi kerneli moodul, mis käsitleb seda seadet"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:45
 #, c-format
 msgid "Extended partitions"
 msgstr "Laiendatud partitsioonid"
 
-#: standalone/harddrake2:42
+#: standalone/harddrake2:45
 #, c-format
 msgid "the number of extended partitions"
 msgstr "laiendatud partitsioonide arv"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:46
 #, c-format
 msgid "Geometry"
 msgstr "Geomeetria"
 
-#: standalone/harddrake2:43
+#: standalone/harddrake2:46
 #, c-format
 msgid "Cylinder/head/sectors geometry of the disk"
 msgstr "Ketta silindrite/peade/sektorite geomeetria"
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:47
 #, c-format
 msgid "Disk controller"
 msgstr "Kettakontroller"
 
-#: standalone/harddrake2:44
+#: standalone/harddrake2:47
 #, c-format
 msgid "the disk controller on the host side"
 msgstr "serveripoolne kettakontroller"
 
-#: standalone/harddrake2:45
+#: standalone/harddrake2:48
 #, c-format
 msgid "class of hardware device"
 msgstr "riistvaralise seadme klass"
 
-#: standalone/harddrake2:46 standalone/harddrake2:78
-#: standalone/printerdrake:218
+#: standalone/harddrake2:49 standalone/harddrake2:81
+#: standalone/printerdrake:211
 #, c-format
 msgid "Model"
 msgstr "Mudel"
 
-#: standalone/harddrake2:46
+#: standalone/harddrake2:49
 #, c-format
 msgid "hard disk model"
 msgstr "kõvaketta mudel"
 
-#: standalone/harddrake2:47
+#: standalone/harddrake2:50
 #, c-format
 msgid "network printer port"
 msgstr "võrguprinteri port"
 
-#: standalone/harddrake2:48
+#: standalone/harddrake2:51
 #, c-format
 msgid "Primary partitions"
 msgstr "Primaarsed partitsioonid"
 
-#: standalone/harddrake2:48
+#: standalone/harddrake2:51
 #, c-format
 msgid "the number of the primary partitions"
 msgstr "primaarsete partitsioonide arv"
 
-#: standalone/harddrake2:49
+#: standalone/harddrake2:52
 #, c-format
 msgid "the vendor name of the device"
 msgstr "seadme tootja nimi"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
 #, c-format
 msgid "Bus PCI #"
 msgstr "PCI siin #"
 
-#: standalone/harddrake2:50
+#: standalone/harddrake2:53
 #, c-format
 msgid "the PCI bus on which the device is plugged"
 msgstr "füüsiline PCI siin, millega seade on ühendatud"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:54
 #, c-format
 msgid "PCI device #"
 msgstr "PCI seade #"
 
-#: standalone/harddrake2:51
+#: standalone/harddrake2:54
 #, c-format
 msgid "PCI device number"
 msgstr "PCI seadme number"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
 #, c-format
 msgid "PCI function #"
 msgstr "PCI funktsioon #"
 
-#: standalone/harddrake2:52
+#: standalone/harddrake2:55
 #, c-format
 msgid "PCI function number"
 msgstr "PCI funktsiooni number"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:56
 #, c-format
 msgid "Vendor ID"
 msgstr "Tootja ID"
 
-#: standalone/harddrake2:53
+#: standalone/harddrake2:56
 #, c-format
 msgid "this is the standard numerical identifier of the vendor"
 msgstr "tootja standardne numbriline identifikaator"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:57
 #, c-format
 msgid "Device ID"
 msgstr "Seadme ID"
 
-#: standalone/harddrake2:54
+#: standalone/harddrake2:57
 #, c-format
 msgid "this is the numerical identifier of the device"
 msgstr "seadme numbriline identifikaator"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:58
 #, c-format
 msgid "Sub vendor ID"
 msgstr "Tootja alam-ID"
 
-#: standalone/harddrake2:55
+#: standalone/harddrake2:58
 #, c-format
 msgid "this is the minor numerical identifier of the vendor"
 msgstr "tootja väiksem numbriline identifikaator"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:59
 #, c-format
 msgid "Sub device ID"
 msgstr "Seadme alam-ID"
 
-#: standalone/harddrake2:56
+#: standalone/harddrake2:59
 #, c-format
 msgid "this is the minor numerical identifier of the device"
 msgstr "seadme väiksem numbriline identifikaator"
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:60
 #, c-format
 msgid "Device USB ID"
 msgstr "USB seadme ID"
 
-#: standalone/harddrake2:57
+#: standalone/harddrake2:60
 #, c-format
 msgid ".."
 msgstr ".."
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:64
 #, c-format
 msgid "Bogomips"
 msgstr "Bogomipsid"
 
-#: standalone/harddrake2:61
+#: standalone/harddrake2:64
 #, c-format
 msgid ""
 "the GNU/Linux kernel needs to run a calculation loop at boot time to "
@@ -23900,53 +24406,53 @@ msgstr ""
 "kalkulatsioonisilmuse.  Selle tulemus salvestatakse bogomipsides, mis "
 "kujutab endast omamoodi CPU \"jõudlustesti\"."
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:65
 #, c-format
 msgid "Cache size"
 msgstr "Puhvri suurus"
 
-#: standalone/harddrake2:62
+#: standalone/harddrake2:65
 #, c-format
 msgid "size of the (second level) cpu cache"
 msgstr "(Teise taseme) CPU puhvri suurus"
 
 #. -PO: here "comas" is the medical coma, not the lexical coma!!
-#: standalone/harddrake2:65
+#: standalone/harddrake2:68
 #, c-format
 msgid "Coma bug"
 msgstr "\"Koomaviga\""
 
-#: standalone/harddrake2:65
+#: standalone/harddrake2:68
 #, c-format
 msgid "whether this cpu has the Cyrix 6x86 Coma bug"
 msgstr "kas sel CPU-l on Cyrix 6x86 \"koomaviga\""
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:69
 #, c-format
 msgid "Cpuid family"
 msgstr "Cpuid perekond"
 
-#: standalone/harddrake2:66
+#: standalone/harddrake2:69
 #, c-format
 msgid "family of the cpu (eg: 6 for i686 class)"
 msgstr "CPU perekond (nt 6, kui on i686)"
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:70
 #, c-format
 msgid "Cpuid level"
 msgstr "Cpuid tase"
 
-#: standalone/harddrake2:67
+#: standalone/harddrake2:70
 #, c-format
 msgid "information level that can be obtained through the cpuid instruction"
 msgstr "Infotase, mida võib saada cpuid instruktsiooni vahendusel"
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:71
 #, c-format
 msgid "Frequency (MHz)"
 msgstr "Sagedus (MHz)"
 
-#: standalone/harddrake2:68
+#: standalone/harddrake2:71
 #, c-format
 msgid ""
 "the CPU frequency in MHz (Megahertz which in first approximation may be "
@@ -23956,22 +24462,22 @@ msgstr ""
 "CPU sagedus megahertsides (seda võib ligilähedaselt samastada operatsioonide "
 "arvuga, mida CPU suudab sekundis sooritada)"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:72
 #, c-format
 msgid "Flags"
 msgstr "Lipud"
 
-#: standalone/harddrake2:69
+#: standalone/harddrake2:72
 #, c-format
 msgid "CPU flags reported by the kernel"
 msgstr "CPU lipud kerneli teatel"
 
-#: standalone/harddrake2:70
+#: standalone/harddrake2:73
 #, c-format
 msgid "Fdiv bug"
 msgstr "FDIV viga"
 
-#: standalone/harddrake2:71
+#: standalone/harddrake2:74
 #, c-format
 msgid ""
 "Early Intel Pentium chips manufactured have a bug in their floating point "
@@ -23981,107 +24487,107 @@ msgstr ""
 "Varastel Inteli Pentium-kiipidel oli viga ujukomaprotsessoris, mis ei "
 "saavutanud vajalikku täpsust ujukomajagamist (FDIV) sooritades"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:75
 #, c-format
 msgid "Is FPU present"
 msgstr "FPU olemasolu"
 
-#: standalone/harddrake2:72
+#: standalone/harddrake2:75
 #, c-format
 msgid "yes means the processor has an arithmetic coprocessor"
 msgstr "jah tähendab, et protsessoril on matemaatika-kaasprotsessor"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:76
 #, c-format
 msgid "Whether the FPU has an irq vector"
 msgstr "Kas FPU-l on irq vektor"
 
-#: standalone/harddrake2:73
+#: standalone/harddrake2:76
 #, c-format
 msgid "yes means the arithmetic coprocessor has an exception vector attached"
 msgstr "jah tähendab, et matemaatika-kaasprotsessoril on erandivektor"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:77
 #, c-format
 msgid "F00f bug"
 msgstr "F00f viga"
 
-#: standalone/harddrake2:74
+#: standalone/harddrake2:77
 #, c-format
 msgid "early pentiums were buggy and freezed when decoding the F00F bytecode"
 msgstr ""
 "varased pentiumid olid vigased ning hangusid F00F baidikoodi dekodeerimisel"
 
-#: standalone/harddrake2:75
+#: standalone/harddrake2:78
 #, c-format
 msgid "Halt bug"
 msgstr "Seiskamisviga"
 
-#: standalone/harddrake2:76
+#: standalone/harddrake2:79
 #, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
 "after the \"halt\" instruction is used"
 msgstr ""
-"Mõned varasemad i486DX-100 kiibid ei suutnud korralikult naasta tööresiimi, "
+"Mõned varasemad i486DX-100 kiibid ei suutnud korralikult naasta töörežiimi, "
 "kui oli kasutatud käsklust \"seiska\" (\"halt\")"
 
-#: standalone/harddrake2:77
+#: standalone/harddrake2:80
 #, c-format
 msgid "sub generation of the cpu"
 msgstr "CPU alampõlvkond"
 
-#: standalone/harddrake2:78
+#: standalone/harddrake2:81
 #, c-format
 msgid "generation of the cpu (eg: 8 for Pentium III, ...)"
 msgstr "CPU põlvkond (nt 8, kui on Pentium III ...)"
 
-#: standalone/harddrake2:79
+#: standalone/harddrake2:82
 #, c-format
 msgid "Model name"
 msgstr "Mudeli nimi"
 
-#: standalone/harddrake2:79
+#: standalone/harddrake2:82
 #, c-format
 msgid "official vendor name of the cpu"
 msgstr "CPU ametlik tootja"
 
-#: standalone/harddrake2:80
+#: standalone/harddrake2:83
 #, c-format
 msgid "the name of the CPU"
 msgstr "protsessori (CPU) nimi"
 
-#: standalone/harddrake2:81
+#: standalone/harddrake2:84
 #, c-format
 msgid "Processor ID"
 msgstr "Protsessori ID"
 
-#: standalone/harddrake2:81
+#: standalone/harddrake2:84
 #, c-format
 msgid "the number of the processor"
 msgstr "protsessori number"
 
-#: standalone/harddrake2:82
+#: standalone/harddrake2:85
 #, c-format
 msgid "Model stepping"
 msgstr "Mudeli alamtüüp"
 
-#: standalone/harddrake2:82
+#: standalone/harddrake2:85
 #, c-format
 msgid "stepping of the cpu (sub model (generation) number)"
 msgstr "protsessori alamtüüp (nn stepping'u number) "
 
-#: standalone/harddrake2:83
+#: standalone/harddrake2:86
 #, c-format
 msgid "the vendor name of the processor"
 msgstr "protsessori tootja nimi"
 
-#: standalone/harddrake2:84
+#: standalone/harddrake2:87
 #, c-format
 msgid "Write protection"
 msgstr "Kirjutuskaitse"
 
-#: standalone/harddrake2:84
+#: standalone/harddrake2:87
 #, c-format
 msgid ""
 "the WP flag in the CR0 register of the cpu enforce write protection at the "
@@ -24092,42 +24598,42 @@ msgstr ""
 "võimaldades nii protsessoril takistada kerneli kontrollimatut ligipääsu "
 "kasutajamälule (kannab ka nimetust veavalvur)"
 
-#: standalone/harddrake2:88
+#: standalone/harddrake2:91
 #, c-format
 msgid "Floppy format"
 msgstr "Disketi vorming"
 
-#: standalone/harddrake2:88
+#: standalone/harddrake2:91
 #, c-format
 msgid "format of floppies supported by the drive"
 msgstr "disketi vorming, mida seade tunnustab"
 
-#: standalone/harddrake2:92
+#: standalone/harddrake2:95
 #, c-format
 msgid "Channel"
 msgstr "Kanal"
 
-#: standalone/harddrake2:92
+#: standalone/harddrake2:95
 #, c-format
 msgid "EIDE/SCSI channel"
 msgstr "EIDE/SCSI kanal"
 
-#: standalone/harddrake2:93
+#: standalone/harddrake2:96
 #, c-format
 msgid "Disk identifier"
 msgstr "Ketta identifikaator"
 
-#: standalone/harddrake2:93
+#: standalone/harddrake2:96
 #, c-format
 msgid "usually the disk serial number"
 msgstr "tavaliselt ketta seerianumber"
 
-#: standalone/harddrake2:94
+#: standalone/harddrake2:97
 #, c-format
 msgid "Logical unit number"
 msgstr "Loogilise ketta number"
 
-#: standalone/harddrake2:94
+#: standalone/harddrake2:97
 #, c-format
 msgid ""
 "the SCSI target number (LUN). SCSI devices connected to a host are uniquely "
@@ -24137,144 +24643,190 @@ msgstr ""
 "SCSI sihtnumber (LUN). Masinaga ühendatud SCSI seadmeid tuvastatakse\n"
 "kanali numbri, siht-ID ja loogilise ketta numbri järgi"
 
-#: standalone/harddrake2:99
+#. -PO: here, "size" is the size of the ram chip (eg: 128Mo, 256Mo, ...)
+#: standalone/harddrake2:104
+#, c-format
+msgid "Installed size"
+msgstr "Paigaldatud suurus"
+
+#: standalone/harddrake2:104
+#, c-format
+msgid "Installed size of the memory bank"
+msgstr "Mälumooduli paigaldatud suurus"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Enabled Size"
+msgstr "Sisselülitatud suurus"
+
+#: standalone/harddrake2:105
+#, c-format
+msgid "Enabled size of the memory bank"
+msgstr "Mälumooduli sisselülitatud suurus"
+
+#: standalone/harddrake2:106
+#, c-format
+msgid "type of the memory device"
+msgstr "Mälumooduli tüüp"
+
+#: standalone/harddrake2:107
+#, c-format
+msgid "Speed"
+msgstr "Kiirus"
+
+#: standalone/harddrake2:107
+#, c-format
+msgid "Speed of the memory bank"
+msgstr "Mälumooduli kiirus"
+
+#: standalone/harddrake2:108
+#, c-format
+msgid "Bank connections"
+msgstr "Mooduli ühendused"
+
+#: standalone/harddrake2:109
+#, c-format
+msgid "Socket designation of the memory bank"
+msgstr "Mälumooduli sokkel"
+
+#: standalone/harddrake2:113
 #, c-format
 msgid "Device file"
 msgstr "Seadmefail"
 
-#: standalone/harddrake2:99
+#: standalone/harddrake2:113
 #, c-format
 msgid ""
 "the device file used to communicate with the kernel driver for the mouse"
 msgstr "seadmefail, mida kasutatakse hiire suhtlemisel kerneliga"
 
-#: standalone/harddrake2:100
+#: standalone/harddrake2:114
 #, c-format
 msgid "Emulated wheel"
 msgstr "Emuleeritud hiireratas"
 
-#: standalone/harddrake2:100
+#: standalone/harddrake2:114
 #, c-format
 msgid "whether the wheel is emulated or not"
 msgstr "kas hiireratas on emuleeritud või mitte"
 
-#: standalone/harddrake2:101
+#: standalone/harddrake2:115
 #, c-format
 msgid "the type of the mouse"
 msgstr "hiire tüüp"
 
-#: standalone/harddrake2:102
+#: standalone/harddrake2:116
 #, c-format
 msgid "the name of the mouse"
 msgstr "hiire nimi"
 
-#: standalone/harddrake2:103
+#: standalone/harddrake2:117
 #, c-format
 msgid "Number of buttons"
 msgstr "Nuppude arv"
 
-#: standalone/harddrake2:103
+#: standalone/harddrake2:117
 #, c-format
 msgid "the number of buttons the mouse has"
 msgstr "hiire nuppude arv"
 
-#: standalone/harddrake2:104
+#: standalone/harddrake2:118
 #, c-format
 msgid "the type of bus on which the mouse is connected"
 msgstr "siinitüüp, millega hiir on ühendatud"
 
-#: standalone/harddrake2:105
+#: standalone/harddrake2:119
 #, c-format
 msgid "Mouse protocol used by X11"
 msgstr "X11 kasutatav hiireprotokoll"
 
-#: standalone/harddrake2:105
+#: standalone/harddrake2:119
 #, c-format
 msgid "the protocol that the graphical desktop use with the mouse"
 msgstr "protokoll, mida graafiline töölaud hiire jaoks kasutab"
 
-#: standalone/harddrake2:112 standalone/harddrake2:121
-#: standalone/harddrake2:128 standalone/harddrake2:136
-#: standalone/harddrake2:309
+#: standalone/harddrake2:126 standalone/harddrake2:135
+#: standalone/harddrake2:142 standalone/harddrake2:150
+#: standalone/harddrake2:316
 #, c-format
 msgid "Identification"
 msgstr "Identifikaator"
 
-#: standalone/harddrake2:113 standalone/harddrake2:129
+#: standalone/harddrake2:127 standalone/harddrake2:143
 #, c-format
 msgid "Connection"
 msgstr "Ühendus"
 
-#: standalone/harddrake2:122
+#: standalone/harddrake2:136
 #, c-format
 msgid "Performances"
 msgstr "Jõudlus"
 
-#: standalone/harddrake2:123
+#: standalone/harddrake2:137
 #, c-format
 msgid "Bugs"
 msgstr "Vead"
 
-#: standalone/harddrake2:124
+#: standalone/harddrake2:138
 #, c-format
 msgid "FPU"
 msgstr "FPU"
 
-#: standalone/harddrake2:132
+#: standalone/harddrake2:146
 #, c-format
 msgid "Partitions"
 msgstr "Partitsioonid"
 
-#: standalone/harddrake2:137
+#: standalone/harddrake2:151
 #, c-format
 msgid "Features"
 msgstr "Omadused"
 
 #. -PO: please keep all "/" characters !!!
-#: standalone/harddrake2:158 standalone/logdrake:77
-#: standalone/printerdrake:152 standalone/printerdrake:165
+#: standalone/harddrake2:174 standalone/logdrake:77
+#: standalone/printerdrake:134 standalone/printerdrake:147
 #, c-format
 msgid "/_Options"
 msgstr "/_Eelistused"
 
-#: standalone/harddrake2:159 standalone/harddrake2:180 standalone/logdrake:79
-#: standalone/printerdrake:177 standalone/printerdrake:178
-#: standalone/printerdrake:179 standalone/printerdrake:180
+#: standalone/harddrake2:175 standalone/harddrake2:197 standalone/logdrake:79
+#: standalone/printerdrake:159 standalone/printerdrake:161
+#: standalone/printerdrake:164 standalone/printerdrake:166
 #, c-format
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: standalone/harddrake2:163
+#: standalone/harddrake2:179
 #, c-format
 msgid "/Autodetect _printers"
 msgstr "/_Printerite automaattuvastus"
 
-#: standalone/harddrake2:164
+#: standalone/harddrake2:180
 #, c-format
 msgid "/Autodetect _modems"
 msgstr "/_Modemite automaattuvastus"
 
-#: standalone/harddrake2:165
+#: standalone/harddrake2:181
 #, c-format
 msgid "/Autodetect _jaz drives"
 msgstr "/_JAZ ketaste automaattuvastus"
 
-#: standalone/harddrake2:172 standalone/printerdrake:158
+#: standalone/harddrake2:188 standalone/printerdrake:140
 #, c-format
 msgid "/_Quit"
 msgstr "/_Välju"
 
-#: standalone/harddrake2:181
+#: standalone/harddrake2:199
 #, c-format
 msgid "/_Fields description"
 msgstr "/Välja_de kirjeldus"
 
-#: standalone/harddrake2:183
+#: standalone/harddrake2:201
 #, c-format
 msgid "Harddrake help"
 msgstr "HardDrake abi"
 
-#: standalone/harddrake2:192
+#: standalone/harddrake2:210
 #, c-format
 msgid ""
 "Once you've selected a device, you'll be able to see the device information "
@@ -24283,107 +24835,107 @@ msgstr ""
 "Kui valite seadme, näete selle kohta infot väljadel paremal asuvas paneelis "
 "(\"Info\")"
 
-#: standalone/harddrake2:197 standalone/printerdrake:179
+#: standalone/harddrake2:216 standalone/printerdrake:164
 #, c-format
 msgid "/_Report Bug"
 msgstr "/_Vearaport"
 
-#: standalone/harddrake2:198 standalone/printerdrake:180
+#: standalone/harddrake2:218 standalone/printerdrake:166
 #, c-format
 msgid "/_About..."
 msgstr "/_Misvärk"
 
-#: standalone/harddrake2:199
+#: standalone/harddrake2:219
 #, c-format
 msgid "About Harddrake"
 msgstr "HardDrake info"
 
 #. -PO: Do not alter the <span ..> and </span> tags
-#: standalone/harddrake2:201
+#: standalone/harddrake2:221
 #, c-format
 msgid ""
-"This is HardDrake, a Mandrakelinux hardware configuration tool.\n"
+"This is HardDrake, a %s hardware configuration tool.\n"
 "<span foreground=\"royalblue3\">Version:</span> %s\n"
 "<span foreground=\"royalblue3\">Author:</span> Thierry Vignaud &lt;"
 "tvignaud@mandrakesoft.com&gt;\n"
 "\n"
 msgstr ""
-"See on HardDrake - Mandrakelinuxi riistvara seadistamisvahend.\n"
+"See on HardDrake - %si riistvara seadistamisvahend.\n"
 "<span foreground=\"royalblue3\">Versioon:</span> %s\n"
-"<span foreground=\"royalblue3\">Autor: Thierry Vignaud &lt;"
+"<span foreground=\"royalblue3\">Autor:</span> Thierry Vignaud &lt;"
 "<tvignaud@mandrakesoft.com>&gt;\n"
 "\n"
 
-#: standalone/harddrake2:218
+#: standalone/harddrake2:238
 #, c-format
 msgid "Harddrake2"
 msgstr "HardDrake2"
 
-#: standalone/harddrake2:234
+#: standalone/harddrake2:253
 #, c-format
 msgid "Detected hardware"
 msgstr "Tuvastatud riistvara"
 
-#: standalone/harddrake2:239
+#: standalone/harddrake2:258
 #, c-format
 msgid "Configure module"
 msgstr "Mooduli seadistamine"
 
-#: standalone/harddrake2:246
+#: standalone/harddrake2:265
 #, c-format
 msgid "Run config tool"
 msgstr "Seadistamisvahendi käivitamine"
 
-#: standalone/harddrake2:296 standalone/net_monitor:108
+#: standalone/harddrake2:303 standalone/net_monitor:108
 #: standalone/net_monitor:109 standalone/net_monitor:114
 #, c-format
 msgid "unknown"
 msgstr "tundmatu"
 
-#: standalone/harddrake2:297 standalone/printerdrake:308
-#: standalone/printerdrake:346
+#: standalone/harddrake2:304 standalone/printerdrake:298
+#: standalone/printerdrake:336
 #, c-format
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: standalone/harddrake2:317
+#: standalone/harddrake2:324
 #, c-format
 msgid "Misc"
 msgstr "Muud"
 
-#: standalone/harddrake2:332
+#: standalone/harddrake2:339
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr ""
 "Klõps seadmel vasakul asuvas puus näitab siin selle kohta käivat infot."
 
-#: standalone/harddrake2:384
+#: standalone/harddrake2:391
 #, c-format
 msgid "secondary"
 msgstr "teisene"
 
-#: standalone/harddrake2:384
+#: standalone/harddrake2:391
 #, c-format
 msgid "primary"
 msgstr "esmane"
 
-#: standalone/harddrake2:388
+#: standalone/harddrake2:395
 #, c-format
 msgid "burner"
 msgstr "CD-kirjutaja"
 
-#: standalone/harddrake2:388
+#: standalone/harddrake2:395
 #, c-format
 msgid "DVD"
 msgstr "DVD"
 
-#: standalone/keyboarddrake:25
+#: standalone/keyboarddrake:29
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "Palun valige klaviatuuriasetus."
 
-#: standalone/keyboarddrake:34
+#: standalone/keyboarddrake:45
 #, c-format
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Kas soovite konsoolil kasutada BackSpace-i kui Delete?"
@@ -24594,7 +25146,7 @@ msgstr "Peata meilihoiatuse süsteem"
 #: standalone/logdrake:402
 #, c-format
 msgid "Mail alert configuration"
-msgstr "Meilihoiatuse seadistused"
+msgstr "Meilihoiatuse seadistamine"
 
 #: standalone/logdrake:403
 #, c-format
@@ -24615,7 +25167,7 @@ msgstr "Mida soovite ette võtta?"
 #: standalone/logdrake:413
 #, c-format
 msgid "Services settings"
-msgstr "Teenuste seadistus"
+msgstr "Teenuste seadistamine"
 
 #: standalone/logdrake:414
 #, c-format
@@ -24627,7 +25179,7 @@ msgstr "Saate hoiatuse, kui mõni valitud teenustest enam ei tööta"
 #: standalone/logdrake:421
 #, c-format
 msgid "Load setting"
-msgstr "Koormuse seadistused"
+msgstr "Koormuse seadistamine"
 
 #: standalone/logdrake:422
 #, c-format
@@ -24644,7 +25196,7 @@ msgstr "Koormus"
 #: standalone/logdrake:428
 #, c-format
 msgid "Alert configuration"
-msgstr "Hoiatuse seadistus"
+msgstr "Hoiatuse seadistamine"
 
 #: standalone/logdrake:429
 #, c-format
@@ -24691,53 +25243,138 @@ msgstr "Hiire test"
 msgid "Please test your mouse:"
 msgstr "Palun testige hiirt:"
 
-#: standalone/net_applet:30
+#: standalone/net_applet:34
 #, c-format
 msgid "Network is up on interface %s"
 msgstr "Võrk töötab liidesel %s"
 
 #. -PO: keep the "Configure Network" substring synced with the "Configure Network" message below
-#: standalone/net_applet:38
+#: standalone/net_applet:42
 #, c-format
 msgid "Network is down on interface %s. Click on \"Configure Network\""
 msgstr "Võrk liidesel %s on maas. Klõpsake \"Võrgu seadistamine\""
 
-#: standalone/net_applet:53 standalone/net_monitor:471
+#: standalone/net_applet:57 standalone/net_monitor:473
 #, c-format
 msgid "Connect %s"
 msgstr "%s ühenduse loomine"
 
-#: standalone/net_applet:54 standalone/net_monitor:471
+#: standalone/net_applet:58 standalone/net_monitor:473
 #, c-format
 msgid "Disconnect %s"
 msgstr "%s ühenduse katkestamine"
 
-#: standalone/net_applet:55
+#: standalone/net_applet:59
 #, c-format
 msgid "Monitor Network"
 msgstr "Võrgu jälgimine"
 
-#: standalone/net_applet:56
+#: standalone/net_applet:60
 #, c-format
 msgid "Configure Network"
 msgstr "Võrgu seadistamine"
 
 #. -PO: "Refresh" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/net_applet:57 standalone/printerdrake:245
+#: standalone/net_applet:61 standalone/printerdrake:238
 #, c-format
 msgid "Refresh"
 msgstr "Värskenda"
 
-#: standalone/net_applet:58
+#: standalone/net_applet:62
 #, c-format
 msgid "Get Online Help"
 msgstr "Abi"
 
-#: standalone/net_applet:158
+#: standalone/net_applet:177
+#, c-format
+msgid "Interactive intrusion detection"
+msgstr "Interaktiivne sissetungide tuvastamine"
+
+#: standalone/net_applet:181
 #, c-format
 msgid "Always launch on startup"
 msgstr "Alati käivitatakse käivitumisel"
 
+#: standalone/net_applet:230
+#, c-format
+msgid "A port scanning attack has been attempted by %s."
+msgstr "%s üritas porte skaneerida."
+
+#: standalone/net_applet:231
+#, c-format
+msgid "The %s service has been attacked by %s."
+msgstr "%s teenus sattus %s rünnaku alla."
+
+#: standalone/net_applet:232
+#, c-format
+msgid "A password cracking attack has been attempted by %s."
+msgstr "%s üritas parooli lahtimurdmist."
+
+#: standalone/net_applet:240
+#, c-format
+msgid "Active Firewall: intrusion detected"
+msgstr "Aktiivne tulemüür: tuvastati sissetung"
+
+#: standalone/net_applet:251
+#, c-format
+msgid "Do you want to blacklist the attacker?"
+msgstr "Kas lisada ründaja musta nimekirja?"
+
+#: standalone/net_applet:265
+#, c-format
+msgid "Always blacklist (do not ask again)"
+msgstr "Lisatakse alati musta nimekirja (rohkem ei küsita)"
+
+#: standalone/net_applet:268
+#, c-format
+msgid "Attack details"
+msgstr "Rünnaku üksikasjad"
+
+#: standalone/net_applet:272
+#, c-format
+msgid "Attack time: %s"
+msgstr "Rünnaku aeg: %s"
+
+#: standalone/net_applet:273
+#, c-format
+msgid "Network interface: %s"
+msgstr "Võrguliides: %s"
+
+#: standalone/net_applet:274
+#, c-format
+msgid "Attack type: %s"
+msgstr "Rünnaku tüüp: %s"
+
+#: standalone/net_applet:275
+#, c-format
+msgid "Protocol: %s"
+msgstr "Protokoll: %s"
+
+#: standalone/net_applet:276
+#, c-format
+msgid "Attacker IP address: %s"
+msgstr "Ründaja IP-aadress: %s"
+
+#: standalone/net_applet:277
+#, c-format
+msgid "Attacker hostname: %s"
+msgstr "Ründaja masinanimi: %s"
+
+#: standalone/net_applet:278
+#, c-format
+msgid "Service attacked: %s"
+msgstr "Rünnatu teenus: %s"
+
+#: standalone/net_applet:279
+#, c-format
+msgid "Port attacked: %s"
+msgstr "Rünnatud port: %s"
+
+#: standalone/net_applet:280
+#, c-format
+msgid "Type of ICMP attack: %s"
+msgstr "ICMP rünnaku tüüp: %s"
+
 #: standalone/net_monitor:61 standalone/net_monitor:66
 #, c-format
 msgid "Network Monitoring"
@@ -24829,199 +25466,195 @@ msgstr ""
 "Ühenduse loomine ebaõnnestus.\n"
 "Kontrollige palun seadistusi Mandrakelinuxi juhtimiskeskuse abil."
 
-#: standalone/net_monitor:341
+#: standalone/net_monitor:340
 #, c-format
 msgid "Color configuration"
 msgstr "Värviseadistused"
 
-#: standalone/net_monitor:389 standalone/net_monitor:409
+#: standalone/net_monitor:388 standalone/net_monitor:408
 #, c-format
 msgid "sent: "
 msgstr "saadetud: "
 
-#: standalone/net_monitor:396 standalone/net_monitor:413
+#: standalone/net_monitor:395 standalone/net_monitor:412
 #, c-format
 msgid "received: "
 msgstr "saadud: "
 
-#: standalone/net_monitor:403
+#: standalone/net_monitor:402
 #, c-format
 msgid "average"
 msgstr "keskmine"
 
-#: standalone/net_monitor:406
+#: standalone/net_monitor:405
 #, c-format
 msgid "Local measure"
 msgstr "Kohalikud andmed"
 
-#: standalone/net_monitor:464
+#: standalone/net_monitor:466
 #, c-format
 msgid ""
 "Warning, another internet connection has been detected, maybe using your "
 "network"
 msgstr ""
-"Hoiatus, avastati veel üks Internetiühendus, mis võib-olla kasutab Teie võrku"
+"Hoiatus, leiti veel üks Internetiühendus, mis võib-olla kasutab Teie võrku"
 
-#: standalone/net_monitor:475
+#: standalone/net_monitor:477
 #, c-format
 msgid "No internet connection configured"
 msgstr "Internetiühendus pole seadistatud"
 
-#: standalone/printerdrake:69
-#, c-format
-msgid "Loading printer configuration... Please wait"
-msgstr "Printeri seadistuste laadimine... Palun oodake"
-
-#: standalone/printerdrake:85
+#: standalone/printerdrake:68
 #, c-format
 msgid "Reading data of installed printers..."
 msgstr "Paigaldatud printerite andmete lugemine..."
 
-#: standalone/printerdrake:134
+#: standalone/printerdrake:116
 #, c-format
 msgid "%s Printer Management Tool"
 msgstr "%s printerihaldur"
 
-#: standalone/printerdrake:148 standalone/printerdrake:149
-#: standalone/printerdrake:150 standalone/printerdrake:151
-#: standalone/printerdrake:159 standalone/printerdrake:160
-#: standalone/printerdrake:164
+#: standalone/printerdrake:130 standalone/printerdrake:131
+#: standalone/printerdrake:132 standalone/printerdrake:133
+#: standalone/printerdrake:141 standalone/printerdrake:142
+#: standalone/printerdrake:146
 #, c-format
 msgid "/_Actions"
 msgstr "/_Toimingud"
 
-#: standalone/printerdrake:148 standalone/printerdrake:160
+#: standalone/printerdrake:130 standalone/printerdrake:142
 #, c-format
 msgid "/_Add Printer"
 msgstr "/Lis_a printer"
 
-#: standalone/printerdrake:149
+#: standalone/printerdrake:131
 #, c-format
 msgid "/Set as _Default"
 msgstr "/Määra _vaikeprinteriks"
 
-#: standalone/printerdrake:150
+#: standalone/printerdrake:132
 #, c-format
 msgid "/_Edit"
 msgstr "/_Muuda"
 
-#: standalone/printerdrake:151
+#: standalone/printerdrake:133
 #, c-format
 msgid "/_Delete"
 msgstr "/_Kustuta"
 
-#: standalone/printerdrake:152
+#: standalone/printerdrake:134
 #, c-format
 msgid "/_Expert mode"
-msgstr "/_Ekspertresiim"
+msgstr "/_Ekspertrežiim"
 
-#: standalone/printerdrake:157
+#: standalone/printerdrake:139
 #, c-format
 msgid "/_Refresh"
 msgstr "/Vä_rskenda"
 
-#: standalone/printerdrake:164
+#: standalone/printerdrake:146
 #, c-format
 msgid "/_Configure CUPS"
 msgstr "/Seadista _CUPS"
 
-#: standalone/printerdrake:197
+#: standalone/printerdrake:181
 #, c-format
 msgid "Search:"
 msgstr "Otsi:"
 
-#: standalone/printerdrake:200
+#: standalone/printerdrake:184
 #, c-format
 msgid "Apply filter"
 msgstr "Rakenda filter"
 
-#: standalone/printerdrake:218 standalone/printerdrake:225
+#: standalone/printerdrake:211 standalone/printerdrake:218
 #, c-format
 msgid "Def."
 msgstr "Vaik."
 
-#: standalone/printerdrake:218 standalone/printerdrake:225
+#: standalone/printerdrake:211 standalone/printerdrake:218
 #, c-format
 msgid "Printer Name"
 msgstr "Printeri nimi"
 
-#: standalone/printerdrake:218
+#: standalone/printerdrake:211
 #, c-format
 msgid "Connection Type"
 msgstr "Ühenduse tüüp"
 
-#: standalone/printerdrake:225
+#: standalone/printerdrake:218
 #, c-format
 msgid "Server Name"
 msgstr "Serveri nimi"
 
 #. -PO: "Add Printer" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:233
+#: standalone/printerdrake:226
 #, c-format
 msgid "Add Printer"
 msgstr "Lisa printer"
 
-#: standalone/printerdrake:233
+#: standalone/printerdrake:226
 #, c-format
 msgid "Add a new printer to the system"
 msgstr "Lisa uus printer süsteemi"
 
 #. -PO: "Set as default" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:236
+#: standalone/printerdrake:229
 #, c-format
 msgid "Set as default"
 msgstr "Määra vaikeprinteriks"
 
-#: standalone/printerdrake:236
+#: standalone/printerdrake:229
 #, c-format
 msgid "Set selected printer as the default printer"
 msgstr "Määra valitud printer vaikeprinteriks"
 
-#: standalone/printerdrake:239
+#: standalone/printerdrake:232
 #, c-format
 msgid "Edit selected printer"
 msgstr "Valitud printeri muutmine"
 
-#: standalone/printerdrake:242
+#: standalone/printerdrake:235
 #, c-format
 msgid "Delete selected printer"
 msgstr "Kustuta valitud printer"
 
-#: standalone/printerdrake:245
+#: standalone/printerdrake:238
 #, c-format
 msgid "Refresh the list"
 msgstr "Värskendab nimekirja"
 
 #. -PO: "Configure CUPS" is a button text and the translation has to be AS SHORT AS POSSIBLE
-#: standalone/printerdrake:248
+#: standalone/printerdrake:241
 #, c-format
 msgid "Configure CUPS"
-msgstr "CUPSi seadistamine"
+msgstr "CUPS-i seadistamine"
 
-#: standalone/printerdrake:248
+#: standalone/printerdrake:241
 #, c-format
 msgid "Configure CUPS printing system"
 msgstr "Trükkimissüsteemi CUPS seadistamine"
 
-#: standalone/printerdrake:309 standalone/printerdrake:347
+#: standalone/printerdrake:299 standalone/printerdrake:337
 #, c-format
 msgid "Enabled"
 msgstr "Lubatud"
 
-#: standalone/printerdrake:310 standalone/printerdrake:348
+#: standalone/printerdrake:300 standalone/printerdrake:338
 #, c-format
 msgid "Disabled"
 msgstr "Keelatud"
 
-#: standalone/printerdrake:572
+#: standalone/printerdrake:560
 #, c-format
 msgid "Authors: "
 msgstr "Autorid: "
 
-#: standalone/printerdrake:578
+#. -PO: here %s is the version number
+#: standalone/printerdrake:570
 #, c-format
-msgid "Printer Management \n"
-msgstr "Printerite haldamine \n"
+msgid "Printer Management %s"
+msgstr "Printerite haldur %s"
 
 #: standalone/scannerdrake:51
 #, c-format
@@ -25052,22 +25685,22 @@ msgstr ""
 msgid "Scannerdrake will not be started now."
 msgstr "Scannerdraket praegu ei käivitata."
 
-#: standalone/scannerdrake:67 standalone/scannerdrake:460
+#: standalone/scannerdrake:67 standalone/scannerdrake:491
 #, c-format
 msgid "Searching for configured scanners..."
 msgstr "Seadistatud skännerite otsimine..."
 
-#: standalone/scannerdrake:71 standalone/scannerdrake:464
+#: standalone/scannerdrake:71 standalone/scannerdrake:495
 #, c-format
 msgid "Searching for new scanners..."
 msgstr "Uute skännerite otsimine..."
 
-#: standalone/scannerdrake:79 standalone/scannerdrake:486
+#: standalone/scannerdrake:79 standalone/scannerdrake:517
 #, c-format
 msgid "Re-generating list of configured scanners..."
-msgstr "Seadistatud skännerite loendi taasloomine..."
+msgstr "Seadistatud skännerite nimekirja taasloomine..."
 
-#: standalone/scannerdrake:101 standalone/scannerdrake:142
+#: standalone/scannerdrake:101
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "%s praegusel versioonil puudub %s tugi."
@@ -25102,24 +25735,34 @@ msgstr "Tuvastati mudel: %s"
 msgid "Port: %s"
 msgstr "Port: %s"
 
-#: standalone/scannerdrake:165 standalone/scannerdrake:179
+#: standalone/scannerdrake:138 standalone/scannerdrake:141
+#, c-format
+msgid " (UNSUPPORTED)"
+msgstr " (TOETAMATA)"
+
+#: standalone/scannerdrake:144
+#, c-format
+msgid "The %s is not supported under Linux."
+msgstr "%s ei ole Linuxis toetatud."
+
+#: standalone/scannerdrake:171 standalone/scannerdrake:185
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Püsivarafaili ei paigaldata"
 
-#: standalone/scannerdrake:169 standalone/scannerdrake:221
+#: standalone/scannerdrake:175 standalone/scannerdrake:227
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr "On võimalik, et Teie %s vajab püsivara laadimist igal käivitamisel."
 
-#: standalone/scannerdrake:170 standalone/scannerdrake:222
+#: standalone/scannerdrake:176 standalone/scannerdrake:228
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr "Sellisel juhul võite lasta selle automaatselt ära teha."
 
-#: standalone/scannerdrake:171 standalone/scannerdrake:225
+#: standalone/scannerdrake:177 standalone/scannerdrake:231
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
@@ -25127,7 +25770,7 @@ msgid ""
 msgstr ""
 "Selleks tuleb anda skännerile vajalik püsivarafail, mis siis paigaldatakse."
 
-#: standalone/scannerdrake:172 standalone/scannerdrake:226
+#: standalone/scannerdrake:178 standalone/scannerdrake:232
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
@@ -25136,22 +25779,22 @@ msgstr ""
 "Faili leiab skänneriga kaasas olnud CD-lt või disketilt, tootja "
 "koduleheküljelt või Windowsi partitsioonilt."
 
-#: standalone/scannerdrake:174 standalone/scannerdrake:233
+#: standalone/scannerdrake:180 standalone/scannerdrake:239
 #, c-format
 msgid "Install firmware file from"
 msgstr "Püsivarafaili paigaldamine asukohast"
 
-#: standalone/scannerdrake:194
+#: standalone/scannerdrake:200
 #, c-format
 msgid "Select firmware file"
 msgstr "Valige püsivarafail"
 
-#: standalone/scannerdrake:197 standalone/scannerdrake:256
+#: standalone/scannerdrake:203 standalone/scannerdrake:262
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr "Püsivarafaili %s ei ole olemas või ei ole see loetav!"
 
-#: standalone/scannerdrake:220
+#: standalone/scannerdrake:226
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -25159,7 +25802,7 @@ msgid ""
 msgstr ""
 "On võimalik, et Teie skännerid vajavad püsivara laadimist igal käivitamisel."
 
-#: standalone/scannerdrake:224
+#: standalone/scannerdrake:230
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
@@ -25168,7 +25811,7 @@ msgstr ""
 "Selleks tuleb määrata skännerile vajalik püsivarafail, mis siis "
 "paigaldatakse."
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -25177,32 +25820,32 @@ msgstr ""
 "Kui olete juba skänneri püsivara paigaldanud, võite seda uuendada, määrates "
 "siin uue püsivarafaili."
 
-#: standalone/scannerdrake:229
+#: standalone/scannerdrake:235
 #, c-format
 msgid "Install firmware for the"
 msgstr "Püsivarafaili paigaldamine seadmele"
 
-#: standalone/scannerdrake:252
+#: standalone/scannerdrake:258
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Valige %s jaoks püsivarafail"
 
-#: standalone/scannerdrake:270
+#: standalone/scannerdrake:276
 #, c-format
 msgid "Could not install the firmware file for the %s!"
 msgstr "%s püsivarafaili ei õnnestunud paigaldada!"
 
-#: standalone/scannerdrake:283
+#: standalone/scannerdrake:289
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Teie %s püsivarafail paigaldati edukalt."
 
-#: standalone/scannerdrake:293
+#: standalone/scannerdrake:299
 #, c-format
 msgid "The %s is unsupported"
 msgstr "Sel %s skänneril puudub tugi"
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -25211,33 +25854,98 @@ msgstr ""
 "See %s skänner tuleb seadistada printerdrake abil.\n"
 "Printerdrake saab käivitada %s juhtimiskeskuse riistvara sektsioonist."
 
-#: standalone/scannerdrake:302 standalone/scannerdrake:309
-#: standalone/scannerdrake:339
+#: standalone/scannerdrake:308 standalone/scannerdrake:315
+#: standalone/scannerdrake:345
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "Kättesaadavate portide automaattuvastus"
 
-#: standalone/scannerdrake:304 standalone/scannerdrake:350
+#: standalone/scannerdrake:310 standalone/scannerdrake:356
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Valige palun seade, kuhu %s on ühendatud"
 
-#: standalone/scannerdrake:305
+#: standalone/scannerdrake:311
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Märkus: paralleelporte ei tuvastata)"
 
-#: standalone/scannerdrake:307 standalone/scannerdrake:352
+#: standalone/scannerdrake:313 standalone/scannerdrake:358
 #, c-format
 msgid "choose device"
 msgstr "valige seade"
 
-#: standalone/scannerdrake:341
+#: standalone/scannerdrake:347
 #, c-format
 msgid "Searching for scanners..."
 msgstr "Skännerite otsimine..."
 
-#: standalone/scannerdrake:376
+#: standalone/scannerdrake:383
+#, c-format
+msgid "Setting up kernel modules..."
+msgstr "Kerneli moodulite häälestamine..."
+
+#: standalone/scannerdrake:390 standalone/scannerdrake:397
+#, c-format
+msgid "Attention!"
+msgstr "Tähelepanu!"
+
+#: standalone/scannerdrake:391
+#, c-format
+msgid ""
+"Your %s cannot be configured fully automatically.\n"
+"\n"
+"Manual adjustments are required. Please edit the configuration file /etc/"
+"sane.d/%s.conf. "
+msgstr ""
+"Teie %s täisautomaatne seadistamine ei ole võimalik.\n"
+"\n"
+"Üht-teist tuleb käsitsi kohendada. Palun redigeerige selleks "
+"konfiguratsioonifaili /etc/sane.d/%s.conf. "
+
+#: standalone/scannerdrake:392 standalone/scannerdrake:401
+#, c-format
+msgid ""
+"More info in the driver's manual page. Run the command \"man sane-%s\" to "
+"read it."
+msgstr ""
+"Rohkem infot leiab draiveri manuaalileheküljelt. Selle lugemiseks andke "
+"käsureal käsk \"man sane-%s\"."
+
+#: standalone/scannerdrake:394 standalone/scannerdrake:403
+#, c-format
+msgid ""
+"After that you may scan documents using \"XSane\" or \"Kooka\" from "
+"Multimedia/Graphics in the applications menu."
+msgstr ""
+"Pärast seda võite skaneerida dokumente, kasutades selleks rakendust \"XSane"
+"\" või \"Kooka\", mille leiate rakenduste menüüs rubriigist Multimeedia/"
+"Graafika."
+
+#: standalone/scannerdrake:398
+#, c-format
+msgid ""
+"Your %s has been configured, but it is possible that additional manual "
+"adjustments are needed to get it to work. "
+msgstr ""
+"Teie %s on seadistatud, kuid on täiesti võimalik, et korrektseks töötamiseks "
+"tuleb seda veel täiendavalt käsitsi seadistada. "
+
+#: standalone/scannerdrake:399
+#, c-format
+msgid ""
+"If it does not appear in the list of configured scanners in the main window "
+"of Scannerdrake or if it does not work correctly, "
+msgstr ""
+"Kui Te ei näe seda Scannerdrake'i peaaknas seadistatud skännerite hulgas või "
+"kui see ei tööta korrektselt, "
+
+#: standalone/scannerdrake:400
+#, c-format
+msgid "edit the configuration file /etc/sane.d/%s.conf. "
+msgstr "redigeerige konfiguratsioonifaili /etc/sane.d/%s.conf. "
+
+#: standalone/scannerdrake:406
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
@@ -25248,7 +25956,7 @@ msgstr ""
 "Nüüd võite skaneerida dokumente, kasutades selleks rakendust \"XSane\" või "
 "\"Kooka\", mille leiate rakenduste menüüs rubriigist Multimeedia/Graafika."
 
-#: standalone/scannerdrake:400
+#: standalone/scannerdrake:431
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -25261,7 +25969,7 @@ msgstr ""
 "%s\n"
 "skännerid.\n"
 
-#: standalone/scannerdrake:401
+#: standalone/scannerdrake:432
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -25274,42 +25982,42 @@ msgstr ""
 "%s\n"
 "skänner.\n"
 
-#: standalone/scannerdrake:404 standalone/scannerdrake:407
+#: standalone/scannerdrake:435 standalone/scannerdrake:438
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr "Ei leitud ühtegi skännerit, mida süsteem saaks kasutada.\n"
 
-#: standalone/scannerdrake:421
+#: standalone/scannerdrake:452
 #, c-format
 msgid "Search for new scanners"
 msgstr "Uute skännerite otsimine..."
 
-#: standalone/scannerdrake:427
+#: standalone/scannerdrake:458
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Skänneri lisamine käsitsi"
 
-#: standalone/scannerdrake:434
+#: standalone/scannerdrake:465
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Püsivarafailide paigaldamine/uuendamine"
 
-#: standalone/scannerdrake:440
+#: standalone/scannerdrake:471
 #, c-format
 msgid "Scanner sharing"
 msgstr "Skänneri jagamine"
 
-#: standalone/scannerdrake:499 standalone/scannerdrake:664
+#: standalone/scannerdrake:530 standalone/scannerdrake:695
 #, c-format
 msgid "All remote machines"
-msgstr "Kõik kaugmasinad"
+msgstr "Kõik võrgumasinad"
 
-#: standalone/scannerdrake:511 standalone/scannerdrake:814
+#: standalone/scannerdrake:542 standalone/scannerdrake:845
 #, c-format
 msgid "This machine"
 msgstr "See masin"
 
-#: standalone/scannerdrake:551
+#: standalone/scannerdrake:582
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
@@ -25317,9 +26025,9 @@ msgid ""
 msgstr ""
 "Siin saate valida, millised selle arvuti külge kinnitatud skännerid peaksid "
 "olema kättesaadavad ka teistele kohtvõrgu arvutitele ja millistele nende "
-"hulgast."
+"hulgast. "
 
-#: standalone/scannerdrake:552
+#: standalone/scannerdrake:583
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -25328,33 +26036,33 @@ msgstr ""
 "Samuti saate otsustada, kas võrguskännerid peaksid olema automaatselt siin "
 "arvutis kättesaadavad"
 
-#: standalone/scannerdrake:555
+#: standalone/scannerdrake:586
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Selle arvuti külge ühendatud skännerid on teistele kättesaadavad"
 
-#: standalone/scannerdrake:557
+#: standalone/scannerdrake:588
 #, c-format
 msgid "Scanner sharing to hosts: "
-msgstr "Skänneri jagamine masinatele:"
+msgstr "Skänneri jagamine masinatele: "
 
-#: standalone/scannerdrake:571
+#: standalone/scannerdrake:602
 #, c-format
 msgid "Use scanners on remote computers"
-msgstr "Skännerite kasutamine kaugmasinatel"
+msgstr "Skännerite kasutamine võrgumasinatel"
 
-#: standalone/scannerdrake:574
+#: standalone/scannerdrake:605
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Skännerite kasutamine masinatel:"
 
-#: standalone/scannerdrake:601 standalone/scannerdrake:673
-#: standalone/scannerdrake:823
+#: standalone/scannerdrake:632 standalone/scannerdrake:704
+#: standalone/scannerdrake:854
 #, c-format
 msgid "Sharing of local scanners"
 msgstr "Skännerite jagamine"
 
-#: standalone/scannerdrake:602
+#: standalone/scannerdrake:633
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -25363,56 +26071,56 @@ msgstr ""
 "Nende masinate jaoks on selle arvuti küljes olevad skännerid kättesaadavaks  "
 "tehtud:"
 
-#: standalone/scannerdrake:613 standalone/scannerdrake:763
+#: standalone/scannerdrake:644 standalone/scannerdrake:794
 #, c-format
 msgid "Add host"
 msgstr "Lisa masin"
 
-#: standalone/scannerdrake:619 standalone/scannerdrake:769
+#: standalone/scannerdrake:650 standalone/scannerdrake:800
 #, c-format
 msgid "Edit selected host"
 msgstr "Muuda valitud masinat"
 
-#: standalone/scannerdrake:628 standalone/scannerdrake:778
+#: standalone/scannerdrake:659 standalone/scannerdrake:809
 #, c-format
 msgid "Remove selected host"
 msgstr "Eemalda valitud masin"
 
-#: standalone/scannerdrake:652 standalone/scannerdrake:660
-#: standalone/scannerdrake:665 standalone/scannerdrake:711
-#: standalone/scannerdrake:802 standalone/scannerdrake:810
-#: standalone/scannerdrake:815 standalone/scannerdrake:861
+#: standalone/scannerdrake:683 standalone/scannerdrake:691
+#: standalone/scannerdrake:696 standalone/scannerdrake:742
+#: standalone/scannerdrake:833 standalone/scannerdrake:841
+#: standalone/scannerdrake:846 standalone/scannerdrake:892
 #, c-format
 msgid "Name/IP address of host:"
-msgstr "Masina nimi/IP aadress:"
+msgstr "Masina nimi/IP-aadress:"
 
-#: standalone/scannerdrake:674 standalone/scannerdrake:824
+#: standalone/scannerdrake:705 standalone/scannerdrake:855
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 "Valige palun masin, mille jaoks soovite siinseid skännereid välja jagada:"
 
-#: standalone/scannerdrake:685 standalone/scannerdrake:835
+#: standalone/scannerdrake:716 standalone/scannerdrake:866
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
-msgstr "Sisestage palun masinanimi või IP aadress.\n"
+msgstr "Sisestage palun masinanimi või IP-aadress.\n"
 
-#: standalone/scannerdrake:696 standalone/scannerdrake:846
+#: standalone/scannerdrake:727 standalone/scannerdrake:877
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr "See masin on juba nimekirjas ja seda ei ole võimalik uuesti lisada.\n"
 
-#: standalone/scannerdrake:751
+#: standalone/scannerdrake:782
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Võrguskänneri kasutamine"
 
-#: standalone/scannerdrake:752
+#: standalone/scannerdrake:783
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Nende masinate skännereid saab selle arvutiga kasutada:"
 
-#: standalone/scannerdrake:909
+#: standalone/scannerdrake:940
 #, c-format
 msgid ""
 "saned needs to be installed to share the local scanner(s).\n"
@@ -25423,7 +26131,7 @@ msgstr ""
 "\n"
 "Kas soovite seda nüüd teha?"
 
-#: standalone/scannerdrake:913 standalone/scannerdrake:917
+#: standalone/scannerdrake:944 standalone/scannerdrake:948
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Teie skänner(id) ei ole võrgus kättesaadavad."
@@ -25448,7 +26156,7 @@ msgstr "Mõned seadmed lisati: %s\n"
 msgid "- %s was added\n"
 msgstr "- %s lisati\n"
 
-#: standalone/service_harddrake:199
+#: standalone/service_harddrake:204
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Riistvara tuvastamine..."
@@ -25476,7 +26184,7 @@ msgstr "Litsents"
 #: steps.pm:16
 #, c-format
 msgid "Configure mouse"
-msgstr "Hiire seadmine"
+msgstr "Hiire seadistamine"
 
 #: steps.pm:17
 #, c-format
@@ -25486,7 +26194,7 @@ msgstr "Kõvaketta leidmine"
 #: steps.pm:18
 #, c-format
 msgid "Select installation class"
-msgstr "Paigaldusmeetodi valik"
+msgstr "Paigaldamismeetodi valik"
 
 #: steps.pm:19
 #, c-format
@@ -25511,12 +26219,12 @@ msgstr "Pakettide valik"
 #: steps.pm:24
 #, c-format
 msgid "Install system"
-msgstr "Süsteemi paigaldus"
+msgstr "Süsteemi paigaldamine"
 
 #: steps.pm:25
 #, c-format
-msgid "Root password"
-msgstr "Administraatori salasõna"
+msgid "Administrator password"
+msgstr "Administraatori parool"
 
 #: steps.pm:26
 #, c-format
@@ -25531,44 +26239,69 @@ msgstr "Võrgu seadistamine"
 #: steps.pm:28
 #, c-format
 msgid "Install bootloader"
-msgstr "Alglaaduri seadistused"
+msgstr "Alglaaduri paigaldamine"
 
 #: steps.pm:29
 #, c-format
 msgid "Configure X"
-msgstr "X-i seadistamine"
+msgstr "X'i seadistamine"
 
 #: steps.pm:31
 #, c-format
 msgid "Configure services"
-msgstr "Teenuste seadistused"
+msgstr "Teenuste seadistamine"
 
 #: steps.pm:32
 #, c-format
 msgid "Install updates"
-msgstr "Uuenduste paigaldus"
+msgstr "Uuenduste paigaldamine"
 
 #: steps.pm:33
 #, c-format
 msgid "Exit install"
 msgstr "Programmist väljumine"
 
-#: ugtk2.pm:1122
+#: ugtk2.pm:900
 #, c-format
 msgid "Is this correct?"
 msgstr "Kas see on sobiv?"
 
-#: ugtk2.pm:1250
+#: ugtk2.pm:960
+#, c-format
+msgid "No file chosen"
+msgstr "Ühtegi faili pole valitud"
+
+#: ugtk2.pm:962
+#, c-format
+msgid "You have chosen a file, not a directory"
+msgstr "Valisite faili, mitte kataloogi"
+
+#: ugtk2.pm:964
+#, c-format
+msgid "You have chosen a directory, not a file"
+msgstr "Valisite kataloogi, mitte faili"
+
+#: ugtk2.pm:966
+#, c-format
+msgid "No such directory"
+msgstr "Sellist kataloogi pole"
+
+#: ugtk2.pm:966
+#, c-format
+msgid "No such file"
+msgstr "Sellist faili pole"
+
+#: ugtk2.pm:1045
 #, c-format
 msgid "Expand Tree"
 msgstr "Ava puu"
 
-#: ugtk2.pm:1251
+#: ugtk2.pm:1046
 #, c-format
 msgid "Collapse Tree"
 msgstr "Sulge puu"
 
-#: ugtk2.pm:1252
+#: ugtk2.pm:1047
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Sorteeritud või sorteerimata"
@@ -25580,573 +26313,9 @@ msgid ""
 "Click \"Next\" to install or \"Cancel\" to quit"
 msgstr ""
 "%s ei ole paigaldatud\n"
-"Klõpsake paigaldamiseks \"Järgmine\" või väljumiseks \"Loobu\""
+"Klõpsake paigaldamiseks \"Edasi\" või väljumiseks \"Loobu\""
 
 #: wizards.pm:99
 #, c-format
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus!"
-
-#~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\n"
-#~ msgstr ""
-#~ "UPS-i seadistamise vahend.\n"
-#~ "\n"
-#~ "Siin saab lisada süsteemi uue UPS-i.\n"
-
-#~ msgid ""
-#~ "The FAT resizer is unable to handle your partition, \n"
-#~ "the following error occured: %s"
-#~ msgstr ""
-#~ "FAT-partitsiooni suurust ei õnnestunud muuta, \n"
-#~ "ilmnes selline viga: %s"
-
-#~ msgid ""
-#~ "The most common way to connect with adsl is pppoe.\n"
-#~ "Some connections use pptp, a few use dhcp.\n"
-#~ "If you don't know, choose 'use pppoe'"
-#~ msgstr ""
-#~ "Kõige tavalisem ühendusviis ADSL jaoks on pppoe.\n"
-#~ "Mõnel juhul aga kasutatakse pptp-d, harva dhcp-d.\n"
-#~ "Kui Te ei tea, kasutage pppoe-d"
-
-#~ msgid ""
-#~ "The HP LaserJet 1000 needs its firmware to be uploaded after being turned "
-#~ "on. Download the Windows driver package from the HP web site (the "
-#~ "firmware on the printer's CD does not work) and extract the firmware file "
-#~ "from it by uncompresing the self-extracting '.exe' file with the 'unzip' "
-#~ "utility and searching for the 'sihp1000.img' file. Copy this file into "
-#~ "the '/etc/printer' directory. There it will be found by the automatic "
-#~ "uploader script and uploaded whenever the printer is connected and turned "
-#~ "on.\n"
-#~ msgstr ""
-#~ "HP LaserJet 1000 vajab pärast sisselülitamist püsivara laadimist. Laadige "
-#~ "HP veebileheküljelt alla Windowsi draiveripakett (püsivara printeri CD-l "
-#~ "ei toimi) ning pakkige püsivarafail lahti, kasutades 'unzip' utiliiti "
-#~ "ning otsides faili 'sihp1000.img'. Kopeerige fail kataloogi '/etc/"
-#~ "printer'. Seal suudab automaatne laadimisskript selle üles leida ja "
-#~ "laadida iga kord, kui printer on ühendatud ja sisse lülitatud.\n"
-
-#~ msgid ""
-#~ "Turning on this allows to print plain text files in japanese language. "
-#~ "Only use this function if you really want to print text in japanese, if "
-#~ "it is activated you cannot print accentuated characters in latin fonts "
-#~ "any more and you will not be able to adjust the margins, the character "
-#~ "size, etc. This setting only affects printers defined on this machine. If "
-#~ "you want to print japanese text on a printer set up on a remote machine, "
-#~ "you have to activate this function on that remote machine."
-#~ msgstr ""
-#~ "Selle lubamine võimaldab trükkida jaapanikeelseid tekstifaile. Kasutage "
-#~ "seda ainult siis, kui soovite tõesti jaapanikeelseid tekste trükkida, "
-#~ "sest kui see on sisse lülitatud, ei ole enam võimalik trükkida ladina "
-#~ "tähestiku diakriitiliste märkidega tähti ega kohandada veeriseid, "
-#~ "märgisuurust jne. See puudutab ainult käesoleva masinaga ühendatud "
-#~ "printereid. Kui soovite trükkida jaapanikeelset teksti võrgus asuva "
-#~ "masinaga ühendatud printeril, tuleb see funktsioon tollel masinal sisse "
-#~ "lülitada."
-
-#~ msgid ""
-#~ "\n"
-#~ "Font Importation and monitoring application\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ "--windows_import : import from all available windows partitions.\n"
-#~ "--xls_fonts      : show all fonts that already exist from xls\n"
-#~ "--install        : accept any font file and any directry.\n"
-#~ "--uninstall      : uninstall any font or any directory of font.\n"
-#~ "--replace        : replace all font if already exist\n"
-#~ "--application    : 0 none application.\n"
-#~ "                 : 1 all application available supported.\n"
-#~ "                 : name_of_application like  so for staroffice \n"
-#~ "                 : and gs for ghostscript for only this one."
-#~ msgstr ""
-#~ "\n"
-#~ "Fontide importimise ja jälgimise rakendus\n"
-#~ "\n"
-#~ "--windows_import : impordib kõigilt saadaolevailt windowsi "
-#~ "partitsioonidelt.\n"
-#~ "--xls_fonts      : näitab kõiki fonte, mis on juba saadud xls-ist.\n"
-#~ "--strong         : fontide tugev verifitseerimine.\n"
-#~ "--install        : paigaldab iga fondifaili ja kataloogi.\n"
-#~ "--uninstall      : eemaldab iga fondi või fondikataloogi.\n"
-#~ "--replace        : asendab kõik fondid, kui on juba olemas.\n"
-#~ "--application    : 0 mitte ükski rakendus.\n"
-#~ "                 : 1 iga toetatud ja saadaolev rakendus.\n"
-#~ "                 : rakenduse_nimi, näiteks so StarOffice'i \n"
-#~ "                 : ja gs GhostScripti puhul."
-
-#~ msgid ""
-#~ "\n"
-#~ " This wizard routine will:\n"
-#~ " \t1) Ask you to select either 'thin' or 'fat' clients.\n"
-#~ "\t2) Setup dhcp.\n"
-#~ "\t\n"
-#~ "After doing these steps, the wizard will:\n"
-#~ "\t\n"
-#~ "    a) Make all "
-#~ "nbis.                                                                \n"
-#~ "    b) Activate the "
-#~ "server.                                                          \n"
-#~ "    c) Start the "
-#~ "server.                                                     \n"
-#~ "    d) Synchronize the shadow files so that all users, including root, \n"
-#~ "       are added to the shadow$$CLIENT$$ "
-#~ "file.                                              \n"
-#~ "    e) Ask you to make a boot floppy.\n"
-#~ "    f) If it's thin clients, ask if you want to restart KDM.\n"
-#~ msgstr ""
-#~ "\n"
-#~ " See nõustaja:\n"
-#~ " \t1) Palub valida 'õhukese' või 'paksu' kliendi.\n"
-#~ " \t2) Seadistab DHCP.\n"
-#~ "\t\n"
-#~ "Pärast neid samme nõustaja:\n"
-#~ "\t\n"
-#~ "    a) Loob kõik "
-#~ "võrgulaadepildid.                                                                \n"
-#~ "    b) Aktiverib "
-#~ "serveri.                                                          \n"
-#~ "    c) Käivitab "
-#~ "serveri.                                                     \n"
-#~ "    d) Sünkroniseerib varifailid, mis lisab kõik kasutajad, sealhugas \n"
-#~ "       administraatori faili shadow$$CLIENT$"
-#~ "$.                                              \n"
-#~ "    e) Palub Teil luua algkäivitusdisketi.\n"
-#~ "    f) Kui tegemist on õhukese kliendiga, küsib, kas soovite taaskävitada "
-#~ "KDM-i.\n"
-
-#~ msgid ""
-#~ "        While you can use a pool of IP addresses, rather than setup a "
-#~ "specific entry for\n"
-#~ "        a client machine, using a fixed address scheme facilitates using "
-#~ "the functionality\n"
-#~ "        of client-specific configuration files that ClusterNFS provides.\n"
-#~ "\t\t\t\n"
-#~ "        Note: The '#type' entry is only used by drakTermServ.  Clients "
-#~ "can either be 'thin'\n"
-#~ "        or 'fat'.  Thin clients run most software on the server via "
-#~ "xdmcp, while fat clients run \n"
-#~ "        most software on the client machine. A special inittab, %s is\n"
-#~ "        written for thin clients. System config files xdm-config, kdmrc, "
-#~ "and gdm.conf are \n"
-#~ "        modified if thin clients are used, to enable xdmcp. Since there "
-#~ "are security issues in \n"
-#~ "        using xdmcp, hosts.deny and hosts.allow are modified to limit "
-#~ "access to the local\n"
-#~ "        subnet.\n"
-#~ "\t\t\t\n"
-#~ "        Note: The '#hdw_config' entry is also only used by drakTermServ.  "
-#~ "Clients can either \n"
-#~ "        be 'true' or 'false'.  'true' enables root login at the client "
-#~ "machine and allows local \n"
-#~ "        hardware configuration of sound, mouse, and X, using the 'drak' "
-#~ "tools. This is enabled \n"
-#~ "        by creating separate config files associated with the client's IP "
-#~ "address and creating \n"
-#~ "        read/write mount points to allow the client to alter the file. "
-#~ "Once you are satisfied \n"
-#~ "        with the configuration, you can remove root login privileges from "
-#~ "the client.\n"
-#~ "\t\t\t\n"
-#~ "        Note: You must stop/start the server after adding or changing "
-#~ "clients."
-#~ msgstr ""
-#~ "\t\t\tKuigi võib kasutada ka IP aadresside valimikku, selle asemel et "
-#~ "määrata igale\n"
-#~ "\t\t\tkliendi masinale eraldi kirje, võimaldab fikseeritud aadress "
-#~ "kasutamine siiski\n"
-#~ "\t\t\tpruukida ClusterNFS pakutavaid kliendikeskseid seadistustefaile.\n"
-#~ "\t\t\t\n"
-#~ "\t\t\tMärkus: kirjet \"#type\" kasutab ainult drakTermServ.  Kliendid "
-#~ "võivad olla \n"
-#~ "\t\t\tkas \"thin\" või 'fat'.  \"Õhuke\" klient kasutab enamikku tarkvara "
-#~ "serveril xdmcp\n"
-#~ "\t\t\tvahendusel, \"paksud\" kliendid aga jooksutavad takrvara enamasti "
-#~ "kliendi\n"
-#~ "\t\t\tmasinal. Õhukeste klientide jaoks kirjutatakse eraldi inittab-fail\n"
-#~ "\t\t\t%s. Õhukeste klientide puhul muudetakse xdmcp\n"
-#~ "\t\t\tvõimaldamiseks süsteemi seadetefaile xdm-config, kdmrc ja gdm.conf. "
-#~ "Kuivõrd\n"
-#~ "\t\t\txdmcp kasutamisega kaasnevad teatud turvaprobleemid, muudetakse "
-#~ "faile\n"
-#~ "\t\t\thosts.deny ja hosts.allow, et piirata ligipääsu kohalikule "
-#~ "alamvõrgule.\n"
-#~ "\t\t\t\n"
-#~ "\t\t\tNote: Ka kirjet \"#hdw_config\" kasutab ainult drakTermServ.  "
-#~ "Kliendid võivad olla kas \n"
-#~ "\t\t\tkas 'true' või 'false'.  'true' lubab administraatori sisselogimist "
-#~ "kliendi masinal ning \n"
-#~ "\t\t\theli, hiire ja X-i riistvara kohalikku seadistamist 'drak' "
-#~ "vahenditega. See saab võimalikuks \n"
-#~ "\t\t\teraldi seadistustefailide loomisega, mis on seotud kliendi IP "
-#~ "aadressiga, samuti \n"
-#~ "\t\t\tkirjutamis/lugemisõigusega haakepunktide loomisega, mis lubab "
-#~ "kliendil faili muuta. \n"
-#~ "\t\t\tKui jääte seadistusega rahule, võite administraatori privileegid "
-#~ "kliendilt ära võtta.\n"
-#~ "\t\t\t\n"
-#~ "\t\t\tMärkus: server tuleb peatada/käivitada pärast kliendi lisamist või "
-#~ "muutmist."
-
-#~ msgid ""
-#~ "        - /etc/xinetd.d/tftp:\n"
-#~ "        \tdrakTermServ will configure this file to work in conjunction "
-#~ "with the images created\n"
-#~ "        \tby mkinitrd-net, and the entries in /etc/dhcpd.conf, to serve "
-#~ "up the boot image to \n"
-#~ "        \teach diskless client.\n"
-#~ "\n"
-#~ "        \tA typical tftp configuration file looks like:\n"
-#~ "        \t\t\n"
-#~ "        \tservice tftp\n"
-#~ "\t\t\t{\n"
-#~ "                        disable         = no\n"
-#~ "                        socket_type  = dgram\n"
-#~ "                        protocol        = udp\n"
-#~ "                        wait             = yes\n"
-#~ "                        user             = root\n"
-#~ "                        server          = /usr/sbin/in.tftpd\n"
-#~ "                        server_args  = -s /var/lib/tftpboot\n"
-#~ "        \t}\n"
-#~ "        \t\t\n"
-#~ "        \tThe changes here from the default installation are changing the "
-#~ "disable flag to\n"
-#~ "        \t'no' and changing the directory path to /var/lib/tftpboot, "
-#~ "where mkinitrd-net\n"
-#~ "        \tputs its images."
-#~ msgstr ""
-#~ "        - /etc/xinetd.d/tftp:\n"
-#~ "        \t\tdrakTermServ seadistab selle faili, et see saaks töötada koos "
-#~ "laadepiltidega, mille\n"
-#~ "        \t\ttekitab mkinitrd-net, samuti kirjed failis /etc/dhcpd.conf, "
-#~ "et pakkuda igale kettata\n"
-#~ "        \t\ttööjaamale alglaadimiseks laadepilti.\n"
-#~ "\n"
-#~ "        \t\tTüüpiline tftp seadetefail näeb välja selline:\n"
-#~ "        \t\t\n"
-#~ "        \tservice tftp\n"
-#~ "        \t\t{\n"
-#~ "                        disable         = no\n"
-#~ "                        socket_type  = dgram\n"
-#~ "                        protocol        = udp\n"
-#~ "                        wait             = yes\n"
-#~ "                        user             = root\n"
-#~ "                        server          = /usr/sbin/in.tftpd\n"
-#~ "                        server_args  = -s /var/lib/tftpboot\n"
-#~ "        \t}\n"
-#~ "        \t\t\n"
-#~ "        \t\tSiin tehtud muudatused võrreldes vaikepaigaldusega muudavad "
-#~ "tühistamislipu\n"
-#~ "        \t\tväärtuseks 'no' ning kataloogirajaks muudetakse /var/lib/"
-#~ "tftpboot, kuhu mkinitrd\n"
-#~ "        \t\tsalvestab oma laadepildid."
-
-#~ msgid ""
-#~ "        - Create etherboot floppies/CDs:\n"
-#~ "        \tThe diskless client machines need either ROM images on the NIC, "
-#~ "or a boot floppy\n"
-#~ "        \tor CD to initate the boot sequence.  drakTermServ will help "
-#~ "generate these\n"
-#~ "        \timages, based on the NIC in the client machine.\n"
-#~ "        \t\t\n"
-#~ "        \tA basic example of creating a boot floppy for a 3Com 3c509 "
-#~ "manually:\n"
-#~ "        \t\t\n"
-#~ "        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
-#~ "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
-#~ "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
-#~ msgstr ""
-#~ "        - Etherbooti diskettide/CD-de loomine:\n"
-#~ "        \tKettata tööjaamad vajavad kas ROM-laadepilti võrguliidesel või "
-#~ "alglaadimisdisketti\n"
-#~ "        \tvõi -CD-d alglaadimise käivitamiseks.  drakTermServ aitab neid "
-#~ "laadepilte luua,\n"
-#~ "        \ttuginedes kliendi masina võrguliidesele.\n"
-#~ "        \t\t\n"
-#~ "        \tLihtne näide alglaadimisdisketi loomisest käsitsi 3com 3c509 "
-#~ "jaoks:\n"
-#~ "        \t\t\n"
-#~ "        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
-#~ "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
-#~ "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
-
-#~ msgid ""
-#~ "Expect is an extension to the Tcl scripting language that allows "
-#~ "interactive sessions without user intervention."
-#~ msgstr ""
-#~ "Expect on skriptikeele Tcl laiend, mis võimaldab interaktiivseid seansse "
-#~ "ilma kasutaja sekkumiseta."
-
-#~ msgid "          Successfuly Restored on %s       "
-#~ msgstr "         edukalt taastatud %s -l       "
-
-#~ msgid ""
-#~ "An error occured while deleting the \"%s\" network interface:\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Võrguliidese \"%s\" kustutamisel tekkis viga:\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Congratulations, the \"%s\" network interface has been succesfully deleted"
-#~ msgstr "Õnnitlused: võrguliides \"%s\" on edukalt kustutatud"
-
-#~ msgid "No Ip"
-#~ msgstr "IP puudub"
-
-#~ msgid ""
-#~ "You cannot edit this section.\n"
-#~ "\n"
-#~ "This section is mandatory for Freeswan 2.X.\n"
-#~ "One has to specify version 2.0 on the top\n"
-#~ "of the %s file, and eventually, disable or\n"
-#~ "enable the oportunistic encryption.\n"
-#~ msgstr ""
-#~ "Seda sektsiooni ei saa redigeerida.\n"
-#~ "\n"
-#~ "See sektsioon on Freeswan 2.X jaoks hädavajalik.\n"
-#~ "Versioon 2.0 tuleb määrata faili %s\n"
-#~ "alguses ja seejärel lubada või keelata\n"
-#~ "oportunistlik krüptimine.\n"
-
-#~ msgid ""
-#~ "specifies the identifier sent to the remote host and the\n"
-#~ "type to use in the phase 1 negotiation.  address, fqdn,\n"
-#~ "user_fqdn, keyid and asn1dn can be used as an idtype.\n"
-#~ "they are used like:\n"
-#~ "\tmy_identifier address [address];\n"
-#~ "\t\tthe type is the IP address.  This is the default\n"
-#~ "\t\ttype if you do not specify an identifier to use.\n"
-#~ "\tmy_identifier user_fqdn string;\n"
-#~ "\t\tthe type is a USER_FQDN (user fully-qualified\n"
-#~ "\t\tdomain name).\n"
-#~ "\tmy_identifier fqdn string;\n"
-#~ "\t\tthe type is a FQDN (fully-qualified domain name).\n"
-#~ "\tmy_identifier keyid file;\n"
-#~ "\t\tthe type is a KEY_ID.\n"
-#~ "\tmy_identifier asn1dn [string];\n"
-#~ "\t\tthe type is an ASN.1 distinguished name.  If\n"
-#~ "\t\tstring is omitted, racoon(8) will get DN from\n"
-#~ "\t\tSubject field in the certificate.\n"
-#~ "\n"
-#~ "Examples: \n"
-#~ "\n"
-#~ "my_identifier user_fqdn \"myemail@mydomain.com\""
-#~ msgstr ""
-#~ "määrab faasi 1 läbirääkimistel kaugmasinale saadetava\n"
-#~ "identifikaatori ja kasutatava tübi.  aadress, fqdn,\n"
-#~ "user_fqdn, keyid ja asn1dn on kasutatava ID tüübina.\n"
-#~ "kasutamine on järgmine:\n"
-#~ "\tmy_identifier address [aadress];\n"
-#~ "\t\ttüüp on IP aadress.  See on vaiketüüp,\n"
-#~ "\t\tkui Te ei määra kasutatavat identifikaatorit.\n"
-#~ "\tmy_identifier user_fqdn string;\n"
-#~ "\t\ttüüp on USER_FQDN (kasutaja täielik\n"
-#~ "\t\tdomeeni nimi).\n"
-#~ "\tmy_identifier fqdn string;\n"
-#~ "\t\ttüüp on FQDN (täielik domeeni nimi).\n"
-#~ "\tmy_identifier keyid fail;\n"
-#~ "\t\ttüüp on KEY_ID.\n"
-#~ "\tmy_identifier asn1dn [string];\n"
-#~ "\t\ttüüp on ASN.1 eristatav nimi.  Kui\n"
-#~ "\t\tstring ära jätta, hangib (8) DN\n"
-#~ "\t\tsertifikaadi subjektirealt.\n"
-#~ "\n"
-#~ "Näited : \n"
-#~ "\n"
-#~ "my_identifier user_fqdn \"minuepostiaadress@minudomeen.ee\""
-
-#~ msgid ""
-#~ "specify the encryption algorithm used for the\n"
-#~ "phase 1 negotiation. This directive must be defined. \n"
-#~ "algorithm is one of the following: \n"
-#~ "\n"
-#~ "des, 3des, blowfish, cast128 for oakley.\n"
-#~ "\n"
-#~ "For other transforms, this statement should not be used."
-#~ msgstr ""
-#~ "määrab faasi 1 läbirääkimistel kasutatava\n"
-#~ "krüptoalgoritmi. See peab olema määratud. \n"
-#~ "algoritm võib olla üks järgmistest: \n"
-#~ "\n"
-#~ "des, 3des, blowfish, cast128 oakley puhul.\n"
-#~ "\n"
-#~ "Muudel juhtudel ei peaks seda direktiivi kasutama."
-
-#~ msgid "generation of the cpu (eg: 8 for PentiumIII, ...)"
-#~ msgstr "CPU põlvkond (nt 8, kui on PentiumIII ...)"
-
-#~ msgid ""
-#~ "the WP flag in the CR0 register of the cpu enforce write proctection at "
-#~ "the memory page level, thus enabling the processor to prevent unchecked "
-#~ "kernel accesses to user memory (aka this is a bug guard)"
-#~ msgstr ""
-#~ "WP lipp CR0 registris kehtestab kirjutuskaitse mälulehekülje tasemel, "
-#~ "võimaldades nii protsessoril takistada kerneli kontrollimatut ligipääsu "
-#~ "kasutajamälule (kannab ka nimetust veavalvur)"
-
-#~ msgid "and enter the name (or the IP) of the SMTP server you whish to use"
-#~ msgstr "ja sisestage SMTP serveri nimi (või IP), mida soovite kasutada"
-
-#~ msgid "Enable multiple profiles"
-#~ msgstr "Mitme profiili lubamine"
-
-#~ msgid "Installing bootloader"
-#~ msgstr "Alglaaduri paigaldamine"
-
-#~ msgid ""
-#~ "You may now provide options to module %s.\n"
-#~ "Options are in format ``name=value name2=value2...''.\n"
-#~ "For instance, ``io=0x300 irq=7''"
-#~ msgstr ""
-#~ "Nüüd võite moodulile %s parameetreid määrata.\n"
-#~ "Parameetrid on vormingus \"nimi=väärtus nimi2=väärtus2 ...\".\n"
-#~ "Näiteks: \"io=0x300 irq=7\""
-
-#~ msgid ""
-#~ "Iwspy is used to set a list of addresses in a wireless network\n"
-#~ "interface and to read back quality of link information for each of "
-#~ "those.\n"
-#~ "\n"
-#~ "This information is the same as the one available in /proc/net/wireless:\n"
-#~ "quality of the link, signal strength and noise level.\n"
-#~ "\n"
-#~ "See iwpspy(8) man page for further information."
-#~ msgstr ""
-#~ "Käsku iwspy kasutatakse aadresside loendi määramiseks traadita\n"
-#~ "võrgu kaardil ning kõigi nende kvaliteedi teadaandmiseks.\n"
-#~ "\n"
-#~ "See on sama info, mida pakub /proc/net/wireless:\n"
-#~ "ühenduse kvaliteet, signaali tugevus ja müratase.\n"
-#~ "\n"
-#~ "Täpsemat infot annab man-lehekülg iwspy(8)."
-
-#~ msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-#~ msgstr "Lisa printer StarOffice/OpenOffice.org/GIMP-ile"
-
-#~ msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-#~ msgstr "Eemalda StarOffice/OpenOffice.org/GIMP-ilt"
-
-#~ msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-#~ msgstr "Printeri lisamine StarOffice/OpenOffice.org/GIMP-ile"
-
-#~ msgid ""
-#~ "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/"
-#~ "GIMP."
-#~ msgstr "Printer \"%s\" lisati edukalt StarOffice/OpenOffice.org/GIMP-ile."
-
-#~ msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
-#~ msgstr ""
-#~ "Printeri \"%s\" lisamine StarOffice/OpenOffice.org/GIMP-ile ebaõnnestus."
-
-#~ msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-#~ msgstr "Printeri eemaldamine StarOffice/OpenOffice.org/GIMP-ilt"
-
-#~ msgid ""
-#~ "The printer \"%s\" was successfully removed from Star Office/OpenOffice."
-#~ "org/GIMP."
-#~ msgstr ""
-#~ "Printer \"%s\" eemaldati edukalt StarOffice/OpenOffice.org/GIMP-ilt."
-
-#~ msgid ""
-#~ "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
-#~ msgstr ""
-#~ "Printeri \"%s\" eemaldamine StarOffice/OpenOffice.org/GIMP-ilt "
-#~ "ebaõnnestus."
-
-#~ msgid "Installation of %s failed. The following error occured:"
-#~ msgstr "%s paigaldamine ebaõnnestus. Tekkis järgmine viga:"
-
-#~ msgid "Use auto detection"
-#~ msgstr "Kasuta automaattuvastust"
-
-#~ msgid "Delay before booting the default image"
-#~ msgstr "Ooteaeg alglaadimisel"
-
-#~ msgid ""
-#~ "Yaboot is a bootloader for NewWorld Macintosh hardware and can be used "
-#~ "to\n"
-#~ "boot GNU/Linux, MacOS or MacOSX. Normally, MacOS and MacOSX are "
-#~ "correctly\n"
-#~ "detected and installed in the bootloader menu. If this is not the case, "
-#~ "you\n"
-#~ "can add an entry by hand in this screen. Take care to choose the correct\n"
-#~ "parameters.\n"
-#~ "\n"
-#~ "Yaboot's main options are:\n"
-#~ "\n"
-#~ " * Init Message: a simple text message displayed before the boot prompt.\n"
-#~ "\n"
-#~ " * Boot Device: indicates where you want to place the information "
-#~ "required\n"
-#~ "to boot to GNU/Linux. Generally, you set up a bootstrap partition "
-#~ "earlier\n"
-#~ "to hold this information.\n"
-#~ "\n"
-#~ " * Open Firmware Delay: unlike LILO, there are two delays available with\n"
-#~ "yaboot. The first delay is measured in seconds and at this point, you "
-#~ "can\n"
-#~ "choose between CD, OF boot, MacOS or Linux;\n"
-#~ "\n"
-#~ " * Kernel Boot Timeout: this timeout is similar to the LILO boot delay.\n"
-#~ "After selecting Linux, you will have this delay in 0.1 second increments\n"
-#~ "before your default kernel description is selected;\n"
-#~ "\n"
-#~ " * Enable CD Boot?: checking this option allows you to choose ``C'' for "
-#~ "CD\n"
-#~ "at the first boot prompt.\n"
-#~ "\n"
-#~ " * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-#~ "Open Firmware at the first boot prompt.\n"
-#~ "\n"
-#~ " * Default OS: you can select which OS will boot by default when the "
-#~ "Open\n"
-#~ "Firmware Delay expires."
-#~ msgstr ""
-#~ "Yaboot on alglaadur NewWorld Macintosh riistvara jaoks. See suudab "
-#~ "laadida nii\n"
-#~ "GNU/Linuxi, MacOSi kui MacOSX, kui need on Teil olemas. Tavaliselt\n"
-#~ "tuvastatakse ja paigaldatakse need operatsioonisüsteemid korrektselt.\n"
-#~ "Kui see nii ei ole, saate praegu käsitsi kirjeid lisada. Kuid olge "
-#~ "parameetrite\n"
-#~ "valikul hästi hoolas ja ettevaatlik.\n"
-#~ "\n"
-#~ "Yabooti põhivalikud on järgmised:\n"
-#~ "\n"
-#~ " * Initsialiseerimisteade: tavaline tekstisõnum, mida näidatakse enne\n"
-#~ "alglaadimise käsurea ilmumist.\n"
-#~ "\n"
-#~ " * Alglaadimisseade: näitab, kuhu soovite panna info, mida läheb vaja\n"
-#~ "GNU/Linuxi algkäivituseks. Üldiselt tuleks selle info tarbeks juba varem "
-#~ "luua\n"
-#~ "alglaadimispartitsioon.\n"
-#~ "\n"
-#~ " * Open Firmware viivitus: Erinevalt LiLo-st on yabooti puhul võimalik "
-#~ "kaks\n"
-#~ "viivitust. Esimest mõõdetakse sekundites ning selle ajal on Teil võimalik "
-#~ "valida\n"
-#~ "CD või OF alglaadimise, MacOS-i või Linuxi vahel.\n"
-#~ "\n"
-#~ " * Kernel alglaadimise viivitus: See on sarnane LiLo alglaadimise "
-#~ "viivitusele.\n"
-#~ "Pärast Linuxi valimist tekib 0,1-sekundiline viivitus, enne kui\n"
-#~ "valitakse kerneli vaikekirjeldus.\n"
-#~ "\n"
-#~ " * Lubada alglaadimine CD-lt?: Selle valimine võimaldab alglaadimise "
-#~ "käsureale\n"
-#~ "``C'' kirjutades valida CD.\n"
-#~ "\n"
-#~ " * Lubada OF alglaadimine?: Selle valimine võimaldab alglaadimise "
-#~ "käsureale\n"
-#~ "``N'' kirjutades valida Open Firmware.\n"
-#~ "\n"
-#~ " * OS vaikimisi: Siin võite valida, milline operatsioonisüsteem "
-#~ "laaditakse vaikimisi,\n"
-#~ "kui Open Firmware viivitus läbi saab."
-
-#~ msgid "chunk size"
-#~ msgstr "ühiku suurus"