simplify translator job by propaging pixel english typo fix

1 files changed, 15305 insertions, 11238 deletions

diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index 0166da739..37397f21b 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -1,1120 +1,706 @@
-# SOME DESCRIPTIVE TITLE.
+# Translation of DrakX.po to Estonian.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# Riho Kurg <rx@linux.ee>, 1999-2001.
+# Riho Kurg <rx@linux.ee>, 1999-2003.
+# Marek Laane <bald@online.ee>, 2002-2003.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
 "POT-Creation-Date: 2002-12-05 19:52+0100\n"
-"PO-Revision-Date: 2002-12-06 19:02+0200\n"
-"Last-Translator: Marek Laane <bald@online.ee>\n"
-"Language-Team: Estonian <kde-et@linux.ee>\n"
+"PO-Revision-Date: 2003-02-07 11:57+0200\n"
+"Last-Translator: Riho Kurg <rx@linux.ee>\n"
+"Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
-#: ../../Xconfig/card.pm_.c:16
-msgid "256 kB"
-msgstr "256 kB"
-
-#: ../../Xconfig/card.pm_.c:17
-msgid "512 kB"
-msgstr "512 kB"
-
-#: ../../Xconfig/card.pm_.c:18
-msgid "1 MB"
-msgstr "1 MB"
-
-#: ../../Xconfig/card.pm_.c:19
-msgid "2 MB"
-msgstr "2 MB"
-
-#: ../../Xconfig/card.pm_.c:20
-msgid "4 MB"
-msgstr "4 MB"
-
-#: ../../Xconfig/card.pm_.c:21
-msgid "8 MB"
-msgstr "8 MB"
-
-#: ../../Xconfig/card.pm_.c:22
-msgid "16 MB"
-msgstr "16 MB"
-
-#: ../../Xconfig/card.pm_.c:23
-msgid "32 MB"
-msgstr "32 MB"
-
-#: ../../Xconfig/card.pm_.c:24
-msgid "64 MB or more"
-msgstr "64 MB või rohkem"
-
-#: ../../Xconfig/card.pm_.c:203
-msgid "Choose a X server"
-msgstr "Valige X server"
-
-#: ../../Xconfig/card.pm_.c:203
-msgid "X server"
-msgstr "X server"
-
-#
-#: ../../Xconfig/card.pm_.c:230
-msgid "Multi-head configuration"
-msgstr "Mitme monitori seadistamine"
-
-#: ../../Xconfig/card.pm_.c:231
+#: ../../any.pm:1
+#, c-format
 msgid ""
-"Your system support multiple head configuration.\n"
-"What do you want to do?"
+"The per-user sharing uses the group \"fileshare\". \n"
+"You can use userdrake to add a user to this group."
 msgstr ""
-"Süsteemis on võimalik kasutada mitut monitori.\n"
-"Mida Te soovite teha?"
-
-#: ../../Xconfig/card.pm_.c:288
-msgid "Select the memory size of your graphics card"
-msgstr "Valige graafikamälu suurus"
-
-#: ../../Xconfig/card.pm_.c:349
-msgid "XFree configuration"
-msgstr "XFree sätted"
-
-#: ../../Xconfig/card.pm_.c:351
-msgid "Which configuration of XFree do you want to have?"
-msgstr "Millist XFree seadistust soovite kasutada?"
-
-#: ../../Xconfig/card.pm_.c:383
-msgid "Configure all heads independently"
-msgstr "Seadista kõik monitorid sõltumatult"
-
-#: ../../Xconfig/card.pm_.c:384
-msgid "Use Xinerama extension"
-msgstr "Kasuta Xinerama laiendusi"
-
-#: ../../Xconfig/card.pm_.c:389
-#, c-format
-msgid "Configure only card \"%s\"%s"
-msgstr "Seadista ainult kaart \"%s\"%s"
+"Kasutaja kaupa jagamise lubamine rakendab gruppi \"fileshare\". \n"
+"Sellesse gruppi kasutajate lisamiseks saab tarvitada userdraket."
 
-#: ../../Xconfig/card.pm_.c:401 ../../Xconfig/card.pm_.c:402
-#: ../../Xconfig/various.pm_.c:23
+#: ../../any.pm:1 ../../bootlook.pm:1 ../../install_steps_gtk.pm:1
+#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
+#: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/smbnfs_gtk.pm:1
+#: ../../interactive/http.pm:1 ../../interactive/newt.pm:1
+#: ../../interactive/stdio.pm:1 ../../network/netconnect.pm:1
+#: ../../printer/printerdrake.pm:1 ../../standalone/drakautoinst:1
+#: ../../standalone/drakbackup:1 ../../standalone/drakconnect:1
+#: ../../standalone/drakfloppy:1 ../../standalone/drakfont:1
+#: ../../standalone/drakgw:1 ../../standalone/draksec:1
+#: ../../standalone/logdrake:1 ../../standalone/net_monitor:1
 #, c-format
-msgid "XFree %s"
-msgstr "XFree %s"
+msgid "Cancel"
+msgstr "Katkesta"
 
-#: ../../Xconfig/card.pm_.c:413 ../../Xconfig/card.pm_.c:439
-#: ../../Xconfig/various.pm_.c:23
+#: ../../any.pm:1
 #, c-format
-msgid "XFree %s with 3D hardware acceleration"
-msgstr "XFree %s koos 3D graafikakiirendi toega"
+msgid "Launch userdrake"
+msgstr "Userdrake käivitamine"
 
-#: ../../Xconfig/card.pm_.c:416
+#: ../../any.pm:1
 #, c-format
 msgid ""
-"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
-"Your card is supported by XFree %s which may have a better support in 2D."
+"Would you like to allow users to share some of their directories?\n"
+"Allowing this will permit users to simply click on \"Share\" in konqueror "
+"and nautilus.\n"
+"\n"
+"\"Custom\" permit a per-user granularity.\n"
 msgstr ""
-"Teie videokaardi 3D graafikakiirendit saab kasutada vaid koos XFree %s-ga.\n"
-"XFree %s toetab Teie videokaarti ja võib omada paremat 2D tuge."
-
-#: ../../Xconfig/card.pm_.c:418 ../../Xconfig/card.pm_.c:441
-#, c-format
-msgid "Your card can have 3D hardware acceleration support with XFree %s."
-msgstr "Teie kaardi 3D graafikakiirendit toetab XFree %s."
+"Kas lubada kasutajatel jagada mõningaid oma katalooge?\n"
+"Lubamine võimaldab kasutajal seda teha lihtsalt klõpsuga sildil \"Jaga\" "
+"Konqueroris ja Nautiluses.\n"
+"\n"
+"\"Isetehtud\" lubab määrata seda kasutajate kaupa.\n"
 
-#: ../../Xconfig/card.pm_.c:426 ../../Xconfig/card.pm_.c:447
+#: ../../any.pm:1 ../../install_any.pm:1 ../../standalone.pm:1
 #, c-format
-msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
-msgstr "XFree %s koos EKSPERIMENTAALSE 3D kiirendi toega"
+msgid "Mandatory package %s is missing"
+msgstr "Puudub kohustuslik pakett %s"
 
-#: ../../Xconfig/card.pm_.c:429
+#: ../../any.pm:1
 #, c-format
 msgid ""
-"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
-"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
-"Your card is supported by XFree %s which may have a better support in 2D."
-msgstr ""
-"Teie videokaardi 3D graafikakiirendit saab kasutada vaid koos XFree %s-ga.\n"
-"SEE ON AGA EKSPERIMENTAALNE JA VÕIB OLLA EBASTABIILNE.\n"
-"Teie kaarti toetab ka XFree %s, millel on ehk parem 2D tugi."
+"You can export using NFS or Samba. Please select which you'd like to use."
+msgstr "Eksportida saab NFS või Samba abil. Palun valige, kumba kasutada."
 
-#: ../../Xconfig/card.pm_.c:432 ../../Xconfig/card.pm_.c:449
+#: ../../any.pm:1 ../../install_any.pm:1 ../../standalone.pm:1
 #, c-format
-msgid ""
-"Your card can have 3D hardware acceleration support with XFree %s,\n"
-"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
-msgstr ""
-"Teie videokaardi 3D graafikakiirendit saab kasutada koos XFree %s-ga.\n"
-"SEE ON AGA EKSPERIMENTAALNE JA VÕIB OLLA EBASTABIILNE."
-
-#: ../../Xconfig/card.pm_.c:455
-msgid "Xpmac (installation display driver)"
-msgstr "Xpmac (paigalduse kuvadraiver)"
+msgid "The package %s needs to be installed. Do you want to install it?"
+msgstr "Pakett %s tuleks kindlasti paigaldada. Kas soovite seda teha?"
 
-#: ../../Xconfig/main.pm_.c:76 ../../Xconfig/main.pm_.c:77
-#: ../../Xconfig/monitor.pm_.c:96 ../../any.pm_.c:961
+#: ../../any.pm:1 ../../Xconfig/main.pm:1 ../../Xconfig/monitor.pm:1
+#, c-format
 msgid "Custom"
 msgstr "Isetehtud"
 
-#: ../../Xconfig/main.pm_.c:102
-msgid "Graphic Card"
-msgstr "Graafikakaart"
-
-#: ../../Xconfig/main.pm_.c:105 ../../Xconfig/monitor.pm_.c:93
-msgid "Monitor"
-msgstr "Monitor"
-
-#: ../../Xconfig/main.pm_.c:108 ../../Xconfig/resolution_and_depth.pm_.c:210
-msgid "Resolution"
-msgstr "Kuvatihedus"
-
-#: ../../Xconfig/main.pm_.c:113
-msgid "Test"
-msgstr "Test"
-
-#: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:67
-#: ../../diskdrake/interactive.pm_.c:393 ../../diskdrake/removable.pm_.c:25
-#: ../../diskdrake/smbnfs_gtk.pm_.c:86
-msgid "Options"
-msgstr "Eelistused"
-
-#: ../../Xconfig/main.pm_.c:122 ../../Xconfig/resolution_and_depth.pm_.c:269
-#: ../../install_gtk.pm_.c:86 ../../install_steps_gtk.pm_.c:274
-#: ../../interactive.pm_.c:127 ../../interactive.pm_.c:142
-#: ../../interactive.pm_.c:345 ../../interactive/http.pm_.c:104
-#: ../../interactive/newt.pm_.c:194 ../../interactive/newt.pm_.c:196
-#: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
-#: ../../interactive/stdio.pm_.c:144 ../../my_gtk.pm_.c:159
-#: ../../my_gtk.pm_.c:287 ../../my_gtk.pm_.c:310 ../../security/main.pm_.c:181
-#: ../../standalone/drakbackup_.c:3920 ../../standalone/drakbackup_.c:4015
-#: ../../standalone/drakbackup_.c:4034 ../../ugtk2.pm_.c:435
-#: ../../ugtk2.pm_.c:926 ../../ugtk2.pm_.c:949
-msgid "Ok"
-msgstr "Olgu"
+#: ../../any.pm:1
+#, c-format
+msgid "Allow all users"
+msgstr "Lubatud kõigile kasutajatele"
 
-#: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../printer/printerdrake.pm_.c:2970 ../../standalone/draksplash_.c:114
-#: ../../standalone/harddrake2_.c:152 ../../standalone/logdrake_.c:204
-msgid "Quit"
-msgstr "Välju"
+#: ../../any.pm:1
+#, c-format
+msgid "No sharing"
+msgstr "Jagamiseta"
 
-#: ../../Xconfig/main.pm_.c:145
+#: ../../any.pm:1 ../../install_steps_interactive.pm:1
+#: ../../diskdrake/interactive.pm:1
 #, c-format
-msgid ""
-"Keep the changes?\n"
-"The current configuration is:\n"
-"\n"
-"%s"
-msgstr ""
-"Kas säilitada muudatused?\n"
-"Olemasolevad sätted:\n"
-"\n"
-"%s"
+msgid "More"
+msgstr "Veel..."
 
-#: ../../Xconfig/monitor.pm_.c:93
-msgid "Choose a monitor"
-msgstr "Valige monitor"
+#: ../../any.pm:1
+#, c-format
+msgid "Here is the full list of available countries"
+msgstr "See on saadaolevate maade täielik nimekiri"
 
-#: ../../Xconfig/monitor.pm_.c:97
-msgid "Plug'n Play"
-msgstr "Plug'n Play"
+#: ../../any.pm:1
+#, c-format
+msgid "Please choose your country."
+msgstr "Palun valige oma maa."
 
-#: ../../Xconfig/monitor.pm_.c:98 ../../mouse.pm_.c:46
-msgid "Generic"
-msgstr "Tavaline"
+#: ../../any.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Country"
+msgstr "Maa"
 
-#: ../../Xconfig/monitor.pm_.c:99 ../../standalone/harddrake2_.c:67
-#: ../../standalone/harddrake2_.c:68
-msgid "Vendor"
-msgstr "Tootja"
+#: ../../any.pm:1
+#, c-format
+msgid "Use Unicode by default"
+msgstr "Unicode kasutamine vaikimisi"
 
-#: ../../Xconfig/monitor.pm_.c:109
-msgid "Plug'n Play probing failed. Please choose a precise monitor"
-msgstr "Plug'n Play test ebaõnnestus. Palun valige monitor täpsemalt"
+#: ../../any.pm:1 ../../install_steps_interactive.pm:1
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "All"
+msgstr "Kõik"
 
-#: ../../Xconfig/monitor.pm_.c:114
+#: ../../any.pm:1
+#, c-format
 msgid ""
-"The two critical parameters are the vertical refresh rate, which is the "
-"rate\n"
-"at which the whole screen is refreshed, and most importantly the horizontal\n"
-"sync rate, which is the rate at which scanlines are displayed.\n"
-"\n"
-"It is VERY IMPORTANT that you do not specify a monitor type with a sync "
-"range\n"
-"that is beyond the capabilities of your monitor: you may damage your "
-"monitor.\n"
-" If in doubt, choose a conservative setting."
+"Mandrake Linux can support multiple languages. Select\n"
+"the languages you would like to install. They will be available\n"
+"when your installation is complete and you restart your system."
 msgstr ""
-"Kaks kriitilist suurust on ekraanisagedus, mis määrab kogu kuva\n"
-"uuendamise aja, ja realaotussagedus\n"
-"\n"
-"On VÄGA TÄHTIS, et Te ei määraks siinkohal monitori, mille realaotus on\n"
-"suurem, kui Teie monitor võimaldab. Vastasel juhul võib Teie monitor "
-"hävida.\n"
-"Kui kahtlete, valige pigem väiksem väärtus."
-
-#: ../../Xconfig/monitor.pm_.c:121
-msgid "Horizontal refresh rate"
-msgstr "Realaotussagedus"
-
-#: ../../Xconfig/monitor.pm_.c:122
-msgid "Vertical refresh rate"
-msgstr "Ekraaniuuendussagedus"
-
-#: ../../Xconfig/resolution_and_depth.pm_.c:12
-msgid "256 colors (8 bits)"
-msgstr "256 värvi (8 bitti)"
-
-#: ../../Xconfig/resolution_and_depth.pm_.c:13
-msgid "32 thousand colors (15 bits)"
-msgstr "32 tuhat värvi (15 bitti)"
-
-#: ../../Xconfig/resolution_and_depth.pm_.c:14
-msgid "65 thousand colors (16 bits)"
-msgstr "65 tuhat värvi (16 bitti)"
-
-#: ../../Xconfig/resolution_and_depth.pm_.c:15
-msgid "16 million colors (24 bits)"
-msgstr "16 miljonit värvi (24 bitti)"
-
-#: ../../Xconfig/resolution_and_depth.pm_.c:16
-msgid "4 billion colors (32 bits)"
-msgstr "4 miljardit värvi (32 bitti)"
-
-#: ../../Xconfig/resolution_and_depth.pm_.c:130
-msgid "Resolutions"
-msgstr "Kuvatihedused"
-
-#: ../../Xconfig/resolution_and_depth.pm_.c:255
-msgid "Choose the resolution and the color depth"
-msgstr "Valige kuvatihedus ja värvisügavus"
+"Mandrake Linux toetab paljusid keeli. Valige keeled, mida\n"
+"soovite paigaldada. Kui paigaldus on lõpetatud ja Te teete\n"
+"süsteemile taaskäivituse, saate neid kasutada."
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:256
+#: ../../any.pm:1
 #, c-format
-msgid "Graphics card: %s"
-msgstr "Graafikakaart: %s"
-
-#: ../../Xconfig/resolution_and_depth.pm_.c:269 ../../any.pm_.c:1001
-#: ../../bootlook.pm_.c:336 ../../diskdrake/smbnfs_gtk.pm_.c:87
-#: ../../install_steps_gtk.pm_.c:405 ../../install_steps_gtk.pm_.c:463
-#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:345
-#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:194
-#: ../../interactive/stdio.pm_.c:39 ../../interactive/stdio.pm_.c:143
-#: ../../my_gtk.pm_.c:158 ../../my_gtk.pm_.c:162 ../../my_gtk.pm_.c:287
-#: ../../network/netconnect.pm_.c:39 ../../printer/printerdrake.pm_.c:2055
-#: ../../security/main.pm_.c:228 ../../standalone/drakautoinst_.c:198
-#: ../../standalone/drakbackup_.c:3874 ../../standalone/drakbackup_.c:3907
-#: ../../standalone/drakbackup_.c:3933 ../../standalone/drakbackup_.c:3960
-#: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4047
-#: ../../standalone/drakbackup_.c:4074 ../../standalone/drakbackup_.c:4104
-#: ../../standalone/drakbackup_.c:4130 ../../standalone/drakconnect_.c:112
-#: ../../standalone/drakconnect_.c:144 ../../standalone/drakconnect_.c:286
-#: ../../standalone/drakconnect_.c:534 ../../standalone/drakconnect_.c:677
-#: ../../standalone/drakfloppy_.c:207 ../../standalone/drakfont_.c:918
-#: ../../standalone/drakgw_.c:557 ../../standalone/logdrake_.c:204
-#: ../../standalone/net_monitor_.c:337 ../../ugtk.pm_.c:295
-#: ../../ugtk2.pm_.c:362 ../../ugtk2.pm_.c:434 ../../ugtk2.pm_.c:438
-#: ../../ugtk2.pm_.c:926
-msgid "Cancel"
-msgstr "Katkesta"
-
-#: ../../Xconfig/test.pm_.c:29
-msgid "Test of the configuration"
-msgstr "Proovime seadistusi"
-
-#: ../../Xconfig/test.pm_.c:30
-msgid "Do you want to test the configuration?"
-msgstr "Kas soovite seadistusi proovida?"
-
-#: ../../Xconfig/test.pm_.c:30
-msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "Hoiatus: selle graafikakaardi test võib Teie arvuti peatada"
+msgid "Please choose a language to use."
+msgstr "Valige palun kasutatav keel."
 
-#: ../../Xconfig/various.pm_.c:29
+#: ../../any.pm:1
 #, c-format
-msgid "Keyboard layout: %s\n"
-msgstr "Klaviatuuriasetus: %s\n"
+msgid "Choose the window manager to run:"
+msgstr "Valige palun käivitatav aknahaldur:"
 
-#: ../../Xconfig/various.pm_.c:30
+#: ../../any.pm:1
 #, c-format
-msgid "Mouse type: %s\n"
-msgstr "Hiire tüüp: %s\n"
+msgid "Choose the default user:"
+msgstr "Valige vaikimisi kasutaja:"
 
-#: ../../Xconfig/various.pm_.c:31
+#: ../../any.pm:1
 #, c-format
-msgid "Mouse device: %s\n"
-msgstr "Hiire port: %s\n"
+msgid "Do you want to use this feature?"
+msgstr "Kas soovite kasutada seda omadust?"
 
-#: ../../Xconfig/various.pm_.c:32
+#: ../../any.pm:1
 #, c-format
-msgid "Monitor: %s\n"
-msgstr "Monitor: %s\n"
+msgid "I can set up your computer to automatically log on one user."
+msgstr "Teie arvutit saab seada vaikimisi kasutaja sisenemisele."
 
-#: ../../Xconfig/various.pm_.c:33
+#: ../../any.pm:1
 #, c-format
-msgid "Monitor HorizSync: %s\n"
-msgstr "Realaotussagedus: %s\n"
+msgid "Autologin"
+msgstr "Vaikimisi sisenemine"
 
-#: ../../Xconfig/various.pm_.c:34
+#: ../../any.pm:1
 #, c-format
-msgid "Monitor VertRefresh: %s\n"
-msgstr "Ekraanisagedus: %s\n"
+msgid "Icon"
+msgstr "Ikoon"
 
-#: ../../Xconfig/various.pm_.c:35
+#: ../../any.pm:1
 #, c-format
-msgid "Graphics card: %s\n"
-msgstr "Graafikakaart: %s\n"
+msgid "Shell"
+msgstr "Käsurida"
 
-#: ../../Xconfig/various.pm_.c:36
+#: ../../any.pm:1 ../../install_steps_interactive.pm:1
 #, c-format
-msgid "Graphics memory: %s kB\n"
-msgstr "Videomälu: %s kB\n"
+msgid "Password (again)"
+msgstr "Salasõna (uuesti)"
 
-#: ../../Xconfig/various.pm_.c:38
+#: ../../any.pm:1 ../../install_steps_interactive.pm:1
+#: ../../diskdrake/smbnfs_gtk.pm:1 ../../network/modem.pm:1
+#: ../../printer/printerdrake.pm:1 ../../standalone/drakbackup:1
+#: ../../standalone/drakconnect:1
 #, c-format
-msgid "Color depth: %s\n"
-msgstr "Värvisügavus: %s\n"
+msgid "Password"
+msgstr "Salasõna"
 
-#: ../../Xconfig/various.pm_.c:39
+#: ../../any.pm:1 ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Resolution: %s\n"
-msgstr "Kuvatihedus: %s\n"
+msgid "User name"
+msgstr "Kasutajanimi"
 
-#: ../../Xconfig/various.pm_.c:41
+#: ../../any.pm:1
 #, c-format
-msgid "XFree86 server: %s\n"
-msgstr "XFree86 server: %s\n"
+msgid "Real name"
+msgstr "Pärisnimi"
 
-#: ../../Xconfig/various.pm_.c:42
+#: ../../any.pm:1
 #, c-format
-msgid "XFree86 driver: %s\n"
-msgstr "XFree86 juhtprogramm: %s\n"
-
-#: ../../Xconfig/various.pm_.c:61
-msgid "Graphical interface at startup"
-msgstr "X käivitub koos süsteemiga"
+msgid "Accept user"
+msgstr "Kasutaja õige"
 
-#: ../../Xconfig/various.pm_.c:62
-msgid ""
-"I can setup your computer to automatically start the graphical interface "
-"(XFree) upon booting.\n"
-"Would you like XFree to start when you reboot?"
-msgstr ""
-"Teie arvutis on võimalik käivitada X juba alglaadimisel.\n"
-"Kas soovite nii teha?"
+#: ../../any.pm:1 ../../diskdrake/dav.pm:1 ../../diskdrake/hd_gtk.pm:1
+#: ../../diskdrake/removable.pm:1 ../../diskdrake/smbnfs_gtk.pm:1
+#: ../../interactive/http.pm:1 ../../printer/printerdrake.pm:1
+#: ../../standalone/drakbackup:1 ../../standalone/scannerdrake:1
+#, c-format
+msgid "Done"
+msgstr "Tehtud"
 
-#: ../../Xconfig/various.pm_.c:73
+#: ../../any.pm:1
+#, c-format
 msgid ""
-"Your graphic card seems to have a TV-OUT connector.\n"
-"It can be configured to work using frame-buffer.\n"
-"\n"
-"For this you have to plug your graphic card to your TV before booting your "
-"computer.\n"
-"Then choose the \"TVout\" entry in the bootloader\n"
-"\n"
-"Do you have this feature?"
+"Enter a user\n"
+"%s"
 msgstr ""
-"Paistab, et Teie videokaardil on TV OUT väljund.\n"
-"Seda on võimalik kasutada järgnevalt:\n"
-"\n"
-"Ühendage arvuti televiisoriga enne alglaadimist ja valige laademenüüst\n"
-" \"TVout\" \n"
-"\n"
-"Kas soovite seda kasutama hakata?"
-
-#: ../../Xconfig/various.pm_.c:85
-msgid "What norm is your TV using?"
-msgstr "Millist TV-standardit Te kasutate?"
-
-#: ../../any.pm_.c:107 ../../any.pm_.c:132
-msgid "First sector of boot partition"
-msgstr "Partitsiooni algusesse"
-
-#: ../../any.pm_.c:107 ../../any.pm_.c:132 ../../any.pm_.c:209
-msgid "First sector of drive (MBR)"
-msgstr "Ketta algusesse (MBR)"
-
-#: ../../any.pm_.c:111
-msgid "SILO Installation"
-msgstr "SILO paigaldamine"
-
-#: ../../any.pm_.c:112 ../../any.pm_.c:125
-msgid "Where do you want to install the bootloader?"
-msgstr "Kuhu soovite alglaaduri paigaldada?"
-
-#: ../../any.pm_.c:124
-msgid "LILO/grub Installation"
-msgstr "LILO/grub paigaldamine"
-
-#: ../../any.pm_.c:136 ../../any.pm_.c:150
-msgid "SILO"
-msgstr "SILO"
-
-#: ../../any.pm_.c:138
-msgid "LILO with text menu"
-msgstr "LILO tekstiresiimis"
-
-#: ../../any.pm_.c:139 ../../any.pm_.c:150
-msgid "LILO with graphical menu"
-msgstr "LILO graafikaresiimis"
-
-#: ../../any.pm_.c:142
-msgid "Grub"
-msgstr "Grub"
-
-#: ../../any.pm_.c:146
-msgid "Boot from DOS/Windows (loadlin)"
-msgstr "Laadimine DOS/Windowsist (loadlin)"
-
-#: ../../any.pm_.c:148 ../../any.pm_.c:150
-msgid "Yaboot"
-msgstr "Yaboot"
-
-#: ../../any.pm_.c:158 ../../any.pm_.c:189
-msgid "Bootloader main options"
-msgstr "Alglaaduri peasätted"
-
-#: ../../any.pm_.c:159 ../../any.pm_.c:190
-msgid "Bootloader to use"
-msgstr "Eelistatav alglaadur"
-
-#: ../../any.pm_.c:161
-msgid "Bootloader installation"
-msgstr "Alglaaduri paigaldus"
-
-#: ../../any.pm_.c:163 ../../any.pm_.c:192
-msgid "Boot device"
-msgstr "Alglaadimisseade"
-
-#: ../../any.pm_.c:164
-msgid "Compact"
-msgstr "Kompaktne"
-
-#: ../../any.pm_.c:164
-msgid "compact"
-msgstr "kompaktne"
-
-#: ../../any.pm_.c:165 ../../any.pm_.c:289
-msgid "Video mode"
-msgstr "Graafikamood"
-
-#: ../../any.pm_.c:167
-msgid "Delay before booting default image"
-msgstr "Ooteaeg alglaadimisel"
-
-#: ../../any.pm_.c:169 ../../any.pm_.c:772
-#: ../../diskdrake/smbnfs_gtk.pm_.c:179
-#: ../../install_steps_interactive.pm_.c:1077 ../../network/modem.pm_.c:71
-#: ../../printer/printerdrake.pm_.c:803 ../../printer/printerdrake.pm_.c:916
-#: ../../standalone/drakbackup_.c:3478 ../../standalone/drakconnect_.c:622
-#: ../../standalone/drakconnect_.c:647
-msgid "Password"
-msgstr "Salasõna"
-
-#: ../../any.pm_.c:170 ../../any.pm_.c:773
-#: ../../install_steps_interactive.pm_.c:1078
-msgid "Password (again)"
-msgstr "Salasõna (uuesti)"
-
-#: ../../any.pm_.c:171
-msgid "Restrict command line options"
-msgstr "Piira käsurea suvandeid"
+"Sisesta kasutaja\n"
+"%s"
 
-#: ../../any.pm_.c:171
-msgid "restrict"
-msgstr "piiratud"
+#: ../../any.pm:1
+#, c-format
+msgid "Add user"
+msgstr "Lisa kasutaja"
 
-#: ../../any.pm_.c:173
-msgid "Clean /tmp at each boot"
-msgstr "Puhasta /tmp igal laadimisel"
+#: ../../any.pm:1
+#, c-format
+msgid "This user name has already been added"
+msgstr "See kasutajanimi on juba lisatud"
 
-#: ../../any.pm_.c:174
+#: ../../any.pm:1
 #, c-format
-msgid "Precise RAM size if needed (found %d MB)"
-msgstr "Kui vaja, täpsusta RAM suurust (leitud %d MB)"
+msgid "The user name is too long"
+msgstr "See kasutajanimi on liiga pikk"
 
-#: ../../any.pm_.c:176
-msgid "Enable multi profiles"
-msgstr "Võimalda mitut profiili"
+#: ../../any.pm:1
+#, 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 '_'"
 
-#: ../../any.pm_.c:180
-msgid "Give the ram size in MB"
-msgstr "Anna mälu suurus megabaitides"
+#: ../../any.pm:1
+#, c-format
+msgid "Please give a user name"
+msgstr "Palun andke kasutajanimi"
 
-#: ../../any.pm_.c:182
-msgid ""
-"Option ``Restrict command line options'' is of no use without a password"
-msgstr "Säte ``Piira käsurea suvandeid'' ei ole kasutatav ilma salasõnata"
+#: ../../any.pm:1
+#, c-format
+msgid "This password is too simple"
+msgstr "Salasõna on liiga lihtne"
 
-#: ../../any.pm_.c:183 ../../any.pm_.c:748
-#: ../../diskdrake/interactive.pm_.c:1204
-#: ../../install_steps_interactive.pm_.c:1072
+#: ../../any.pm:1 ../../install_steps_interactive.pm:1
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid "Please try again"
 msgstr "Palun proovige veel"
 
-#: ../../any.pm_.c:183 ../../any.pm_.c:748
-#: ../../install_steps_interactive.pm_.c:1072
+#: ../../any.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
 msgid "The passwords do not match"
 msgstr "Salasõnad ei klapi"
 
-#: ../../any.pm_.c:191
-msgid "Init Message"
-msgstr "Initsialiseerimisteade"
+#: ../../any.pm:1
+#, c-format
+msgid "(already added %s)"
+msgstr "(juba lisatud %s)"
 
-#: ../../any.pm_.c:193
-msgid "Open Firmware Delay"
-msgstr "Open Firmware viivitus"
+#: ../../any.pm:1
+#, c-format
+msgid "access to compilation tools"
+msgstr "ligipääs kompileerimisvahenditele"
 
-#: ../../any.pm_.c:194
-msgid "Kernel Boot Timeout"
-msgstr "Ajapiirang kerneli laadimisel"
+#: ../../any.pm:1
+#, c-format
+msgid "access to network tools"
+msgstr "ligipääs võrgutöövahenditele"
 
-#: ../../any.pm_.c:195
-msgid "Enable CD Boot?"
-msgstr "CD-lt laadimine lubatud?"
+#: ../../any.pm:1
+#, c-format
+msgid "access to administrative files"
+msgstr "ligipääs administreerimisfailidele"
 
-#: ../../any.pm_.c:196
-msgid "Enable OF Boot?"
-msgstr "OF laadimine lubatud?"
+#: ../../any.pm:1
+#, c-format
+msgid "allow \"su\""
+msgstr "\"su\" lubamine"
 
-#: ../../any.pm_.c:197
-msgid "Default OS?"
-msgstr "Vaikimisi OS?"
+#: ../../any.pm:1
+#, c-format
+msgid "access to rpm tools"
+msgstr "ligipääs rpm vahenditele"
 
-#: ../../any.pm_.c:231
-msgid ""
-"You decided to install the bootloader on a partition.\n"
-"This implies you already have a bootloader on the hard drive you boot (eg: "
-"System Commander).\n"
-"\n"
-"On which drive are you booting?"
-msgstr ""
-"Otsustasite paigaldada alglaaduri partitsioonile.\n"
-"See eeldab, et Teil on juba alglaadur kõvakettal, millelt Te alglaadimise "
-"sooritate (nt System Commander).\n"
-"\n"
-"Milliselt kettalt Te alglaadimise teete?"
+#: ../../any.pm:1
+#, c-format
+msgid "access to X programs"
+msgstr "ligipääs X-i rakendustele"
 
-#: ../../any.pm_.c:247
+#: ../../any.pm:1
+#, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
-"You can add some more or change the existing ones."
+"You can create additional entries or change the existing ones."
 msgstr ""
 "Praegu on kasutusel sellised kirjed.\n"
 "Te võite neid lisada ning olemasolevaid muuta."
 
-#: ../../any.pm_.c:257 ../../standalone/drakbackup_.c:1531
-#: ../../standalone/drakbackup_.c:1644 ../../standalone/drakfont_.c:953
-#: ../../standalone/drakfont_.c:996
-msgid "Add"
-msgstr "Lisa"
-
-#: ../../any.pm_.c:257 ../../any.pm_.c:760 ../../diskdrake/dav.pm_.c:68
-#: ../../diskdrake/hd_gtk.pm_.c:156 ../../diskdrake/removable.pm_.c:27
-#: ../../diskdrake/smbnfs_gtk.pm_.c:88 ../../interactive/http.pm_.c:153
-#: ../../printer/printerdrake.pm_.c:2970 ../../standalone/drakbackup_.c:2726
-msgid "Done"
-msgstr "Tehtud"
-
-#: ../../any.pm_.c:257
-msgid "Modify"
-msgstr "Muuda"
-
-#: ../../any.pm_.c:265
-msgid "Which type of entry do you want to add?"
-msgstr "Millisele sektorile soovite seda tõsta?"
-
-#: ../../any.pm_.c:266 ../../standalone/drakbackup_.c:1674
-msgid "Linux"
-msgstr "Linux"
-
-#: ../../any.pm_.c:266
-msgid "Other OS (SunOS...)"
-msgstr "Muu OS (SunOS...)"
-
-#: ../../any.pm_.c:267
-msgid "Other OS (MacOS...)"
-msgstr "Muu OS (MacOS...)"
-
-#: ../../any.pm_.c:267
+#: ../../any.pm:1
+#, c-format
 msgid "Other OS (windows...)"
 msgstr "Muu OS (windows...)"
 
-#: ../../any.pm_.c:285
-msgid "Image"
-msgstr "Laadefail"
+#: ../../any.pm:1
+#, c-format
+msgid "Other OS (MacOS...)"
+msgstr "Muu OS (MacOS...)"
 
-#: ../../any.pm_.c:286 ../../any.pm_.c:297
-msgid "Root"
-msgstr "Juur"
+#: ../../any.pm:1
+#, c-format
+msgid "Other OS (SunOS...)"
+msgstr "Muu OS (SunOS...)"
 
-#: ../../any.pm_.c:287 ../../any.pm_.c:315
-msgid "Append"
-msgstr "Lisand"
+#: ../../any.pm:1 ../../standalone/drakbackup:1
+#, c-format
+msgid "Linux"
+msgstr "Linux"
 
-#: ../../any.pm_.c:291
-msgid "Initrd"
-msgstr "Initrd"
+#: ../../any.pm:1
+#, c-format
+msgid "Which type of entry do you want to add?"
+msgstr "Millisele sektorile soovite seda tõsta?"
 
-#: ../../any.pm_.c:292
-msgid "Read-write"
-msgstr "Read-write"
+#: ../../any.pm:1
+#, c-format
+msgid "This label is already used"
+msgstr "Selline pealdis on juba kasutusel"
 
-#: ../../any.pm_.c:299
-msgid "Table"
-msgstr "Tabel"
+#: ../../any.pm:1
+#, c-format
+msgid "You must specify a root partition"
+msgstr "Teil peab olema juurpartitsioon"
 
-#: ../../any.pm_.c:300
-msgid "Unsafe"
-msgstr "Ebaturvaline"
+#: ../../any.pm:1
+#, c-format
+msgid "You must specify a kernel image"
+msgstr "Teil peab olema kerneli laadepilt"
 
-#: ../../any.pm_.c:307 ../../any.pm_.c:312 ../../any.pm_.c:314
-msgid "Label"
-msgstr "Pealdis"
+#: ../../any.pm:1
+#, c-format
+msgid "Empty label not allowed"
+msgstr "Tühi kirjetähis ei ole lubatud"
 
-#: ../../any.pm_.c:309 ../../any.pm_.c:319 ../../harddrake/v4l.pm_.c:215
+#: ../../any.pm:1 ../../harddrake/v4l.pm:1
+#, c-format
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../../any.pm_.c:316
-msgid "Initrd-size"
-msgstr "Initrd suurus"
-
-#: ../../any.pm_.c:318
+#: ../../any.pm:1
+#, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: ../../any.pm_.c:326
-msgid "Remove entry"
-msgstr "Eemalda kirje"
-
-#: ../../any.pm_.c:329
-msgid "Empty label not allowed"
-msgstr "Tühi kirjetähis ei ole lubatud"
-
-#: ../../any.pm_.c:330
-msgid "You must specify a kernel image"
-msgstr "Teil peab olema kerneli laadepilt"
-
-#: ../../any.pm_.c:330
-msgid "You must specify a root partition"
-msgstr "Teil peab olema juurpartitsioon"
-
-#: ../../any.pm_.c:331
-msgid "This label is already used"
-msgstr "Selline pealdis on juba kasutusel"
-
-#: ../../any.pm_.c:640
+#: ../../any.pm:1
 #, c-format
-msgid "Found %s %s interfaces"
-msgstr "Leiti %s %s liidest"
-
-#: ../../any.pm_.c:641
-msgid "Do you have another one?"
-msgstr "On Teil veel kaarte?"
+msgid "Initrd-size"
+msgstr "Initrd suurus"
 
-#: ../../any.pm_.c:642
+#: ../../any.pm:1
 #, c-format
-msgid "Do you have any %s interfaces?"
-msgstr "Kas Teil on ikka mõni %s liides?"
-
-#: ../../any.pm_.c:644 ../../any.pm_.c:807 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:286 ../../ugtk2.pm_.c:925
-msgid "No"
-msgstr "Ei"
-
-#: ../../any.pm_.c:644 ../../any.pm_.c:806 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:286 ../../standalone/drakgw_.c:258
-#: ../../standalone/drakgw_.c:259 ../../standalone/drakgw_.c:267
-#: ../../standalone/drakgw_.c:277 ../../ugtk2.pm_.c:925
-msgid "Yes"
-msgstr "Jah"
-
-#: ../../any.pm_.c:645
-msgid "See hardware info"
-msgstr "Info riistvara kohta"
+msgid "Append"
+msgstr "Lisand"
 
-#. -PO: the first %s is the card type (scsi, network, sound,...)
-#. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:662
+#: ../../any.pm:1
 #, c-format
-msgid "Installing driver for %s card %s"
-msgstr "Paigaldame juhtprogrammi %s kaardile %s"
+msgid "Label"
+msgstr "Pealdis"
 
-#: ../../any.pm_.c:663
+#: ../../any.pm:1
 #, c-format
-msgid "(module %s)"
-msgstr "(moodul %s)"
+msgid "Unsafe"
+msgstr "Ebaturvaline"
 
-#: ../../any.pm_.c:674
+#: ../../any.pm:1
 #, c-format
-msgid ""
-"You may now provide its 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'"
+msgid "Table"
+msgstr "Tabel"
 
-#: ../../any.pm_.c:680
+#: ../../any.pm:1
 #, c-format
-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\""
-
-#: ../../any.pm_.c:682
-msgid "Module options:"
-msgstr "Mooduli parameetrid:"
+msgid "Root"
+msgstr "Juur"
 
-#. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:694
+#: ../../any.pm:1
 #, c-format
-msgid "Which %s driver should I try?"
-msgstr "Millist %s juhtprogrammi peaksime proovima?"
+msgid "Read-write"
+msgstr "Read-write"
 
-#: ../../any.pm_.c:703
+#: ../../any.pm:1
 #, c-format
-msgid ""
-"In some cases, the %s driver needs to have extra information to work\n"
-"properly, although it normally works fine without. Would you like to "
-"specify\n"
-"extra options for it or allow the driver to probe your machine for the\n"
-"information it needs? Occasionally, probing will hang a computer, but it "
-"should\n"
-"not cause any damage."
-msgstr ""
-"Mõnedel juhtudel vajab %s juhtprogramm tööks lisainformatsiooni,\n"
-"kuigi tavaliselt saab ka ilma hakkama. Kas soovite eraldi parameetreid\n"
-"määrata või lasta juhtprogrammil ise Teie arvutit kompida? Võib juhtuda,\n"
-"et see viib arvuti segadusse, kuid ei tohiks mingit jäävat kahju teha."
-
-#: ../../any.pm_.c:707
-msgid "Autoprobe"
-msgstr "Proovida niisama"
+msgid "Initrd"
+msgstr "Initrd"
 
-#: ../../any.pm_.c:707
-msgid "Specify options"
-msgstr "Määrata parameetrid"
+#: ../../any.pm:1
+#, c-format
+msgid "Video mode"
+msgstr "Graafikamood"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm:1
 #, c-format
-msgid ""
-"Loading module %s failed.\n"
-"Do you want to try again with other parameters?"
-msgstr ""
-"Mooduli %s laadimine ei õnnestunud.\n"
-"Kas soovite proovida parameetreid muuta?"
+msgid "Image"
+msgstr "Laadefail"
 
-#: ../../any.pm_.c:734
-msgid "access to X programs"
-msgstr "ligipääs X-i rakendustele"
+#: ../../any.pm:1
+#, c-format
+msgid "Default OS?"
+msgstr "Vaikimisi OS?"
 
-#: ../../any.pm_.c:735
-msgid "access to rpm tools"
-msgstr "ligipääs rpm vahenditele"
+#: ../../any.pm:1
+#, c-format
+msgid "Enable OF Boot?"
+msgstr "OF laadimine lubatud?"
 
-#: ../../any.pm_.c:736
-msgid "allow \"su\""
-msgstr "\"su\" lubamine"
+#: ../../any.pm:1
+#, c-format
+msgid "Enable CD Boot?"
+msgstr "CD-lt laadimine lubatud?"
 
-#: ../../any.pm_.c:737
-msgid "access to administrative files"
-msgstr "ligipääs administreerimisfailidele"
+#: ../../any.pm:1
+#, c-format
+msgid "Kernel Boot Timeout"
+msgstr "Ajapiirang kerneli laadimisel"
 
-#: ../../any.pm_.c:738
-msgid "access to network tools"
-msgstr "ligipääs võrgutöövahenditele"
+#: ../../any.pm:1
+#, c-format
+msgid "Open Firmware Delay"
+msgstr "Open Firmware viivitus"
 
-#: ../../any.pm_.c:739
-msgid "access to compilation tools"
-msgstr "ligipääs kompileerimisvahenditele"
+#: ../../any.pm:1
+#, c-format
+msgid "Boot device"
+msgstr "Alglaadimisseade"
 
-#: ../../any.pm_.c:744
+#: ../../any.pm:1
 #, c-format
-msgid "(already added %s)"
-msgstr "(juba lisatud %s)"
+msgid "Init Message"
+msgstr "Initsialiseerimisteade"
 
-#: ../../any.pm_.c:749
-msgid "This password is too simple"
-msgstr "Salasõna on liiga lihtne"
+#: ../../any.pm:1
+#, c-format
+msgid "Bootloader to use"
+msgstr "Eelistatav alglaadur"
 
-#: ../../any.pm_.c:750
-msgid "Please give a user name"
-msgstr "Palun andke kasutajatunnus"
+#: ../../any.pm:1
+#, c-format
+msgid "Bootloader main options"
+msgstr "Alglaaduri peasätted"
 
-#: ../../any.pm_.c:751
+#: ../../any.pm:1
+#, c-format
 msgid ""
-"The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr ""
-"Kasutajatunnus tohib sisaldada ainult väikesi tähti, numbreid ning märke '-' "
-"ja '_'"
-
-#: ../../any.pm_.c:752
-msgid "The user name is too long"
-msgstr "See kasutajatunnus on liiga pikk"
-
-#: ../../any.pm_.c:753
-msgid "This user name is already added"
-msgstr "See kasutajatunnus on juba lisatud"
-
-#: ../../any.pm_.c:757
-msgid "Add user"
-msgstr "Lisa kasutaja"
+"Option ``Restrict command line options'' is of no use without a password"
+msgstr "Säte ``Piira käsurea suvandeid'' ei ole kasutatav ilma salasõnata"
 
-#: ../../any.pm_.c:758
+#: ../../any.pm:1
 #, c-format
-msgid ""
-"Enter a user\n"
-"%s"
-msgstr ""
-"Sisesta kasutaja\n"
-"%s"
+msgid "Give the ram size in MB"
+msgstr "Anna mälu suurus megabaitides"
 
-#: ../../any.pm_.c:759
-msgid "Accept user"
-msgstr "Kasutaja õige"
+#: ../../any.pm:1
+#, c-format
+msgid "Enable multiple profiles"
+msgstr "Võimalda mitu profiili"
 
-#: ../../any.pm_.c:770
-msgid "Real name"
-msgstr "Pärisnimi"
+#: ../../any.pm:1
+#, c-format
+msgid "Precise RAM size if needed (found %d MB)"
+msgstr "Kui vaja, täpsustage RAM suurust (leitud %d MB)"
 
-#: ../../any.pm_.c:771 ../../printer/printerdrake.pm_.c:802
-#: ../../printer/printerdrake.pm_.c:915
-msgid "User name"
-msgstr "Kasutajatunnus"
+#: ../../any.pm:1
+#, c-format
+msgid "Clean /tmp at each boot"
+msgstr "Puhasta /tmp igal laadimisel"
 
-#: ../../any.pm_.c:774
-msgid "Shell"
-msgstr "Käsurida"
+#: ../../any.pm:1
+#, c-format
+msgid "Create a bootdisk"
+msgstr "Alglaadimisflopi loomine"
 
-#: ../../any.pm_.c:776
-msgid "Icon"
-msgstr "Ikoon"
+#: ../../any.pm:1
+#, c-format
+msgid "restrict"
+msgstr "piiratud"
 
-#: ../../any.pm_.c:803
-msgid "Autologin"
-msgstr "Vaikimisi sisenemine"
+#: ../../any.pm:1
+#, c-format
+msgid "Restrict command line options"
+msgstr "Piira käsurea suvandeid"
 
-#: ../../any.pm_.c:804
-msgid ""
-"I can set up your computer to automatically log on one user.\n"
-"Do you want to use this feature?"
-msgstr ""
-"Teie arvutit saab seada vaikimisi kasutaja sisenemisele.\n"
-"Kas soovite seda võimalust kasutada?"
+#: ../../any.pm:1
+#, c-format
+msgid "Delay before booting default image"
+msgstr "Ooteaeg alglaadimisel"
 
-#: ../../any.pm_.c:808
-msgid "Choose the default user:"
-msgstr "Valige vaikimisi kasutaja:"
+#: ../../any.pm:1
+#, c-format
+msgid "compact"
+msgstr "kompaktne"
 
-#: ../../any.pm_.c:809
-msgid "Choose the window manager to run:"
-msgstr "Valige palun käivitatav aknahaldur:"
+#: ../../any.pm:1
+#, c-format
+msgid "Compact"
+msgstr "Kompaktne"
 
-#: ../../any.pm_.c:824
-msgid "Please choose a language to use."
-msgstr "Palun valige kasutatav keel."
+#: ../../any.pm:1
+#, c-format
+msgid "Bootloader installation"
+msgstr "Alglaaduri paigaldus"
 
-#: ../../any.pm_.c:826
-msgid ""
-"Mandrake Linux can support multiple languages. Select\n"
-"the languages you would like to install. They will be available\n"
-"when your installation is complete and you restart your system."
-msgstr ""
-"Mandrake Linux toetab paljusid keeli. Valige keeled, mida\n"
-"soovite paigaldada. Kui paigaldus on lõpetatud ja Te teete\n"
-"süsteemile taaskäivituse, saate neid kasutada."
+#: ../../any.pm:1
+#, c-format
+msgid "First sector of boot partition"
+msgstr "Partitsiooni algusesse"
 
-#: ../../any.pm_.c:840 ../../install_steps_interactive.pm_.c:697
-#: ../../standalone/drakxtv_.c:70
-msgid "All"
-msgstr "Kõik"
+#: ../../any.pm:1
+#, c-format
+msgid "First sector of drive (MBR)"
+msgstr "Ketta algusesse (MBR)"
 
-#: ../../any.pm_.c:961
-msgid "Allow all users"
-msgstr "Lubatud kõigile kasutajatele"
+#: ../../any.pm:1
+#, c-format
+msgid "Where do you want to install the bootloader?"
+msgstr "Kuhu soovite alglaaduri paigaldada?"
 
-#: ../../any.pm_.c:961
-msgid "No sharing"
-msgstr "Jagamiseta"
+#: ../../any.pm:1
+#, c-format
+msgid "LILO/grub Installation"
+msgstr "LiLo/grub paigaldamine"
 
-#: ../../any.pm_.c:971 ../../install_any.pm_.c:1207 ../../standalone.pm_.c:185
+#: ../../any.pm:1
 #, c-format
-msgid "The package %s needs to be installed. Do you want to install it?"
-msgstr "Pakett %s tuleks kindlasti paigaldada. Kas soovite seda teha?"
+msgid "SILO Installation"
+msgstr "SILO paigaldamine"
 
-#: ../../any.pm_.c:973
-msgid ""
-"You can export using NFS or Samba. Please select which you'd like to use."
-msgstr "Eksportida saab NFS või Samba abil. Palun valige, kumba kasutada."
+#: ../../any.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Skip"
+msgstr "Jäta vahele"
 
-#: ../../any.pm_.c:981 ../../install_any.pm_.c:1212 ../../standalone.pm_.c:190
+#: ../../any.pm:1
 #, c-format
-msgid "Mandatory package %s is missing"
-msgstr "Puudub kohustuslik pakett %s"
+msgid "On Floppy"
+msgstr "Flopil"
 
-#: ../../any.pm_.c:987
+#: ../../any.pm:1
+#, c-format
 msgid ""
-"Would you like to allow users to share some of their directories?\n"
-"Allowing this will permit users to simply click on \"Share\" in konqueror "
-"and nautilus.\n"
+"You decided to install the bootloader on a partition.\n"
+"This implies you already have a bootloader on the hard drive you boot (eg: "
+"System Commander).\n"
 "\n"
-"\"Custom\" permit a per-user granularity.\n"
+"On which drive are you booting?"
 msgstr ""
-"Kas lubada kasutajatel jagada mõningaid oma katalooge?\n"
-"Lubamine võimaldab kasutajal seda teha lihtsalt klõpsuga sildil \"Jaga\" "
-"konqueroris ja nautiluses.\n"
+"Otsustasite paigaldada alglaaduri partitsioonile.\n"
+"See eeldab, et Teil on juba alglaadur kõvakettal, millelt Te alglaadimise "
+"sooritate (nt System Commander).\n"
 "\n"
-"\"Isetehtud\" lubab määrata seda kasutajate kaupa.\n"
-
-#: ../../any.pm_.c:1001
-msgid "Launch userdrake"
-msgstr "Userdrake käivitamine"
-
-#: ../../any.pm_.c:1003
-msgid ""
-"The per-user sharing uses the group \"fileshare\". \n"
-"You can use userdrake to add a user in this group."
-msgstr ""
-"Kasutaja kaupa jagamise lubamine rakendab gruppi \"fileshare\". \n"
-"Sellesse gruppi kasutajate lisamiseks saab tarvitada userdraket."
-
-#: ../../any.pm_.c:1053 ../../security/level.pm_.c:7
-msgid "Welcome To Crackers"
-msgstr "Tere tulemast, kräkkerid"
-
-#: ../../any.pm_.c:1054 ../../security/level.pm_.c:8
-msgid "Poor"
-msgstr "Vähene"
-
-#: ../../any.pm_.c:1055 ../../mouse.pm_.c:31 ../../security/level.pm_.c:9
-msgid "Standard"
-msgstr "Standardne"
+"Milliselt kettalt Te alglaadimise teete?"
 
-#: ../../any.pm_.c:1056 ../../security/level.pm_.c:10
-msgid "High"
-msgstr "Kõrge"
+#: ../../any.pm:1
+#, c-format
+msgid "Creating bootdisk..."
+msgstr "Alglaadimisketta loomine..."
 
-#: ../../any.pm_.c:1057 ../../security/level.pm_.c:11
-msgid "Higher"
-msgstr "Veel kõrgem"
+#: ../../any.pm:1
+#, c-format
+msgid "Insert a floppy in %s"
+msgstr "Pange flopi seadmesse %s"
 
-#: ../../any.pm_.c:1058 ../../security/level.pm_.c:12
-msgid "Paranoid"
-msgstr "Paranoiline"
+#: ../../any.pm:1
+#, c-format
+msgid "Choose the floppy drive you want to use to make the bootdisk"
+msgstr "Valige flopiseade, mida kasutada alglaadimisketta tegemiseks"
 
-#: ../../any.pm_.c:1061
-msgid ""
-"This level is to be used with care. It makes your system more easy to use,\n"
-"but very sensitive: it must not be used for a machine connected to others\n"
-"or to the Internet. There is no password access."
-msgstr ""
-"See tase muudab küll süsteemi lihtsalt kasutatavaks, kuid väga\n"
-"haavatavaks: ligipääsupiirangute puudumise tõttu ei peaks arvutit ühendama\n"
-"ei teiste arvutitega ega ka mitte Internetti."
+#: ../../any.pm:1
+#, c-format
+msgid "Second floppy drive"
+msgstr "Teine flopiseade"
 
-#: ../../any.pm_.c:1064
-msgid ""
-"Password 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."
+#: ../../any.pm:1
+#, c-format
+msgid "First floppy drive"
+msgstr "Esimene flopiseade"
 
-#: ../../any.pm_.c:1065
-msgid ""
-"This is the standard security recommended for a computer that will be used "
-"to connect to the Internet as a client."
-msgstr ""
-"See on sobilik turvatase arvutile, mis ühendatakse Internetti kui klient."
+#: ../../any.pm:1
+#, c-format
+msgid "Sorry, no floppy drive available"
+msgstr "Flopiseade ei ole kättesaadav"
 
-#: ../../any.pm_.c:1066
+#: ../../any.pm:1
+#, c-format
 msgid ""
-"There are already some restrictions, and more automatic checks are run every "
-"night."
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"LILO (or grub) on your system, or another operating system removes LILO, or "
+"LILO doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures. Would you like to create a bootdisk for your system?\n"
+"%s"
 msgstr ""
-"Mõned piirangud on juba peal ja igal ööl viiakse läbi veel hulk automaatseid "
-"kontrollimisi."
+"Isetehtud alglaadimisketas annab Teile võimaluse laadida Linux flopilt\n"
+"sõltumata tavalisest alglaadijast. See võib abiks olla, kui Te ei soovi\n"
+"LiLo-t (grubi) kõvakettale kirjutada või mõni muu operatsioonisüsteem LiLo\n"
+"ära kustutab või ei õnnestu LiLo-t Teie riistvara peal kasutada.\n"
+"Alglaadimisflopi on kasutatav ka hädaabikettana, kui kõvakettal oleva\n"
+"failisüsteemiga peaks mingi õnnetus juhtuma.\n"
+"Hoidke end ja Teid hoiab ka Jumal!\n"
+"%s"
 
-#: ../../any.pm_.c:1067
+#: ../../any.pm:1
+#, c-format
 msgid ""
-"With this security level, the use of this system as a server becomes "
-"possible.\n"
-"The security is now high enough to use the system as a server which can "
-"accept\n"
-"connections from many clients. Note: if your machine is only a client on the "
-"Internet, you should choose a lower level."
+"\n"
+"\n"
+"(WARNING! You're using XFS for your root partition,\n"
+"creating a bootdisk on a 1.44 Mb floppy will probably fail,\n"
+"because XFS needs a very large driver)."
 msgstr ""
-"Sellel turvatasemel võib süsteemi kasutada Internetis ka serverina.\n"
-" Turvalisus on nüüd piisavalt kõrge, et töötades serverina võib masin\n"
-"vastu võtta ka palju kliente. Märkus: kui Teie masin kasutab Internetti\n"
-"ainult kliendina, võiks valida madalama taseme."
+"\n"
+"\n"
+"(HOIATUS! Te kasutate juurpartitsioonil XFS-i, mistõttu\n"
+"alglaadimisketta loomine 1,44MB-sele flopile tõenäoliselt\n"
+"ei õnnestu, sest XFS vajab väga suurt draiverit)."
 
-#: ../../any.pm_.c:1070
+#: ../../any.pm:1
+#, c-format
 msgid ""
-"This is similar to the previous level, but the system is entirely closed and "
-"security features are at their maximum."
+"A custom bootdisk provides a way of booting into your Linux system without\n"
+"depending on the normal bootloader. This is useful if you don't want to "
+"install\n"
+"SILO on your system, or another operating system removes SILO, or SILO "
+"doesn't\n"
+"work with your hardware configuration. A custom bootdisk can also be used "
+"with\n"
+"the Mandrake rescue image, making it much easier to recover from severe "
+"system\n"
+"failures.\n"
+"\n"
+"If you want to create a bootdisk for your system, insert a floppy in the "
+"first\n"
+"drive and press \"Ok\"."
 msgstr ""
-"Süsteem on täielikult suletud. Võrgust kasutamine on võimalik ainult\n"
-"spetsiaalselt loodud juurdepääsuteid kasutades."
-
-#: ../../any.pm_.c:1076
-msgid "DrakSec Basic Options"
-msgstr "DrakSeci põhiseadistused"
-
-#: ../../any.pm_.c:1077
-msgid "Please choose the desired security level"
-msgstr "Palun valige meelepärane turvatase"
+"Isetehtud alglaadimisketas annab Teile võimaluse laadida Linux flopilt\n"
+"sõltumata tavalisest alglaadijast. See võib abiks olla, kui Te ei soovi\n"
+"SILO-t kõvakettale kirjutada või mõni muu operatsioonisüsteem SILO\n"
+"ära kustutab või ei õnnestu SILO-t Teie riistvara peal kasutada.\n"
+"Alglaadimisflopi on kasutatav ka hädaabikettana, kui kõvakettal oleva\n"
+"failisüsteemiga peaks mingi õnnetus juhtuma.\n"
+"Hoidke end ja Teid hoiab ka Jumal!\n"
+"\n"
+"Alglaadimisketta loomiseks asetage flopi esimesse seadmesse ning vajutage\n"
+"\"Olgu\"."
 
-#: ../../any.pm_.c:1080
-msgid "Security level"
-msgstr "Turvatase"
+#: ../../bootloader.pm:1
+#, c-format
+msgid "You can't install the bootloader on a %s partition\n"
+msgstr "Alglaadurit ei ole võimalik paigaldada partitsioonile %s\n"
 
-#: ../../any.pm_.c:1082
-msgid "Use libsafe for servers"
-msgstr "Serveritel kasutatakse libsafe'i"
+#: ../../bootloader.pm:1
+#, c-format
+msgid "not enough room in /boot"
+msgstr "/boot on liiga täis"
 
-#: ../../any.pm_.c:1083
-msgid ""
-"A library which defends against buffer overflow and format string attacks."
-msgstr "Teek, mis kaitseb puhvri ületäite ja vormingustringide rünnaku vastu."
+#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
+#. -PO: and keep them smaller than 79 chars long
+#: ../../bootloader.pm:1
+#, c-format
+msgid "The highlighted entry will be booted automatically in %d seconds."
+msgstr "Valik laetakse automaatselt %d sekundi jooksul"
 
-#: ../../any.pm_.c:1084
-msgid "Security Administrator (login or email)"
-msgstr "Turvaadministraator (kasutajatunnus või e-posti aadress)"
+#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
+#. -PO: and keep them smaller than 79 chars long
+#: ../../bootloader.pm:1
+#, c-format
+msgid "commands before booting, or 'c' for a command-line."
+msgstr "suvandeid enne laadimist ja 'c' veel enam."
 
-#: ../../any.pm_.c:1166
-msgid ""
-"Here you can choose the key or key combination that will \n"
-"allow switching between the different keyboard layouts\n"
-"(eg: latin and non latin)"
-msgstr ""
-"Siin saab valida klahvi või klahvikombinatsiooni, mis laseb\n"
-"vahetada klaviatuuri (nt ladina ja mitte-ladina tähestikuga)"
+#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
+#. -PO: and keep them smaller than 79 chars long
+#: ../../bootloader.pm:1
+#, c-format
+msgid "Press enter to boot the selected OS, 'e' to edit the"
+msgstr "Enter laeb Teie valiku, 'e' laseb muuta"
 
-# 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_.c:436
+#. -PO: and keep them smaller than 79 chars long
+#: ../../bootloader.pm:1
 #, c-format
-msgid ""
-"Welcome to %s the operating system chooser!\n"
-"\n"
-"Choose an operating system in the list above or\n"
-"wait %d seconds for default boot.\n"
-"\n"
-msgstr ""
-"Tere tulemast! Laadimisel aitab Teid %s!\n"
-"\n"
-"Valige nimekirjast eelistatav OS,\n"
-"vaikimisi oodake %d sekundit.\n"
-"\n"
+msgid "Use the %c and %c keys for selecting which entry is highlighted."
+msgstr "Kasutage valiku tegemiseks klahve %c ja %c."
 
 # NOTE: this message will be displayed by grub at boot time; that is
 # using the BIOS font; that means cp437 charset on 99.99% of PC computers
@@ -1126,1248 +712,472 @@ msgstr ""
 #
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:983
+#: ../../bootloader.pm:1
+#, c-format
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Tere tulemast! Laadimisel aitab Teid GRUB!"
 
-#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:986
+#: ../../bootloader.pm:1
 #, c-format
-msgid "Use the %c and %c keys for selecting which entry is highlighted."
-msgstr "Kasutage valiku tegemiseks %c ja %c klahve"
-
-#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:989
-msgid "Press enter to boot the selected OS, 'e' to edit the"
-msgstr "Enter laeb Teie valiku, 'e' laseb muuta"
-
-#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:992
-msgid "commands before booting, or 'c' for a command-line."
-msgstr "suvandeid enne laadimist ja 'c' veel enam."
+msgid "Yaboot"
+msgstr "Yaboot"
 
-#. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#. -PO: and keep them smaller than 79 chars long
-#: ../../bootloader.pm_.c:995
+#: ../../bootloader.pm:1
 #, c-format
-msgid "The highlighted entry will be booted automatically in %d seconds."
-msgstr "Valik laetakse automaatselt %d sekundi jooksul"
-
-#: ../../bootloader.pm_.c:999
-msgid "not enough room in /boot"
-msgstr "/boot on liiga täis"
-
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#. -PO: so you may need to put them in English or in a different language if MS-windows doesn't exist in your language
-#: ../../bootloader.pm_.c:1099
-msgid "Desktop"
-msgstr "Töölaud"
-
-#. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:1101
-msgid "Start Menu"
-msgstr "Startmenüü"
+msgid "Grub"
+msgstr "Grub"
 
-#: ../../bootloader.pm_.c:1120
+#: ../../bootloader.pm:1
 #, c-format
-msgid "You can't install the bootloader on a %s partition\n"
-msgstr "Alglaadurit ei ole võimalik paigaldada %s partitsioonile\n"
-
-#: ../../bootlook.pm_.c:53
-msgid "Boot Style Configuration"
-msgstr "Alglaaduri stiil"
-
-#: ../../bootlook.pm_.c:70 ../../standalone/drakfloppy_.c:54
-#: ../../standalone/harddrake2_.c:81 ../../standalone/harddrake2_.c:82
-#: ../../standalone/logdrake_.c:74
-msgid "/_File"
-msgstr "/_Fail"
-
-#: ../../bootlook.pm_.c:71 ../../standalone/drakfloppy_.c:55
-#: ../../standalone/logdrake_.c:80
-msgid "/File/_Quit"
-msgstr "/Fail/_Välju"
-
-#: ../../bootlook.pm_.c:71 ../../standalone/drakfloppy_.c:55
-#: ../../standalone/harddrake2_.c:82 ../../standalone/logdrake_.c:80
-msgid "<control>Q"
-msgstr "<control>Q"
-
-#: ../../bootlook.pm_.c:82
-msgid "NewStyle Categorizing Monitor"
-msgstr "NewStyle kategoriseeritud jälgimine"
-
-#: ../../bootlook.pm_.c:83
-msgid "NewStyle Monitor"
-msgstr "NewStyle jälgimine"
-
-#: ../../bootlook.pm_.c:84
-msgid "Traditional Monitor"
-msgstr "Tavaline jälgimine"
-
-#: ../../bootlook.pm_.c:85
-msgid "Traditional Gtk+ Monitor"
-msgstr "Traditsiooniline Gtk+ jälgimine"
-
-#: ../../bootlook.pm_.c:86
-msgid "Launch Aurora at boot time"
-msgstr "Käivita alglaadimisel Aurora"
-
-#: ../../bootlook.pm_.c:89
-msgid "Lilo/grub mode"
-msgstr "Lilo/grub resiim"
-
-#: ../../bootlook.pm_.c:89
-msgid "Yaboot mode"
-msgstr "Yaboot resiim"
-
-#: ../../bootlook.pm_.c:138
-msgid "Install themes"
-msgstr "Teemade paigaldamine"
-
-#: ../../bootlook.pm_.c:139
-msgid ""
-"Display theme\n"
-"under console"
-msgstr ""
-"Teema näitamine\n"
-"konsoolis"
-
-#: ../../bootlook.pm_.c:140
-msgid "Create new theme"
-msgstr "Uue teema loomine"
+msgid "LILO with text menu"
+msgstr "LiLo tekstiresiimis"
 
-#: ../../bootlook.pm_.c:184
+#: ../../bootloader.pm:1
 #, c-format
-msgid "Backup %s to %s.old"
-msgstr "Tee %s -st varukoopia %s.old"
+msgid "LILO with graphical menu"
+msgstr "LiLo graafikaresiimis"
 
-#: ../../bootlook.pm_.c:187
+#: ../../bootloader.pm:1
 #, c-format
-msgid "Copy %s to %s"
-msgstr "Tee %s -st koopia %s"
-
-#: ../../bootlook.pm_.c:192 ../../bootlook.pm_.c:222 ../../bootlook.pm_.c:224
-#: ../../bootlook.pm_.c:234 ../../bootlook.pm_.c:243 ../../bootlook.pm_.c:250
-#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:119
-#: ../../diskdrake/interactive.pm_.c:216 ../../diskdrake/interactive.pm_.c:352
-#: ../../diskdrake/interactive.pm_.c:367 ../../diskdrake/interactive.pm_.c:481
-#: ../../diskdrake/interactive.pm_.c:486 ../../diskdrake/smbnfs_gtk.pm_.c:45
-#: ../../fsedit.pm_.c:239 ../../install_steps.pm_.c:75
-#: ../../install_steps_interactive.pm_.c:67 ../../interactive/http.pm_.c:119
-#: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:21
-msgid "Error"
-msgstr "Viga"
-
-#: ../../bootlook.pm_.c:192
-msgid "Lilo message not found"
-msgstr "Lilo sõnumit ei leitud"
-
-#: ../../bootlook.pm_.c:222
-msgid "Can't write /etc/sysconfig/bootsplash."
-msgstr "/etc/sysconfig/bootsplash kirjutamine ebaõnnestus."
+msgid "SILO"
+msgstr "SILO"
 
-#: ../../bootlook.pm_.c:222
+# 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:1
 #, c-format
-msgid "Write %s"
-msgstr "Kirjuta %s"
-
-#: ../../bootlook.pm_.c:224
 msgid ""
-"Can't write /etc/sysconfig/bootsplash\n"
-"File not found."
+"Welcome to %s the operating system chooser!\n"
+"\n"
+"Choose an operating system from the list above or\n"
+"wait %d seconds for default boot.\n"
+"\n"
 msgstr ""
-"/etc/sysconfig/bootsplash kirjutamine ebaõnnestus\n"
-"Faili ei leitud."
+"Tere tulemast! Laadimisel aitab Teid %s!\n"
+"\n"
+"Valige nimekirjast eelistatav OS,\n"
+"vaikimisi oodake %d sekundit.\n"
+"\n"
 
-#: ../../bootlook.pm_.c:235
+#: ../../bootlook.pm:1 ../../ugtk2.pm:1 ../../ugtk.pm:1
+#: ../../network/netconnect.pm:1 ../../standalone/drakTermServ:1
+#: ../../standalone/drakbackup:1 ../../standalone/drakconnect:1
+#: ../../standalone/drakfont:1 ../../standalone/net_monitor:1
 #, c-format
-msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
-msgstr "Mkinitrd -f /boot/initrd-%s.img %s käivitamine ebaõnnestus."
+msgid "OK"
+msgstr "Olgu"
 
-#: ../../bootlook.pm_.c:238
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
-msgstr "Loo initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
-
-#: ../../bootlook.pm_.c:244
-msgid ""
-"Can't relaunch LiLo!\n"
-"Launch \"lilo\" as root in command line to complete LiLo theme installation."
+msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
-"LiLo taaskäivitamine ebaõnnestus!\n"
-"Käivitage \"lilo\" administraatorinia käsurealt LiLo teema paigaldamise "
-"lõpetamiseks."
-
-#: ../../bootlook.pm_.c:248
-msgid "Relaunch 'lilo'"
-msgstr "Taaskäivita 'lilo'"
-
-#: ../../bootlook.pm_.c:250 ../../standalone/draksplash_.c:156
-#: ../../standalone/draksplash_.c:321 ../../standalone/draksplash_.c:449
-msgid "Notice"
-msgstr "Märguanne"
-
-#: ../../bootlook.pm_.c:251
-msgid "LiLo and Bootsplash themes installation successfull"
-msgstr "LiLo ja käivituslogo teemade paigaldus õnnestus"
+"Jah, soovin automaatset sisselogimist sellele (kasutajale, keskkonnale)"
 
-#: ../../bootlook.pm_.c:251
-msgid "Theme installation failed!"
-msgstr "Teema paigaldamine ebaõnnestus!"
+#: ../../bootlook.pm:1
+#, c-format
+msgid "No, I don't want autologin"
+msgstr "Ei taha automaatselt siseneda"
 
-#: ../../bootlook.pm_.c:259
+#: ../../bootlook.pm:1
 #, c-format
-msgid ""
-"You are currently using %s as your boot manager.\n"
-"Click on Configure to launch the setup wizard."
-msgstr ""
-"Praegu on Teil alglaadimise haldurina kasutusel %s.\n"
-"Valige seadistamisnõustaja käivitamiseks 'Seadista'."
+msgid "Launch the graphical environment when your system starts"
+msgstr "Käivita X-Windows alglaadimisel"
 
-#: ../../bootlook.pm_.c:261 ../../standalone/drakbackup_.c:2380
-#: ../../standalone/drakbackup_.c:2390 ../../standalone/drakbackup_.c:2400
-#: ../../standalone/drakbackup_.c:2408 ../../standalone/drakgw_.c:551
-msgid "Configure"
-msgstr "Seadista"
+#: ../../bootlook.pm:1
+#, c-format
+msgid "System mode"
+msgstr "Töömood"
 
-#: ../../bootlook.pm_.c:268
-msgid "Splash selection"
-msgstr "Käivituslogo valik"
+#: ../../bootlook.pm:1
+#, c-format
+msgid "Bootsplash"
+msgstr "Käivituslogo"
 
-#: ../../bootlook.pm_.c:271
-msgid "Themes"
-msgstr "Teemad"
+#: ../../bootlook.pm:1
+#, c-format
+msgid "Lilo screen"
+msgstr "LiLo ekraan"
 
-#: ../../bootlook.pm_.c:273
+#: ../../bootlook.pm:1
+#, c-format
 msgid ""
 "\n"
-"Select theme for\n"
+"Select the theme for\n"
 "lilo and bootsplash,\n"
 "you can choose\n"
-"them separatly"
+"them separately"
 msgstr ""
 "\n"
-"Valige teema lilole\n"
+"Valige teema LiLo-le\n"
 "ja käivituslogole,\n"
 "neid võib valida\n"
 "ka eraldi"
 
-#: ../../bootlook.pm_.c:276
-msgid "Lilo screen"
-msgstr "Lilo ekraan"
-
-#: ../../bootlook.pm_.c:281
-msgid "Bootsplash"
-msgstr "Käivituslogo"
-
-#: ../../bootlook.pm_.c:316
-msgid "System mode"
-msgstr "Töömood"
-
-#: ../../bootlook.pm_.c:318
-msgid "Launch the graphical environment when your system starts"
-msgstr "Käivita X-Windows alglaadimisel"
-
-#: ../../bootlook.pm_.c:323
-msgid "No, I don't want autologin"
-msgstr "Ei taha automaatselt siseneda"
-
-#: ../../bootlook.pm_.c:325
-msgid "Yes, I want autologin with this (user, desktop)"
-msgstr ""
-"Jah, soovin automaatset sisselogimist sellele (kasutajale, keskkonnale)"
-
-#: ../../bootlook.pm_.c:335 ../../network/netconnect.pm_.c:96
-#: ../../standalone/drakTermServ_.c:222 ../../standalone/drakTermServ_.c:355
-#: ../../standalone/drakbackup_.c:4139 ../../standalone/drakbackup_.c:4797
-#: ../../standalone/drakconnect_.c:105 ../../standalone/drakconnect_.c:137
-#: ../../standalone/drakconnect_.c:293 ../../standalone/drakconnect_.c:432
-#: ../../standalone/drakconnect_.c:518 ../../standalone/drakconnect_.c:561
-#: ../../standalone/drakconnect_.c:665 ../../standalone/drakfont_.c:604
-#: ../../standalone/drakfont_.c:783 ../../standalone/drakfont_.c:911
-#: ../../standalone/net_monitor_.c:336 ../../ugtk.pm_.c:288
-#: ../../ugtk2.pm_.c:355
-msgid "OK"
-msgstr "Olgu"
-
-#: ../../common.pm_.c:107
-msgid "GB"
-msgstr "GB"
-
-#: ../../common.pm_.c:107
-msgid "KB"
-msgstr "KB"
-
-#: ../../common.pm_.c:107
-msgid "MB"
-msgstr "MB"
-
-#: ../../common.pm_.c:115
-msgid "TB"
-msgstr "TB"
-
-#: ../../common.pm_.c:123
+#: ../../bootlook.pm:1
 #, c-format
-msgid "%d minutes"
-msgstr "%d minutit"
-
-#: ../../common.pm_.c:125
-msgid "1 minute"
-msgstr "1 minut"
+msgid "Themes"
+msgstr "Teemad"
 
-#: ../../common.pm_.c:127
+#: ../../bootlook.pm:1
 #, c-format
-msgid "%d seconds"
-msgstr "%d sekundit"
-
-#: ../../common.pm_.c:172
-msgid "Can't make screenshots before partitioning"
-msgstr "Hetktõmmiseid ei saa teha enne partitsioneerimist"
+msgid "Splash selection"
+msgstr "Käivituslogo valik"
 
-#: ../../common.pm_.c:179
+#: ../../bootlook.pm:1 ../../standalone/drakbackup:1 ../../standalone/drakgw:1
 #, c-format
-msgid "Screenshots will be available after install in %s"
-msgstr "Hetktõmmised asuvad pärast paigaldust asukohas %s"
-
-#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:28 ../../network/tools.pm_.c:118
-#: ../../network/tools.pm_.c:127
-msgid "France"
-msgstr "Prantsusmaa"
-
-#: ../../crypto.pm_.c:15
-msgid "Costa Rica"
-msgstr "Costa Rica"
-
-#: ../../crypto.pm_.c:16 ../../crypto.pm_.c:29 ../../network/tools.pm_.c:118
-#: ../../network/tools.pm_.c:130
-msgid "Belgium"
-msgstr "Belgia"
-
-#: ../../crypto.pm_.c:17 ../../crypto.pm_.c:30
-msgid "Czech Republic"
-msgstr "Tšehhi"
-
-#: ../../crypto.pm_.c:18 ../../crypto.pm_.c:31
-msgid "Germany"
-msgstr "Saksamaa"
-
-#: ../../crypto.pm_.c:19 ../../crypto.pm_.c:32
-msgid "Greece"
-msgstr "Kreeka"
-
-#: ../../crypto.pm_.c:20 ../../crypto.pm_.c:33
-msgid "Norway"
-msgstr "Norra"
-
-#: ../../crypto.pm_.c:21 ../../crypto.pm_.c:34
-msgid "Sweden"
-msgstr "Rootsi"
-
-#: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36 ../../network/tools.pm_.c:118
-#: ../../network/tools.pm_.c:128
-msgid "Netherlands"
-msgstr "Holland"
-
-#: ../../crypto.pm_.c:23 ../../crypto.pm_.c:37 ../../network/tools.pm_.c:118
-#: ../../network/tools.pm_.c:129 ../../standalone/drakxtv_.c:65
-msgid "Italy"
-msgstr "Itaalia"
-
-#: ../../crypto.pm_.c:24 ../../crypto.pm_.c:38
-msgid "Austria"
-msgstr "Austria"
-
-#: ../../crypto.pm_.c:35 ../../crypto.pm_.c:61 ../../network/tools.pm_.c:118
-#: ../../network/tools.pm_.c:131
-msgid "United States"
-msgstr "USA"
-
-#: ../../diskdrake/dav.pm_.c:19
-msgid ""
-"WebDAV is a protocol that allows you to mount a web server's directory\n"
-"locally, and treat it like a local filesystem (provided the web server is\n"
-"configured as a WebDAV server). If you would like to add WebDAV mount\n"
-"points, select \"New\"."
-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 WebDAVi serverina). Kui soovite lisada\n"
-"WebDAVi haakepunkte, vajutage nupule \"Uus\"."
-
-#: ../../diskdrake/dav.pm_.c:27
-msgid "New"
-msgstr "Uus"
-
-#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:400
-#: ../../diskdrake/smbnfs_gtk.pm_.c:81
-msgid "Unmount"
-msgstr "Lahuta"
-
-#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:397
-#: ../../diskdrake/smbnfs_gtk.pm_.c:82
-msgid "Mount"
-msgstr "Haagi"
-
-#: ../../diskdrake/dav.pm_.c:65
-msgid "Server"
-msgstr "Server"
-
-#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:391
-#: ../../diskdrake/interactive.pm_.c:580 ../../diskdrake/interactive.pm_.c:607
-#: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/smbnfs_gtk.pm_.c:85
-msgid "Mount point"
-msgstr "Haakepunkt"
-
-#: ../../diskdrake/dav.pm_.c:85
-msgid "Please enter the WebDAV server URL"
-msgstr "Palun sisestage WebDAV-serveri URL"
-
-#: ../../diskdrake/dav.pm_.c:88
-msgid "The URL must begin with http:// or https://"
-msgstr "URL peab algama kas http:// või https://"
-
-#: ../../diskdrake/dav.pm_.c:109
-msgid "Server: "
-msgstr "Server: "
-
-#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:452
-#: ../../diskdrake/interactive.pm_.c:1102
-#: ../../diskdrake/interactive.pm_.c:1177
-msgid "Mount point: "
-msgstr "Haakepunkt:"
+msgid "Configure"
+msgstr "Seadista"
 
-#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1183
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Options: %s"
-msgstr "Eelistused: %s"
-
-#: ../../diskdrake/hd_gtk.pm_.c:97
-msgid "Please make a backup of your data first"
-msgstr "Palun tehke oma andmetest kõigepealt varukoopia"
-
-#: ../../diskdrake/hd_gtk.pm_.c:97 ../../diskdrake/interactive.pm_.c:946
-#: ../../diskdrake/interactive.pm_.c:956
-#: ../../diskdrake/interactive.pm_.c:1022
-msgid "Read carefully!"
-msgstr "Lugege hoolega!"
-
-#: ../../diskdrake/hd_gtk.pm_.c:100
 msgid ""
-"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
-"enough)\n"
-"at the beginning of the disk"
-msgstr ""
-"Kui soovite kasutada aboot-i, jätke palun ketta algusesse vähemalt 2048 \n"
-"sektorit vaba ruumi"
-
-#: ../../diskdrake/hd_gtk.pm_.c:154
-msgid "Wizard"
-msgstr "Nõustaja"
-
-#: ../../diskdrake/hd_gtk.pm_.c:187
-msgid "Choose action"
-msgstr "Valige tegevus"
-
-#: ../../diskdrake/hd_gtk.pm_.c:191
-msgid ""
-"You have one big FAT partition\n"
-"(generally used by MicroSoft Dos/Windows).\n"
-"I suggest you first resize that partition\n"
-"(click on it, then click on \"Resize\")"
+"You are currently using %s as your boot manager.\n"
+"Click on Configure to launch the setup wizard."
 msgstr ""
-"Teil on üks suur FAT partitsioon\n"
-"(tavaliselt kasutab sellist MS DOS/Windows)\n"
-"Soovitame teil esmalt selle suurust muuta\n"
-"(klõpsake ja siis valige \"Muuda\")"
-
-#: ../../diskdrake/hd_gtk.pm_.c:194
-msgid "Please click on a partition"
-msgstr "Palun valige partitsioon"
-
-#: ../../diskdrake/hd_gtk.pm_.c:208 ../../diskdrake/smbnfs_gtk.pm_.c:69
-#: ../../install_steps_gtk.pm_.c:464
-msgid "Details"
-msgstr "Üksikasjad"
-
-#: ../../diskdrake/hd_gtk.pm_.c:254
-msgid "No hard drives found"
-msgstr "Kõvakettaid ei leitud"
-
-#: ../../diskdrake/hd_gtk.pm_.c:325
-msgid "Ext2"
-msgstr "Ext2"
-
-#: ../../diskdrake/hd_gtk.pm_.c:325
-msgid "FAT"
-msgstr "FAT"
-
-#: ../../diskdrake/hd_gtk.pm_.c:325
-msgid "HFS"
-msgstr "HFS"
-
-#: ../../diskdrake/hd_gtk.pm_.c:325
-msgid "Journalised FS"
-msgstr "Kirjendatud FS"
-
-#: ../../diskdrake/hd_gtk.pm_.c:325
-msgid "SunOS"
-msgstr "SunOS"
-
-#: ../../diskdrake/hd_gtk.pm_.c:325
-msgid "Swap"
-msgstr "Saaleala"
-
-#: ../../diskdrake/hd_gtk.pm_.c:326 ../../diskdrake/interactive.pm_.c:1118
-msgid "Empty"
-msgstr "Tühi"
-
-#: ../../diskdrake/hd_gtk.pm_.c:326 ../../install_steps_gtk.pm_.c:324
-#: ../../install_steps_gtk.pm_.c:382 ../../mouse.pm_.c:165
-#: ../../services.pm_.c:162 ../../standalone/drakbackup_.c:1719
-msgid "Other"
-msgstr "Muu"
-
-#: ../../diskdrake/hd_gtk.pm_.c:330
-msgid "Filesystem types:"
-msgstr "Failisüsteemi tüübid: "
-
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:414
-msgid "Create"
-msgstr "Tekita"
-
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:392
-#: ../../diskdrake/interactive.pm_.c:543 ../../diskdrake/removable.pm_.c:26
-#: ../../diskdrake/removable.pm_.c:49 ../../standalone/harddrake2_.c:66
-msgid "Type"
-msgstr "Tüüp"
+"Praegu on Teil alglaadimise haldurina kasutusel %s.\n"
+"Valige seadistamisnõustaja käivitamiseks 'Seadista'."
 
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/hd_gtk.pm_.c:349
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Use ``%s'' instead"
-msgstr "Kasutage pigem ``%s''"
-
-#: ../../diskdrake/hd_gtk.pm_.c:349 ../../diskdrake/interactive.pm_.c:401
-msgid "Delete"
-msgstr "Kustuta"
-
-#: ../../diskdrake/hd_gtk.pm_.c:353
-msgid "Use ``Unmount'' first"
-msgstr "Kasutage enne \"Lahuta\""
+msgid "LiLo and Bootsplash themes installation successfull"
+msgstr "LiLo ja käivituslogo teemade paigaldus õnnestus"
 
-#: ../../diskdrake/hd_gtk.pm_.c:354 ../../diskdrake/interactive.pm_.c:530
+#: ../../bootlook.pm:1
 #, 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_.c:177
-msgid "Choose a partition"
-msgstr "Valige partitsioon"
-
-#: ../../diskdrake/interactive.pm_.c:177
-msgid "Choose another partition"
-msgstr "Valige muu partitsioon"
-
-#: ../../diskdrake/interactive.pm_.c:202
-msgid "Exit"
-msgstr "Välju"
-
-#: ../../diskdrake/interactive.pm_.c:228
-msgid "Toggle to expert mode"
-msgstr "Tavakasutaja > Ekspert"
-
-#: ../../diskdrake/interactive.pm_.c:228
-msgid "Toggle to normal mode"
-msgstr "Ekspert > Tavakasutaja"
-
-#: ../../diskdrake/interactive.pm_.c:228
-msgid "Undo"
-msgstr "Tagasi"
-
-#: ../../diskdrake/interactive.pm_.c:247
-msgid "Continue anyway?"
-msgstr "Kas ikkagi jätkata?"
-
-#: ../../diskdrake/interactive.pm_.c:252
-msgid "Quit without saving"
-msgstr "Välju ilma salvestamata"
-
-#: ../../diskdrake/interactive.pm_.c:252
-msgid "Quit without writing the partition table?"
-msgstr "Kas väljuda partitsioonitabelit salvestamata?"
-
-#: ../../diskdrake/interactive.pm_.c:257
-msgid "Do you want to save /etc/fstab modifications"
-msgstr "Kas salvestada /etc/fstab muudatused"
-
-#: ../../diskdrake/interactive.pm_.c:271
-msgid "Clear all"
-msgstr "Kustuta kõik"
-
-#: ../../diskdrake/interactive.pm_.c:272
-msgid "Auto allocate"
-msgstr "Paiguta ise"
-
-#: ../../diskdrake/interactive.pm_.c:273
-#: ../../install_steps_interactive.pm_.c:220
-msgid "More"
-msgstr "Veel..."
-
-#: ../../diskdrake/interactive.pm_.c:278
-msgid "Hard drive information"
-msgstr "Kõvaketta info"
-
-#: ../../diskdrake/interactive.pm_.c:310
-msgid "All primary partitions are used"
-msgstr "Kõik primaarsed partitsioonid on kasutusel"
-
-#: ../../diskdrake/interactive.pm_.c:311
-msgid "I can't add any more partition"
-msgstr "Partitsioone ei saa enam lisada"
-
-#: ../../diskdrake/interactive.pm_.c:312
-msgid ""
-"To have more partitions, please delete one to be able to create an extended "
-"partition"
-msgstr ""
-"Et saada rohkem partitsioone, kustutage palun üks, et luua laiendatud "
-"partitsioon"
-
-#: ../../diskdrake/interactive.pm_.c:322
-msgid "Save partition table"
-msgstr "Kirjuta partitsioonitabel"
-
-#: ../../diskdrake/interactive.pm_.c:323
-msgid "Restore partition table"
-msgstr "Taasta partitsioonitabel"
-
-#: ../../diskdrake/interactive.pm_.c:324
-msgid "Rescue partition table"
-msgstr "Päästa partitsioonitabel"
-
-#: ../../diskdrake/interactive.pm_.c:326
-msgid "Reload partition table"
-msgstr "Laadi partitsioonitabel uuesti"
-
-#: ../../diskdrake/interactive.pm_.c:331
-msgid "Removable media automounting"
-msgstr "Eemaldatava andmekandja autohaakimine"
-
-#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:360
-msgid "Select file"
-msgstr "Valige fail"
-
-#: ../../diskdrake/interactive.pm_.c:347
-msgid ""
-"The backup partition table has not the same size\n"
-"Still continue?"
-msgstr ""
-"Tabeli varukoopia ei ole sama suurusega\n"
-"Kas ikkagi jätkata?"
-
-#: ../../diskdrake/interactive.pm_.c:361 ../../harddrake/sound.pm_.c:202
-#: ../../network/modem.pm_.c:95
-msgid "Warning"
-msgstr "Hoiatus"
-
-#: ../../diskdrake/interactive.pm_.c:362
-msgid ""
-"Insert a floppy in drive\n"
-"All data on this floppy will be lost"
-msgstr ""
-"Pange tühi flopi masinasse\n"
-"Kõik andmed sellel hävivad"
-
-#: ../../diskdrake/interactive.pm_.c:373
-msgid "Trying to rescue partition table"
-msgstr "Proovin päästa partitsioonitabelit"
-
-#: ../../diskdrake/interactive.pm_.c:379
-msgid "Detailed information"
-msgstr "Üksikasjalik info"
-
-#: ../../diskdrake/interactive.pm_.c:394 ../../diskdrake/interactive.pm_.c:674
-msgid "Resize"
-msgstr "Muuda suurust"
-
-#: ../../diskdrake/interactive.pm_.c:395 ../../diskdrake/interactive.pm_.c:727
-msgid "Move"
-msgstr "Liiguta"
-
-#: ../../diskdrake/interactive.pm_.c:396
-msgid "Format"
-msgstr "Vorminda"
-
-#: ../../diskdrake/interactive.pm_.c:398
-msgid "Add to RAID"
-msgstr "Lisa RAIDi"
-
-#: ../../diskdrake/interactive.pm_.c:399
-msgid "Add to LVM"
-msgstr "Lisa LVMi"
-
-#: ../../diskdrake/interactive.pm_.c:402
-msgid "Remove from RAID"
-msgstr "Eemalda RAIDist"
-
-#: ../../diskdrake/interactive.pm_.c:403
-msgid "Remove from LVM"
-msgstr "Eemalda LVMist"
-
-#: ../../diskdrake/interactive.pm_.c:404
-msgid "Modify RAID"
-msgstr "Modifitseeri RAIDi"
-
-#: ../../diskdrake/interactive.pm_.c:405
-msgid "Use for loopback"
-msgstr "Kasuta loopback-ina"
-
-#: ../../diskdrake/interactive.pm_.c:445
-msgid "Create a new partition"
-msgstr "Loo uus partitsioon"
-
-#: ../../diskdrake/interactive.pm_.c:448
-msgid "Start sector: "
-msgstr "Algsektor: "
-
-#: ../../diskdrake/interactive.pm_.c:450 ../../diskdrake/interactive.pm_.c:827
-msgid "Size in MB: "
-msgstr "Suurus (MB): "
-
-#: ../../diskdrake/interactive.pm_.c:451 ../../diskdrake/interactive.pm_.c:828
-msgid "Filesystem type: "
-msgstr "Failisüsteemi tüüp: "
-
-#: ../../diskdrake/interactive.pm_.c:456
-msgid "Preference: "
-msgstr "Eelistus: "
-
-#: ../../diskdrake/interactive.pm_.c:481
-msgid ""
-"You can't 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"
-"Eemaldage kõigepealt mõni primaarne partitsioon ja \n"
-"tekitage laiendatud partitsioon."
-
-#: ../../diskdrake/interactive.pm_.c:511
-msgid "Remove the loopback file?"
-msgstr "Kas eemaldada loopback fail?"
-
-#: ../../diskdrake/interactive.pm_.c:541
-msgid "Change partition type"
-msgstr "Muuda partitsiooni tüüpi"
-
-#: ../../diskdrake/interactive.pm_.c:542 ../../diskdrake/removable.pm_.c:48
-msgid "Which filesystem do you want?"
-msgstr "Millist failisüsteemi soovite kasutada?"
+msgid "Theme installation failed!"
+msgstr "Teema paigaldamine ebaõnnestus!"
 
-#: ../../diskdrake/interactive.pm_.c:548
-msgid "Switching from ext2 to ext3"
-msgstr "Ext2 vahetamine ext3 vastu"
+#: ../../bootlook.pm:1 ../../standalone/draksplash:1
+#, c-format
+msgid "Notice"
+msgstr "Märguanne"
 
-#: ../../diskdrake/interactive.pm_.c:578
+#: ../../bootlook.pm:1 ../../fsedit.pm:1 ../../install_steps_interactive.pm:1
+#: ../../install_steps.pm:1 ../../diskdrake/dav.pm:1
+#: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
+#: ../../diskdrake/smbnfs_gtk.pm:1 ../../interactive/http.pm:1
+#: ../../standalone/draksplash:1
 #, c-format
-msgid "Where do you want to mount loopback file %s?"
-msgstr "Kuhu soovite haakida loopback-faili %s?"
+msgid "Error"
+msgstr "Viga"
 
-#: ../../diskdrake/interactive.pm_.c:579
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Where do you want to mount device %s?"
-msgstr "Kuhu soovite haakida seadme %s?"
+msgid "Relaunch 'lilo'"
+msgstr "Taaskäivita 'lilo'"
 
-#: ../../diskdrake/interactive.pm_.c:585
+#: ../../bootlook.pm:1
+#, c-format
 msgid ""
-"Can't unset mount point as this partition is used for loop back.\n"
-"Remove the loopback first"
+"Can't relaunch LiLo!\n"
+"Launch \"lilo\" as root in command line to complete LiLo theme installation."
 msgstr ""
-"Seda haakepunkti ei saa eemaldada, sest partitsioon on kasutusel\n"
-"loopback-ina. Eemaldage esmalt loopback"
+"LiLo taaskäivitamine ebaõnnestus!\n"
+"Käivitage \"lilo\" administraatorina käsurealt LiLo teema paigaldamise "
+"lõpetamiseks."
 
-#: ../../diskdrake/interactive.pm_.c:606
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Where do you want to mount %s?"
-msgstr "Kuhu soovite haakida %s?"
-
-#: ../../diskdrake/interactive.pm_.c:630
-msgid "Computing FAT filesystem bounds"
-msgstr "Arvutan FAT failisüsteemi piire"
-
-#: ../../diskdrake/interactive.pm_.c:630 ../../diskdrake/interactive.pm_.c:689
-#: ../../install_interactive.pm_.c:131
-msgid "Resizing"
-msgstr "Muudan suurust"
-
-#: ../../diskdrake/interactive.pm_.c:662
-msgid "This partition is not resizeable"
-msgstr "See partitsioon ei ole muudetav"
-
-#: ../../diskdrake/interactive.pm_.c:667
-msgid "All data on this partition should be backed-up"
-msgstr "Selle partitsiooni andmetest võiks olla varukoopia"
+msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
+msgstr "Loo initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
 
-#: ../../diskdrake/interactive.pm_.c:669
+#: ../../bootlook.pm:1
 #, 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_.c:674
-msgid "Choose the new size"
-msgstr "Valige uus suurus"
-
-#: ../../diskdrake/interactive.pm_.c:675
-msgid "New size in MB: "
-msgstr "Uus suurus (MB): "
-
-#: ../../diskdrake/interactive.pm_.c:728
-msgid "Which disk do you want to move it to?"
-msgstr "Millisele kettale soovite seda ümber paigutada?"
-
-#: ../../diskdrake/interactive.pm_.c:729
-msgid "Sector"
-msgstr "Sektor"
-
-#: ../../diskdrake/interactive.pm_.c:730
-msgid "Which sector do you want to move it to?"
-msgstr "Millisele sektorile soovite seda ümber paigutada?"
-
-#: ../../diskdrake/interactive.pm_.c:733
-msgid "Moving"
-msgstr "Paigutan ümber"
-
-#: ../../diskdrake/interactive.pm_.c:733
-msgid "Moving partition..."
-msgstr "Liigutan partitsiooni..."
-
-#: ../../diskdrake/interactive.pm_.c:750
-msgid "Choose an existing RAID to add to"
-msgstr "Vali olemasolev RAID, millele lisada"
-
-#: ../../diskdrake/interactive.pm_.c:751 ../../diskdrake/interactive.pm_.c:768
-msgid "new"
-msgstr "uus"
-
-#: ../../diskdrake/interactive.pm_.c:766
-msgid "Choose an existing LVM to add to"
-msgstr "Vali olemasolev LVM, millele lisada"
-
-#: ../../diskdrake/interactive.pm_.c:771
-msgid "LVM name?"
-msgstr "LVM nimi?"
-
-#: ../../diskdrake/interactive.pm_.c:812
-msgid "This partition can't be used for loopback"
-msgstr "Seda partitsiooni ei saa loopback-ina kasutada"
-
-#: ../../diskdrake/interactive.pm_.c:825
-msgid "Loopback"
-msgstr "Loopback"
-
-#: ../../diskdrake/interactive.pm_.c:826
-msgid "Loopback file name: "
-msgstr "Loopback faili nimi:"
-
-#: ../../diskdrake/interactive.pm_.c:831
-msgid "Give a file name"
-msgstr "Failinimi"
-
-#: ../../diskdrake/interactive.pm_.c:834
-msgid "File already used by another loopback, choose another one"
-msgstr "See fail on juba loopback-ina kasutusel, valige mõni muu"
-
-#: ../../diskdrake/interactive.pm_.c:835
-msgid "File already exists. Use it?"
-msgstr "Fail on juba olemas. Kas kasutada seda?"
-
-#: ../../diskdrake/interactive.pm_.c:858
-msgid "Mount options"
-msgstr "Haakimise valikud"
-
-#: ../../diskdrake/interactive.pm_.c:865
-msgid "Various"
-msgstr "Mitmesugust"
-
-#: ../../diskdrake/interactive.pm_.c:929 ../../standalone/drakfloppy_.c:76
-msgid "device"
-msgstr "seade"
-
-#: ../../diskdrake/interactive.pm_.c:930
-msgid "level"
-msgstr "tase"
-
-#: ../../diskdrake/interactive.pm_.c:931
-msgid "chunk size"
-msgstr "ühiku suurus"
-
-#: ../../diskdrake/interactive.pm_.c:947
-msgid "Be careful: this operation is dangerous."
-msgstr "Vaadake ette: see võib olla ohtlik."
-
-#: ../../diskdrake/interactive.pm_.c:962
-msgid "What type of partitioning?"
-msgstr "Mis tüüpi partitsioonid teete?"
+msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
+msgstr "mkinitrd -f /boot/initrd-%s.img %s käivitamine ebaõnnestus."
 
-#: ../../diskdrake/interactive.pm_.c:978
+#: ../../bootlook.pm:1
 #, c-format
-msgid "The package %s is needed. Install it?"
-msgstr "Vajalik on pakett %s. Kas paigaldada see?"
-
-#: ../../diskdrake/interactive.pm_.c:992
 msgid ""
-"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
-"1024).\n"
-"Either you use LILO and it won't work, or you don't use LILO and you don't "
-"need /boot"
-msgstr ""
-"Vabandust, aga ei saa nõustuda /boot kataloogi paigutamisega kaugemale "
-"silindrist 1024.\n"
-"Kui kasutate LILO-t, ei tööta see sel moel, kui aga ei kasuta, ei ole Teile "
-"ka /boot vajalik"
-
-#: ../../diskdrake/interactive.pm_.c:996
-msgid ""
-"The partition you've selected to add as root (/) is physically located "
-"beyond\n"
-"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
-"If you plan to use the LILO boot manager, be careful to add a /boot partition"
-msgstr ""
-"Partitsioon, mida soovite kasutada juurkataloogi (/) hoidmiseks, asub\n"
-"füüsiliselt tagapool silindrit 1024 ja Teil ei ole /boot partitsiooni.\n"
-"Kui plaanite kasutada LILO alglaadurit, lisage kindlasti /boot partitsioon"
-
-#: ../../diskdrake/interactive.pm_.c:1002
-msgid ""
-"You've selected a software RAID partition as root (/).\n"
-"No bootloader is able to handle this without a /boot partition.\n"
-"So be careful to add a /boot partition"
+"Can't write /etc/sysconfig/bootsplash\n"
+"File not found."
 msgstr ""
-"Olete valinud juurpartitsiooniks (/) tarkvaralise RAID-i.\n"
-"Ilma /boot partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
-"Lisage kindlasti /boot partitsioon!"
+"/etc/sysconfig/bootsplash kirjutamine ebaõnnestus\n"
+"Faili ei leitud."
 
-#: ../../diskdrake/interactive.pm_.c:1022
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Partition table of drive %s is going to be written to disk!"
-msgstr "Ketta %s partitsioonitabel salvestatakse!"
-
-#: ../../diskdrake/interactive.pm_.c:1026
-msgid "You'll need to reboot before the modification can take place"
-msgstr "Muudatuste rakendamiseks vajate alglaadimist"
+msgid "Write %s"
+msgstr "Kirjuta %s"
 
-#: ../../diskdrake/interactive.pm_.c:1037
+#: ../../bootlook.pm:1
 #, 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_.c:1039
-msgid "Formatting"
-msgstr "Vormindan"
+msgid "Can't write /etc/sysconfig/bootsplash."
+msgstr "/etc/sysconfig/bootsplash kirjutamine ebaõnnestus."
 
-#: ../../diskdrake/interactive.pm_.c:1040
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Formatting loopback file %s"
-msgstr "Vormindan loopback faili %s"
+msgid "Lilo message not found"
+msgstr "LiLo sõnumit ei leitud"
 
-#: ../../diskdrake/interactive.pm_.c:1041
-#: ../../install_steps_interactive.pm_.c:466
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Formatting partition %s"
-msgstr "Vormindan partitsiooni %s"
+msgid "Copy %s to %s"
+msgstr "Tee %s -st koopia %s"
 
-#: ../../diskdrake/interactive.pm_.c:1052
-msgid "Hide files"
-msgstr "Failide peitmine"
+#: ../../bootlook.pm:1
+#, c-format
+msgid "Backup %s to %s.old"
+msgstr "Tee %s -st varukoopia %s.old"
 
-#: ../../diskdrake/interactive.pm_.c:1052
-msgid "Move files to the new partition"
-msgstr "Liiguta failid uuele partitsioonile"
+#: ../../bootlook.pm:1
+#, c-format
+msgid "Create new theme"
+msgstr "Uue teema loomine"
 
-#: ../../diskdrake/interactive.pm_.c:1053
+#: ../../bootlook.pm:1
 #, c-format
 msgid ""
-"Directory %s already contains data\n"
-"(%s)"
+"Display theme\n"
+"under console"
 msgstr ""
-"Kataloogis %s on juba andmed\n"
-"(%s)"
-
-#: ../../diskdrake/interactive.pm_.c:1064
-msgid "Moving files to the new partition"
-msgstr "Failide liigutamine uuele partitsioonile"
+"Teema näitamine\n"
+"konsoolis"
 
-#: ../../diskdrake/interactive.pm_.c:1068
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Copying %s"
-msgstr "%s kopeerimine"
+msgid "Install themes"
+msgstr "Teemade paigaldamine"
 
-#: ../../diskdrake/interactive.pm_.c:1072
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Removing %s"
-msgstr "%s eemaldamine"
+msgid "Lilo/grub mode"
+msgstr "LiLo/grub resiim"
 
-#: ../../diskdrake/interactive.pm_.c:1082
+#: ../../bootlook.pm:1
 #, c-format
-msgid "partition %s is now known as %s"
-msgstr "partitsioon %s kannab nüüd nime %s"
-
-#: ../../diskdrake/interactive.pm_.c:1103
-#: ../../diskdrake/interactive.pm_.c:1162
-msgid "Device: "
-msgstr "Seade: "
+msgid "Yaboot mode"
+msgstr "Yaboot resiim"
 
-#: ../../diskdrake/interactive.pm_.c:1104
+#: ../../bootlook.pm:1
 #, c-format
-msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS kettatähis: %s (arvatavasti)\n"
-
-#: ../../diskdrake/interactive.pm_.c:1108
-#: ../../diskdrake/interactive.pm_.c:1116
-#: ../../diskdrake/interactive.pm_.c:1181
-msgid "Type: "
-msgstr "Tüüp: "
+msgid "Launch Aurora at boot time"
+msgstr "Käivita alglaadimisel Aurora"
 
-#: ../../diskdrake/interactive.pm_.c:1112
-msgid "Name: "
-msgstr "Nimi: "
+#: ../../bootlook.pm:1
+#, c-format
+msgid "Traditional Gtk+ Monitor"
+msgstr "Traditsiooniline Gtk+ jälgimine"
 
-#: ../../diskdrake/interactive.pm_.c:1120
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Start: sector %s\n"
-msgstr "Algus: sektor %s\n"
+msgid "Traditional Monitor"
+msgstr "Tavaline jälgimine"
 
-#: ../../diskdrake/interactive.pm_.c:1121
+#: ../../bootlook.pm:1
 #, c-format
-msgid "Size: %s"
-msgstr "Suurus: %s"
+msgid "NewStyle Monitor"
+msgstr "NewStyle jälgimine"
 
-#: ../../diskdrake/interactive.pm_.c:1123
+#: ../../bootlook.pm:1
 #, c-format
-msgid ", %s sectors"
-msgstr ", %s sektorit"
+msgid "NewStyle Categorizing Monitor"
+msgstr "NewStyle kategoriseeritud jälgimine"
 
-#: ../../diskdrake/interactive.pm_.c:1125
+#: ../../bootlook.pm:1 ../../standalone/drakfloppy:1
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
 #, c-format
-msgid "Cylinder %d to %d\n"
-msgstr "Silindrid %d kuni %d\n"
+msgid "<control>Q"
+msgstr "<control>Q"
 
-#: ../../diskdrake/interactive.pm_.c:1126
-msgid "Formatted\n"
-msgstr "Vormindatud\n"
+#: ../../bootlook.pm:1 ../../standalone/drakfloppy:1
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/File/_Quit"
+msgstr "/Fail/_Välju"
 
-#: ../../diskdrake/interactive.pm_.c:1127
-msgid "Not formatted\n"
-msgstr "Vormindamata\n"
+#: ../../bootlook.pm:1 ../../standalone/drakfloppy:1
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#, c-format
+msgid "/_File"
+msgstr "/_Fail"
 
-#: ../../diskdrake/interactive.pm_.c:1128
-msgid "Mounted\n"
-msgstr "Haagitud\n"
+#: ../../bootlook.pm:1
+#, c-format
+msgid "Boot Style Configuration"
+msgstr "Alglaaduri stiil"
 
-#: ../../diskdrake/interactive.pm_.c:1129
+#: ../../common.pm:1
 #, c-format
-msgid "RAID md%s\n"
-msgstr "RAID md%s\n"
+msgid "consolehelper missing"
+msgstr "consolehelper puudub"
 
-#: ../../diskdrake/interactive.pm_.c:1131
+#: ../../common.pm:1
 #, c-format
-msgid ""
-"Loopback file(s):\n"
-"   %s\n"
-msgstr ""
-"Loopback fail(id):\n"
-"   %s\n"
+msgid "kdesu missing"
+msgstr "kdesu puudub"
 
-#: ../../diskdrake/interactive.pm_.c:1132
-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"
+#: ../../common.pm:1
+#, c-format
+msgid "Screenshots will be available after install in %s"
+msgstr "Hetktõmmised asuvad pärast paigaldust asukohas %s"
 
-#: ../../diskdrake/interactive.pm_.c:1134
+#: ../../common.pm:1
 #, c-format
-msgid "Level %s\n"
-msgstr "Tase %s\n"
+msgid "Can't make screenshots before partitioning"
+msgstr "Hetktõmmiseid ei saa teha enne partitsioneerimist"
 
-#: ../../diskdrake/interactive.pm_.c:1135
+#: ../../common.pm:1
 #, c-format
-msgid "Chunk size %s\n"
-msgstr "Ühiku suurus %s\n"
+msgid "%d seconds"
+msgstr "%d sekundit"
 
-#: ../../diskdrake/interactive.pm_.c:1136
+#: ../../common.pm:1
 #, c-format
-msgid "RAID-disks %s\n"
-msgstr "RAID-kettad %s\n"
+msgid "1 minute"
+msgstr "1 minut"
 
-#: ../../diskdrake/interactive.pm_.c:1138
+#: ../../common.pm:1
 #, c-format
-msgid "Loopback file name: %s"
-msgstr "Loopback faili nimi: %s"
+msgid "%d minutes"
+msgstr "%d minutit"
 
-#: ../../diskdrake/interactive.pm_.c:1141
-msgid ""
-"\n"
-"Chances are, this partition is\n"
-"a Driver partition, you should\n"
-"probably leave it alone.\n"
-msgstr ""
-"\n"
-"Võimalik, et on tegemist\n"
-"juhtpartitsiooniga, parem oleks\n"
-"seda mitte puutuda.\n"
+#: ../../common.pm:1
+#, c-format
+msgid "TB"
+msgstr "TB"
 
-#: ../../diskdrake/interactive.pm_.c:1144
-msgid ""
-"\n"
-"This special Bootstrap\n"
-"partition is for\n"
-"dual-booting your system.\n"
-msgstr ""
-"\n"
-"See on eriline, alglaadimisel\n"
-"kasutatav partitsioon, mis\n"
-"võimaldab mitme operatsioonisüsteemi\n"
-"laadimist.\n"
+#: ../../common.pm:1
+#, c-format
+msgid "GB"
+msgstr "GB"
 
-#: ../../diskdrake/interactive.pm_.c:1163
-msgid "Read-only"
-msgstr "Ainult lugemisõigusega"
+#: ../../common.pm:1
+#, c-format
+msgid "MB"
+msgstr "MB"
 
-#: ../../diskdrake/interactive.pm_.c:1164
+#: ../../common.pm:1
 #, c-format
-msgid "Size: %s\n"
-msgstr "Suurus: %s\n"
+msgid "KB"
+msgstr "KB"
 
-#: ../../diskdrake/interactive.pm_.c:1165
+#: ../../crypto.pm:1 ../../lang.pm:1 ../../network/tools.pm:1
 #, c-format
-msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
-msgstr "Geomeetria: %s silindrit, %s pead, %s sektorit\n"
+msgid "United States"
+msgstr "USA"
 
-#: ../../diskdrake/interactive.pm_.c:1166
-msgid "Info: "
-msgstr "Info: "
+#: ../../crypto.pm:1 ../../lang.pm:1
+#, c-format
+msgid "Austria"
+msgstr "Austria"
 
-#: ../../diskdrake/interactive.pm_.c:1167
+#: ../../crypto.pm:1 ../../lang.pm:1 ../../network/tools.pm:1
+#: ../../standalone/drakxtv:1
 #, c-format
-msgid "LVM-disks %s\n"
-msgstr "LVM-kettad %s\n"
+msgid "Italy"
+msgstr "Itaalia"
 
-#: ../../diskdrake/interactive.pm_.c:1168
+#: ../../crypto.pm:1 ../../lang.pm:1 ../../network/tools.pm:1
 #, c-format
-msgid "Partition table type: %s\n"
-msgstr "Partitsioonitabeli tüüp: %s\n"
+msgid "Netherlands"
+msgstr "Holland"
 
-#: ../../diskdrake/interactive.pm_.c:1169
+#: ../../crypto.pm:1 ../../lang.pm:1
 #, c-format
-msgid "on channel %d id %d\n"
-msgstr "kanalil %d id %d\n"
+msgid "Sweden"
+msgstr "Rootsi"
 
-#: ../../diskdrake/interactive.pm_.c:1199
-msgid "Filesystem encryption key"
-msgstr "Failisüsteemi krüptovõti"
+#: ../../crypto.pm:1 ../../lang.pm:1
+#, c-format
+msgid "Norway"
+msgstr "Norra"
 
-#: ../../diskdrake/interactive.pm_.c:1200
-msgid "Choose your filesystem encryption key"
-msgstr "Valige failisüsteemi krüptovõti"
+#: ../../crypto.pm:1 ../../lang.pm:1
+#, c-format
+msgid "Greece"
+msgstr "Kreeka"
 
-#: ../../diskdrake/interactive.pm_.c:1203
+#: ../../crypto.pm:1 ../../lang.pm:1
 #, 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)"
+msgid "Germany"
+msgstr "Saksamaa"
 
-#: ../../diskdrake/interactive.pm_.c:1204
-msgid "The encryption keys do not match"
-msgstr "Krüptovõtmed ei klapi"
+#: ../../crypto.pm:1 ../../lang.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "Tšehhi"
 
-#: ../../diskdrake/interactive.pm_.c:1207
-msgid "Encryption key"
-msgstr "Krüptovõti"
+#: ../../crypto.pm:1 ../../lang.pm:1 ../../network/tools.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "Belgia"
 
-#: ../../diskdrake/interactive.pm_.c:1208
-msgid "Encryption key (again)"
-msgstr "Krüptovõti (uuesti)"
+#: ../../crypto.pm:1 ../../lang.pm:1 ../../network/tools.pm:1
+#, c-format
+msgid "France"
+msgstr "Prantsusmaa"
 
-#: ../../diskdrake/removable.pm_.c:47
-msgid "Change type"
-msgstr "Muuda tüüpi"
+#: ../../crypto.pm:1 ../../lang.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "Costa Rica"
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:162
+#: ../../fsedit.pm:1
 #, c-format
-msgid "Can't login using username %s (bad password?)"
-msgstr "Sisselogimine kasutajanimega %s ebaõnnestus (vale parool?)"
+msgid "Error opening %s for writing: %s"
+msgstr "%s avamine kirjutamiseks ebaõnnestus: %s"
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:166 ../../diskdrake/smbnfs_gtk.pm_.c:175
-msgid "Domain Authentication Required"
-msgstr "Nõutav on domeeni autentimine"
+#: ../../fsedit.pm:1
+#, c-format
+msgid "Nothing to do"
+msgstr "Pole midagi teha"
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:167
-msgid "Another one"
-msgstr "Veel üks"
+#: ../../fsedit.pm:1
+#, c-format
+msgid "Not enough free space for auto-allocating"
+msgstr "Ei ole piisavalt ruumi automaatpaigutuseks"
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:167
-msgid "Which username"
-msgstr "Milline kasutajanimi"
+#: ../../fsedit.pm:1
+#, c-format
+msgid "You can't use an encrypted file system for mount point %s"
+msgstr "Te ei saa haakepunkti %s jaoks kasutada krüptitud failisüsteemi"
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:176
+#: ../../fsedit.pm:1
+#, c-format
 msgid ""
-"Please enter your username, password and domain name to access this host."
+"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
+"point\n"
 msgstr ""
-"Palun sisestage sellele masinale ligipääsuks oma kasutajanimi, parool ja "
-"domeeni nimi."
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3477
-msgid "Username"
-msgstr "Kasutajanimi"
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:180
-msgid "Domain"
-msgstr "Domeen"
-
-#: ../../diskdrake/smbnfs_gtk.pm_.c:200
-msgid "Search servers"
-msgstr "Serverite otsing"
+"See haakepunkt vajab tõelist (ext2/ext3, reiserfs, xfs või jfs) "
+"failisüsteemi\n"
 
-#: ../../fs.pm_.c:547 ../../fs.pm_.c:557 ../../fs.pm_.c:561 ../../fs.pm_.c:565
-#: ../../fs.pm_.c:569 ../../fs.pm_.c:573
+#: ../../fsedit.pm:1
 #, c-format
-msgid "%s formatting of %s failed"
-msgstr "%s vormindamine seadmel %s ebaõnnestus"
+msgid "This directory should remain within the root filesystem"
+msgstr "See kataloog peab jääma kokku juurfailisüsteemiga"
 
-#: ../../fs.pm_.c:610
+#: ../../fsedit.pm:1
 #, c-format
-msgid "I don't know how to format %s in type %s"
-msgstr "Ei oska seadet %s vormindada tüüpi %s"
+msgid "You can't use a LVM Logical Volume for mount point %s"
+msgstr "Te ei saa haakepunkti %s jaoks kasutada LVM loogilist ketast"
 
-#: ../../fs.pm_.c:684 ../../fs.pm_.c:727
+# c-format
+#: ../../fsedit.pm:1
 #, c-format
-msgid "mounting partition %s in directory %s failed"
-msgstr "partitsiooni %s haakimine kataloogis %s ebaõnnestus"
+msgid "There is already a partition with mount point %s\n"
+msgstr "Haakepunktile %s on juba partitsioon määratud\n"
 
-#: ../../fs.pm_.c:742 ../../partition_table.pm_.c:599
+#: ../../fsedit.pm:1
 #, c-format
-msgid "error unmounting %s: %s"
-msgstr "viga %s lahutamisel: %s"
-
-#: ../../fsedit.pm_.c:21
-msgid "simple"
-msgstr "lihtne"
+msgid "Mount points must begin with a leading /"
+msgstr "Haakepunktid peavad algama kaldkriipsuga (/)"
 
-#: ../../fsedit.pm_.c:25
-msgid "with /usr"
-msgstr "koos /usr-ga"
+#: ../../fsedit.pm:1
+#, c-format
+msgid "You can't use ReiserFS for partitions smaller than 32MB"
+msgstr "ReiserFS ei ole kasutatav alla 32MB partitsioonidel"
 
-#: ../../fsedit.pm_.c:30
-msgid "server"
-msgstr "server"
+#: ../../fsedit.pm:1
+#, c-format
+msgid "You can't use JFS for partitions smaller than 16MB"
+msgstr "JFS ei ole kasutatav alla 16MB partitsioonidel"
 
-#: ../../fsedit.pm_.c:240
+#: ../../fsedit.pm:1
 #, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
@@ -2384,808 +1194,556 @@ msgstr ""
 "\n"
 "Kas olete nõus kõigi partitsioonide kaotamisega?\n"
 
-#: ../../fsedit.pm_.c:501
-msgid "You can't use JFS for partitions smaller than 16MB"
-msgstr "JFS ei ole kasutatav alla 16MB partitsioonidel"
-
-#: ../../fsedit.pm_.c:502
-msgid "You can't use ReiserFS for partitions smaller than 32MB"
-msgstr "ReiserFS ei ole kasutatav alla 32MB partisioonidel"
+#: ../../fsedit.pm:1
+#, c-format
+msgid "server"
+msgstr "server"
 
-#: ../../fsedit.pm_.c:521
-msgid "Mount points must begin with a leading /"
-msgstr "Haakepunktid peavad algama kaldkriipsuga (/)"
+#: ../../fsedit.pm:1
+#, c-format
+msgid "with /usr"
+msgstr "koos /usr-ga"
 
-# c-format
-#: ../../fsedit.pm_.c:522
+#: ../../fsedit.pm:1
 #, c-format
-msgid "There is already a partition with mount point %s\n"
-msgstr "Haakepunktile %s on juba partitsioon määratud\n"
+msgid "simple"
+msgstr "lihtne"
 
-#: ../../fsedit.pm_.c:526
+#: ../../fs.pm:1
 #, c-format
-msgid "You can't use a LVM Logical Volume for mount point %s"
-msgstr "Te ei saa haakepunkti %s jaoks LVM loogilist ketast kasutada"
+msgid "Enabling swap partition %s"
+msgstr "Vormindan saaleala %s"
 
-#: ../../fsedit.pm_.c:528
-msgid "This directory should remain within the root filesystem"
-msgstr "See kataloog peab jääma kokku juurfailisüsteemiga"
+#: ../../fs.pm:1 ../../partition_table.pm:1
+#, c-format
+msgid "error unmounting %s: %s"
+msgstr "viga %s lahutamisel: %s"
 
-#: ../../fsedit.pm_.c:530
-msgid ""
-"You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
-"point\n"
-msgstr ""
-"See haakepunkt vajab tõelist (ext2/ext3, reiserfs, xfs või jfs) "
-"failisüsteemi\n"
+#: ../../fs.pm:1
+#, c-format
+msgid "mounting partition %s in directory %s failed"
+msgstr "partitsiooni %s haakimine kataloogis %s ebaõnnestus"
 
-#: ../../fsedit.pm_.c:532
+#: ../../fs.pm:1
 #, c-format
-msgid "You can't use an encrypted file system for mount point %s"
-msgstr "Te ei saa haakepunkti %s jaoks krüptitud failisüsteemi kasutada"
+msgid "Mounting partition %s"
+msgstr "Partitsiooni %s haakimine"
 
-#: ../../fsedit.pm_.c:599
-msgid "Not enough free space for auto-allocating"
-msgstr "Ei ole piisavalt ruumi automaatpaigutuseks"
+#: ../../fs.pm:1
+#, c-format
+msgid "Checking %s"
+msgstr "%s kontrollimine"
 
-#: ../../fsedit.pm_.c:601
-msgid "Nothing to do"
-msgstr "Pole midagi teha"
+#: ../../fs.pm:1
+#, c-format
+msgid "Formatting partition %s"
+msgstr "Partitsiooni %s vormindamine"
 
-#: ../../fsedit.pm_.c:694
+#: ../../fs.pm:1
 #, c-format
-msgid "Error opening %s for writing: %s"
-msgstr "%s avamine kirjutamiseks ebaõnnestus: %s"
+msgid "Creating and formatting file %s"
+msgstr "Faili %s loomine ja vormindamine"
 
-#: ../../harddrake/data.pm_.c:71
-msgid "cpu /* "
-msgstr "cpu /* "
+#: ../../fs.pm:1
+#, c-format
+msgid "I don't know how to format %s in type %s"
+msgstr "Ei oska seadet %s vormindada tüüpi %s"
 
-#: ../../harddrake/sound.pm_.c:170
-msgid "No alternative driver"
-msgstr "Alternatiivne draiver puudub"
+#: ../../fs.pm:1
+#, c-format
+msgid "%s formatting of %s failed"
+msgstr "%s vormindamine seadmel %s ebaõnnestus"
 
-#: ../../harddrake/sound.pm_.c:171
+#: ../../help.pm:1
 #, c-format
 msgid ""
-"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
-"currently uses \"%s\""
+"Click on \"Next ->\" if you want to delete all data and partitions present\n"
+"on this hard drive. Be careful, after clicking on \"Next ->\", you will not\n"
+"be able to recover any data and partitions present on this hard drive,\n"
+"including any Windows data.\n"
+"\n"
+"Click on \"<- Previous\" to stop this operation without losing any data and\n"
+"partitions present on this hard drive."
 msgstr ""
-"Pole teada ühtegi alternatiivset OSS/ALSA draiverit Teie helikaardile (%s), "
-"millel praegu on kasutusel \"%s\""
-
-#: ../../harddrake/sound.pm_.c:173
-msgid "Sound configuration"
-msgstr "Heliseadistused"
+"Valige \"Järgmine ->\", kui soovite kustutada kõik sellel kettal asuvad\n"
+"partitsioonid. Ettevaatust, pärast \"Järgmine ->\" klõpsamist ei ole enam\n"
+"võimalik sellelt kettalt andmeid taastada.\n"
+"\n"
+"Katkestamiseks valige \"<- Eelmine\", mis katkestab tegevuse ilma andmeid\n"
+"ja käesoleval kõvakettal olevaid partitsioone kustutamata."
 
-#: ../../harddrake/sound.pm_.c:174
+#: ../../help.pm:1
 #, c-format
 msgid ""
-"Here you can select an alternative driver (either OSS or ALSA) for your "
-"sound card (%s)."
+"Choose the hard drive you want to erase in order to install your new\n"
+"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
+"and will not be recoverable!"
 msgstr ""
-"Siin saate valida alternatiivse draiveri (kas OSS või ALSA) oma helikaardile "
-"(%s)."
+"Valige kõvaketas, mida soovite puhastada oma uue Mandrake Linuxi\n"
+"paigaldamiseks. Ettevaatust, kõik sellel leiduvad andmed hävitatakse\n"
+"ega ole enam taastatavad."
 
-#: ../../harddrake/sound.pm_.c:176
+#: ../../help.pm:1
 #, c-format
 msgid ""
+"As a review, DrakX will present a summary of various information it has\n"
+"about your system. Depending on your installed hardware, you may have some\n"
+"or all of the following entries:\n"
 "\n"
+" * \"Mouse\": check the current mouse configuration and click on the button\n"
+"to change it if necessary.\n"
 "\n"
-"Your card currently use the %s\"%s\" driver (default driver for your card is "
-"\"%s\")"
-msgstr ""
-"\n"
+" * \"Keyboard\": check the current keyboard map configuration and click on\n"
+"the button to change that if necessary.\n"
 "\n"
-"Teie helikaart kasutab praegu %s\"%s\" draiverit (selle kaardi vaikedraiver "
-"on \"%s\")"
-
-#: ../../harddrake/sound.pm_.c:178
-msgid "Driver:"
-msgstr "Draiver: "
-
-#: ../../harddrake/sound.pm_.c:183 ../../standalone/drakTermServ_.c:303
-#: ../../standalone/drakbackup_.c:3878 ../../standalone/drakbackup_.c:3911
-#: ../../standalone/drakbackup_.c:3937 ../../standalone/drakbackup_.c:3964
-#: ../../standalone/drakbackup_.c:3991 ../../standalone/drakbackup_.c:4030
-#: ../../standalone/drakbackup_.c:4051 ../../standalone/drakbackup_.c:4078
-#: ../../standalone/drakbackup_.c:4108 ../../standalone/drakbackup_.c:4134
-#: ../../standalone/drakbackup_.c:4157 ../../standalone/drakfont_.c:690
-msgid "Help"
-msgstr "Abi"
-
-#: ../../harddrake/sound.pm_.c:185
-msgid "Switching between ALSA and OSS help"
-msgstr "ALSA ja OSS abi vahel lülitamine"
-
-#: ../../harddrake/sound.pm_.c:186
-msgid ""
-"OSS (Open Sound System) was the first sound API. It's an OS independant "
-"sound API (it's available on most unices systems) but it's a very basic and "
-"limited API.\n"
-"What's more, OSS drivers all reinvent the wheel.\n"
+" * \"Country\": check the current country selection. If you are not in this\n"
+"country, click on the button and choose another one.\n"
 "\n"
-"ALSA (Advanced Linux Sound Architecture) is a modularized architecture "
-"which\n"
-"supports quite a large range of ISA, USB and PCI cards.\n"
+" * \"Timezone\": By default, DrakX deduces your time zone based on the\n"
+"primary language you have chosen. But here, just as in your choice of a\n"
+"keyboard, you may not be in the country for which the chosen language\n"
+"should correspond. You may need to click on the \"Timezone\" button to\n"
+"configure the clock for the correct timezone.\n"
 "\n"
-"It also provides a much higher API than OSS.\n"
+" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
+"Guide'' for more information on how to setup a new printer. The interface\n"
+"presented there is similar to the one used during installation.\n"
 "\n"
-"To use alsa, one can either use:\n"
-"- the old compatibility OSS api\n"
-"- the new ALSA api that provides many enhanced features but requires using "
-"the ALSA library.\n"
-msgstr ""
-"OSS (Open Sound System) oli esimene heli-API. See on op-süsteemist sõltumatu "
-"heli-API (saadaval enamiku unix-süsteemide tarbeks), kuid samas väga "
-"elementaarne ja piiratud.\n"
-"Ja pealegi kipuvad OSS-draiverid kogu aeg jalgratast uuesti leiutama.\n"
+" * \"Bootloader\": if you wish to change your bootloader configuration,\n"
+"click that button. This should be reserved to advanced users.\n"
 "\n"
-"ALSA (Advandes Linux Sound Architecture) kujutab endast moodulistatud\n"
-"arhitektuuri, mis toetab päris suurt hulka ISA-, USB- ja PCI-kaarte.\n"
+" * \"Graphical Interface\": by default, DrakX configures your graphical\n"
+"interface in \"800x600\" resolution. If that does not suits you, click on\n"
+"the button to reconfigure your grapical interface.\n"
 "\n"
-"See pakub ka palju arenenumat API-t kui OSS.\n"
+" * \"Network\": If you want to configure your Internet or local network\n"
+"access now, you can by clicking on this button.\n"
 "\n"
-"Alsa kasutamiseks võib tarvitada:\n"
-" -vana ühilduvat OSS API-t\n"
-"- uut ALSA API-t, mis pakub hulga täiustatud võimalusi, kuid\n"
-"nõuab ALSA teegi kasutamist.\n"
-
-#: ../../harddrake/sound.pm_.c:202
-#, c-format
-msgid ""
-"The old \"%s\" driver is blacklisted.\n"
+" * \"Sound card\": if a sound card is detected on your system, it is\n"
+"displayed here. If you notice the sound card displayed is not the one that\n"
+"is actually present on your system, you can click on the button and choose\n"
+"another driver.\n"
 "\n"
-"It has been reported to oopses the kernel on unloading.\n"
+" * \"TV card\": if a TV card is detected on your system, it is displayed\n"
+"here. If you have a TV card and it is not detected, click on the button to\n"
+"try to configure it manually.\n"
 "\n"
-"The new \"%s\" driver'll only be used on next bootstrap."
+" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
+"displayed here. You can click on the button to change the parameters\n"
+"associated with the card."
 msgstr ""
-"Vana \"%s\" draiver on mustas nimekirjas.\n"
+"Siin näidatakse mitmeid Teie masinat puudutavaid parameetreid. Sõltuvalt\n"
+"riistvarast võite siin näha (või mitte näha) järgmisi kirjeid:\n"
 "\n"
-"On teatatud, et see tekitab mahalaadimisel kernelile jama.\n"
+" * \"Hiir\": võimalus kontrollida hiire seadistusi ja neid vajadusel muuta.\n"
 "\n"
-"Uut \"%s\" draiverit kasutatakse järgmisel alglaadimisel."
-
-#: ../../harddrake/sound.pm_.c:205 ../../standalone/drakconnect_.c:298
-msgid "Please Wait... Applying the configuration"
-msgstr "Palun oodake... Rakendan seadistusi"
-
-#: ../../harddrake/sound.pm_.c:205 ../../interactive.pm_.c:382
-#: ../../standalone/drakxtv_.c:108 ../../standalone/harddrake2_.c:113
-#: ../../standalone/service_harddrake_.c:64
-msgid "Please wait"
-msgstr "Palun oodake"
-
-#: ../../harddrake/sound.pm_.c:210
-msgid "No known driver"
-msgstr "Draiverit ei õnnestunud tuvastada"
-
-#: ../../harddrake/sound.pm_.c:211
-#, c-format
-msgid "There's no known driver for your sound card (%s)"
-msgstr "Teie helikaardile (%s) ei õnnestunud tuvastada draiverit"
-
-#: ../../harddrake/sound.pm_.c:214
-msgid "Unkown driver"
-msgstr "Tundmatu draiver"
-
-#: ../../harddrake/sound.pm_.c:215
-#, c-format
-msgid ""
-"The \"%s\" driver for your sound card is unlisted\n"
+" * \"Klaviatuur\": võimalus kontrollida klaviatuuritabeli seadistusi ja "
+"neid\n"
+"vajaduse korral muuta.\n"
 "\n"
-"Please send the output of the \"lspcidrake -v\" command to\n"
-"<install at mandrakesoft dot com>\n"
-"with subject: unlisted sound driver \"%s\""
-msgstr ""
-"Teie helikaardi \"%s\" draiver ei ole loendis\n"
+" * \"Maa\": võimalus kontrollida oma riigi valikut. Kui Te ei asu vaikimisi\n"
+"määratud maal, vajutage nuppu ja valige uus riik.\n"
 "\n"
-"Palun saatke käsu \"lspcidrake -v\" väljund aadressile\n"
-"<install at mandrakesoft dot com>,\n"
-"kirjutades subjektireale: unlisted sound driver \"%s\""
-
-#: ../../harddrake/v4l.pm_.c:14 ../../harddrake/v4l.pm_.c:64
-msgid "Auto-detect"
-msgstr "Automaattuvastus"
-
-#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:198
-msgid "Unknown|Generic"
-msgstr "Tundmatu|Tavaline"
-
-#: ../../harddrake/v4l.pm_.c:97
-msgid "Unknown|CPH05X (bt878) [many vendors]"
-msgstr "Tundmatu|CPH05X (bt878) [paljud tootjad]"
-
-#: ../../harddrake/v4l.pm_.c:98
-msgid "Unknown|CPH06X (bt878) [many vendors]"
-msgstr "Tundmatu|CPH06X (bt878) [paljud tootjad]"
-
-#: ../../harddrake/v4l.pm_.c:224
-msgid ""
-"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
-"detect the rights parameters.\n"
-"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 "
-"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"
-
-#: ../../harddrake/v4l.pm_.c:227
-msgid "Card model:"
-msgstr "Kaardi mudel:"
-
-#: ../../harddrake/v4l.pm_.c:228
-msgid "Tuner type:"
-msgstr "Tuuneri tüüp:"
-
-#: ../../harddrake/v4l.pm_.c:229
-msgid "Number of capture buffers:"
-msgstr "Hõivepuhvrite arv:"
-
-#: ../../harddrake/v4l.pm_.c:229
-msgid "number of capture buffers for mmap'ed capture"
-msgstr "hõivatavate puhvrite arv mmap-i jaoks"
-
-#: ../../harddrake/v4l.pm_.c:231
-msgid "PLL setting:"
-msgstr "PLL:"
-
-#: ../../harddrake/v4l.pm_.c:232
-msgid "Radio support:"
-msgstr "Raadiotugi:"
-
-#: ../../harddrake/v4l.pm_.c:232
-msgid "enable radio support"
-msgstr "raadiotoe lubamine"
-
-#: ../../help.pm_.c:13
-msgid ""
-"GNU/Linux is a multiuser system, and this means that each user can have his\n"
-"own preferences, his own files and so on. You can read the ``User Guide''\n"
-"to learn more this concept. But unlike \"root\", which is the\n"
-"administrator, the users you add here will not be entitled to change\n"
-"anything except their own files and their own configurations. You will have\n"
-"to create at least one regular user for yourself. That account is where you\n"
-"should log in for routine use. Although it is very practical to log in as\n"
-"\"root\" everyday, it may also be very dangerous! The slightest mistake\n"
-"could mean that your system would not work any more. If you make a serious\n"
-"mistake as a regular user, you may only lose some information, but not the\n"
-"entire system.\n"
-"\n"
-"First, you have to enter your real name. This is not mandatory, of course\n"
-"-- as you can actually enter whatever you want. DrakX will then take the\n"
-"first word you have entered in the box and will bring it over to the \"User\n"
-"name\". This is the name this particular user will use to log onto the\n"
-"system. You can change it. You then have to enter a password here. A\n"
-"non-privileged (regular) user's password is not as crucial as the \"root\"\n"
-"one from a security point of view, but that is no reason to neglect it:\n"
-"after all, your files are at risk.\n"
-"\n"
-"If you click on \"Accept user\", you can then add as many as you want. Add\n"
-"a user for each one of the people meant to use that computer. When you are\n"
-"finish adding all the users you want, select \"Done\".\n"
+" * \"Ajavöönd\": 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 \"Ajavöönd"
+"\",\n"
+"et seada kell selle ajavööndi ajale, kus Te parajasti viibite.\n"
 "\n"
-"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
-"for that user (bash by default).\n"
+" * \"Printer\": klõps nupul \"Printer puudub\" avab printeri seadistamise "
+"nõustaja.\n"
+"Seda, kuidas uut printerit seadistada, vaadake lähemalt käivitusjuhiste "
+"vastavast\n"
+"peatükist. Siin nähtav on sarnane paigaldusajal nähtuga.\n"
 "\n"
-"When you are finished adding all users, you will be proposed to choose a\n"
-"user which can automatically log into the system when the computer boots\n"
-"up. If you are interested in that feature (and do not care much about local\n"
-"security), choose the desired user and window manager, then click \"Yes\".\n"
-"If you are not interested in this feature, click \"No\"."
-msgstr ""
-"GNU/Linux on paljude kasutajatega sü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"
-"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"
-"sisse administraatorina, võib see olla ka väga ohtlik! Vähimgi viga võib sel"
-"\\ puhul tähendada, et süsteem lakkab töötamast. Kui teete tõsise vea "
-"tavakasutajana,\n"
-"võite kaotada ainult mõningat infot, kuid süsteem jääb töökorda.\n"
+" * \"Alglaadur\": kui soovite muuta oma alglaaduri seadistusi, klõpsake\n"
+"nupule. See on mõeldud kogenud kasutajatele.\n"
 "\n"
-"Kõigepealt tuleks sisestada oma tegelik nimi. See ei ole mõistagi "
-"kohustuslik - tegelikult võite sisestada, mida soovite. DrakX võtab esimese "
-"sisestatud sõna\n"
-"ning määrab selle \"kasutajanimeks\". 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"
-"lõppeks on ju mängus Teie failid.\n"
+" * \"Graafiline liides\": vaikimisi määrab DrakX Teie graafilise liidese\n"
+"kuvatiheduseks \"800x600\". Kui see Teile ei sobi, vajutage nupule ja\n"
+"seadistage graafiline liides oma tahtmist mööda.\n"
 "\n"
-"Kui klõpsate nupule \"Kasutaja õige\", 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 \"Tehtud\".\n"
+" * \"Võrk\": Kui soovite kohe seadistada juurdepääsu Internetti või "
+"kohtvõrku,\n"
+"saate seda teha siin nupule vajutades.\n"
 "\n"
-"Klõps nupule \"Täpsemalt\" võimaldab muuta kasutajale määratavat vaike-"
-"\"shelli\"\n"
-"(vaikimisi on see bash).\n"
+" * \"Helikaart\": kui süsteemis leiti helikaart, näidatakse seda. Paigalduse "
+"ajal pole\n"
+"seda võimalik (ümber) seadistada.\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"
-"Teile huvi pakub (ja kohalik turvalisus muret ei valmista), valige "
-"meelepärane\n"
-"kasutaja ning aknahaldur ja vajutage \"Jah\". Kui Te sellest aga huvitatud "
-"ei ole,\n"
-"vajutage kohe \"Ei\"."
+" * \"TV-kaart\": kui süsteemis leiti TV-kaart, näidatakse seda. Paigalduse "
+"ajal pole\n"
+"seda võimalik (ümber) seadistada.\n"
+"\n"
+" * \"ISDN-kaart\": kui süsteemis leiti ISDN-kaart, näidatakse seda. Nupule "
+"vajutades\n"
+"saab muuta sellega seonduvaid parameetreid."
 
-#: ../../help.pm_.c:48
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Listed above are the existing Linux partitions detected on your hard drive.\n"
-"You can keep the choices made by the wizard, they are good for most common\n"
-"installations. If you make any changes, you must at least define a root\n"
-"partition (\"/\"). Do not choose too small a partition or you will not be\n"
-"able to install enough software. If you want to store your data on a\n"
-"separate partition, you will also need to create a \"/home\" partition\n"
-"(only possible if you have more than one Linux partition available).\n"
-"\n"
-"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
+"\"Sound card\": if a sound card is detected on your system, it is displayed\n"
+"here. If you notice the sound card displayed is not the one that is\n"
+"actually present on your system, you can click on the button and choose\n"
+"another driver."
+msgstr ""
+"\"Helikaart\": 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 juhtprogramm."
+
+#: ../../help.pm:1
+#, c-format
+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. Be careful to choose the correct\n"
+"parameters.\n"
 "\n"
-"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"Yaboot's main options are:\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+" * Init Message: a simple text message displayed before the boot prompt.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
-"hard drives:\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"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\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"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\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 before your\n"
+"default kernel description is selected;\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
+"at the first boot prompt.\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
+"Open Firmware at the first boot prompt.\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
-"\"second lowest SCSI ID\", etc."
+" * Default OS: you can select which OS will boot by default when the Open\n"
+"Firmware Delay expires."
 msgstr ""
-"Ülal on toodud kõik Teie kõvakettal olemasolevad Linuxi partitsioonid\n"
-"Vaikimisi on need enamasti üsna mõistlikud. Kui teete nendes muutusi,\n"
-"pidage meeles, et kindlasti vajate juurpartitsiooni (\"/\"). Liiga väikeste\n"
-"partitsioonide puhul võib tekkida raskusi piisava hulga tarkvara "
-"paigaldamisel.\n"
-"Kasutajate jaoks on sageli mõistlik luua eraldi \"/home\" partitsioon.\n"
-"(Seda mõistagi juhul, kui tegemist on enam kui ühe Linuxi partitsiooniga).\n"
-"\n"
-"Iga partitsiooni juures on toodud abiinfona \"Nimi\" ja \"Mahutavus\".\n"
+"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"
-"\"Nimi\" koosneb kõvakettatüübist, selle numbrist ja partitsiooni\n"
-"numbrist (näiteks \"hda1\").\n"
+"Yabooti põhivalikud on järgmised:\n"
 "\n"
-"Kõvaketta tüüp on \"hd\", kui on tegemist IDE kettaga, ning \"sd\", kui on\n"
-"tegemist SCSI kettaga.\n"
+" * Initsialiseerimisteade: tavaline tekstisõnum, mida näidatakse enne\n"
+"alglaadimise käsurea ilmumist.\n"
 "\n"
-"Kõvaketta number on alati täht \"hd\" või \"sd\" järel. IDE ketastel:\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"
-" * \"a\" - esmase IDE kontrolleri ülem,\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"
-" * \"b\" - esmase IDE kontrolleri allutatu,\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"
-" * \"c\" - teisese IDE kontrolleri ülem,\n"
+" * Lubada alglaadimine CD-lt?: Selle valimine võimaldab alglaadimise "
+"käsureale\n"
+"``C'' kirjutades valida CD.\n"
 "\n"
-" * \"d\" - teisese IDE kontrolleri allutatu.\n"
+" * Lubada OF alglaadimine?: Selle valimine võimaldab alglaadimise käsureale\n"
+"``N'' kirjutades valida Open Firmware.\n"
 "\n"
-"SCSI ketaste puhul on \"a\" esimene, \"b\" teine ja nii edasi."
-
-#: ../../help.pm_.c:79
-msgid ""
-"The Mandrake Linux installation is spread out over several CD-ROMs. DrakX\n"
-"knows if a selected package is located on another CD-ROM and will eject the\n"
-"current CD and ask you to insert a different one as required."
-msgstr ""
-"Mandrake Linuxi paigalduspaketid on jagatud mitme CD-ROMi vahel. DrakX\n"
-"suudab ära tunda, kui valitud pakett asub muul CD-ROMil, ning väljastab "
-"siis\n"
-"seesoleva CD ja palub sisestada selle, mida parajasti vaja läheb."
+" * OS vaikimisi: Siin võite valida, milline operatsioonisüsteem laaditakse "
+"vaikimisi,\n"
+"kui Open Firmware viivitus läbi saab."
 
-#: ../../help.pm_.c:84
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
-"you are not supposed to know them all by heart.\n"
+"You can add additional entries in yaboot for other operating systems,\n"
+"alternate kernels, or for an emergency boot image.\n"
 "\n"
-"If you are performing a standard installation from a CD-ROM, you will first\n"
-"be asked to specify the CDs you currently have (in Expert mode only). Check\n"
-"the CD labels and highlight the boxes corresponding to the CDs you have\n"
-"available for installation. Click \"OK\" when you are ready to continue.\n"
+"For other OSs, the entry consists only of a label and the \"root\"\n"
+"partition.\n"
 "\n"
-"Packages are sorted in groups corresponding to a particular use of your\n"
-"machine. The groups themselves are sorted into four sections:\n"
+"For Linux, there are a few possible options:\n"
 "\n"
-" * \"Workstation\": if you plan to use your machine as a workstation,\n"
-"select one or more of the corresponding groups;\n"
+" * Label: this is the name you will have to type at the yaboot prompt to\n"
+"select this boot option.\n"
 "\n"
-" * \"Development\": if your machine is to be used for programming, choose\n"
-"the desired group(s);\n"
+" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
+"or a variation of vmlinux with an extension.\n"
 "\n"
-" * \"Server\": if your machine is intended to be a server, you will be able\n"
-"to select which of the most common services you wish to install on your\n"
-"machine;\n"
+" * Root: the \"root\" device or ``/'' for your Linux installation.\n"
 "\n"
-" * \"Graphical Environment\": finally, this is where you will choose your\n"
-"preferred graphical environment. At least one must be selected if you want\n"
-"to have a graphical workstation!\n"
+" * Append: on Apple hardware, the kernel append option is often used to\n"
+"assist in initializing video hardware, or to enable keyboard mouse button\n"
+"emulation for the missing 2nd and 3rd mouse buttons on a stock Apple mouse.\n"
+"The following are some examples:\n"
 "\n"
-"Moving the mouse cursor over a group name will display a short explanatory\n"
-"text about that group. If you unselect all groups when performing a regular\n"
-"installation (by opposition to an upgrade), a dialog will pop up proposing\n"
-"different options for a minimal installation:\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
+"hda=autotune\n"
 "\n"
-" * \"With X\": install the fewest packages possible to have a working\n"
-"graphical desktop;\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-" * \"With basic documentation\": installs the base system plus basic\n"
-"utilities and their documentation. This installation is suitable for\n"
-"setting up a server;\n"
+" * Initrd: this option can be used either to load initial modules before\n"
+"the boot device is available, or to load a ramdisk image for an emergency\n"
+"boot situation.\n"
 "\n"
-" * \"Truly minimal install\": will install the strict minimum necessary to\n"
-"get a working Linux system, in command line only. This installation is\n"
-"about 65Mb large.\n"
+" * Initrd-size: the default ramdisk size is generally 4096 Kbytes. If you\n"
+"need to allocate a large ramdisk, this option can be used to specify a\n"
+"ramdisk larger than the default.\n"
 "\n"
-"You can check the \"Individual package selection\" box, which is useful if\n"
-"you are familiar with the packages being offered or if you want to have\n"
-"total control over what will be installed.\n"
+" * Read-write: normally the \"root\" partition is initially mounted as\n"
+"read-only, to allow a file system check before the system becomes ``live''.\n"
+"You can override the default with this option.\n"
 "\n"
-"If you started the installation in \"Upgrade\" mode, you can unselect all\n"
-"groups to avoid installing any new package. This is useful to repair or\n"
-"update an existing system."
+" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
+"problematic, you can select this option to boot in ``novideo'' mode, with\n"
+"native frame buffer support.\n"
+"\n"
+" * Default: selects this entry as being the default Linux selection,\n"
+"selectable by pressing ENTER at the yaboot prompt. This entry will also be\n"
+"highlighted with a ``*'' if you press [Tab] to see the boot selections."
 msgstr ""
-"Nüüd on aeg määrata rakendused, mida soovite oma süsteemi paigaldada.\n"
-"Mandrake Linux pakub tuhandeid pakette ja mõistagi ei eelda keegi, et Te\n"
-"neid kõiki juba ette tunneksite.\n"
+"Yabooti jaoks on võimalik lisada kirjeid kas teiste operatsioonisüsteemide,\n"
+"alternatiivsete kernelite või hädaolukorras alglaadimistõmmise leidmiseks.\n"
 "\n"
-"Kui sooritate kõige tavalisemat paigaldust CD-ROMidelt, palutakse Teil "
-"esmalt\n"
-"määrata CD-d, mis Teil kasutada on (ainult ekspertresiimis). Vaadake CD-de\n"
-"pealdisi ning märkige need CD-d, mis Teil olemas on. Kui olete valmis,\n"
-"vajutage \"Olgu\".\n"
+"Teiste operatsioonisüsteemide kirje sisaldab vaid pealdist ja "
+"juurpartitsiooni.\n"
 "\n"
-"Paketid on rühmitatud gruppidesse vastavalt nende kasutusalale. Grupid ise "
-"on\n"
-"jagatud nelja sektsiooni:\n"
+"Linuxi puhul on võimalusi rohkem:\n"
 "\n"
-" * \"Tööjaam\": kui kavatsete kasutada arvutit tööjaama, valige siit "
-"sektsioonist\n"
-"üks või enam gruppidest;\n"
+" * Pealdis: lihtsalt nimetus, mida tuleb kirjutada, kui yaboot pärib teilt "
+"alglaadimise\n"
+"ajal, mida laadida.\n"
 "\n"
-" * \"Arendus\": kui kavatsete kasutada arvutit programmeerimiseks, valige\n"
-"soovitud grupid siit;\n"
+" * Laadepilt: alglaaditava kerneli nimetus, tavaliselt vmlinux laiendiga või "
+"ilma selleta.\n"
 "\n"
-" * \"Server\": kui arvuti peab täitma serveri ülesandeid, saate siit "
-"valida,\n"
-"milliseid kõige enam levinud teenuseid oma masinale paigaldada;\n"
+" * Juur: juurseade ehk Teie Linuxi ``/''.\n"
 "\n"
-" * \"Graafiline töökeskkond\": lõppeks saate siit valida meelepärase "
-"graafilise\n"
-"töökeskkonna. Neist tuleb valida vähemalt üks, kui soovite kasutada "
-"graafilist tööjaama!\n"
+" * Lisand: eriti Apple'i puhul kasutatakse kerneli lisa sageli "
+"videoriistvara lähtestamiseks\n"
+"või hiirenupu emuleerimiseks klaviatuuril, sest Apple'i riistvarapoodides on "
+"vaid\n"
+"harva näha kahe või kolme nupuga hiiri. Mõned näited:\n"
 "\n"
-"Hiire asetamine grupi nime peale toob nähtavale selle lühikirjelduse. Kui "
-"olete\n"
-"tavapärast paigaldust tehes kõik grupid valimata jätnud (seega talitanud\n"
-"vastupidi uuenduse mõttele), ilmub dialoog, mis pakub mitmesuguseid\n"
-"võimalusi minimaalseks paigalduseks.\n"
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
+"hda=autotune\n"
 "\n"
-" * \"X-iga\": paigaldatakse minimaalselt graafiliseks töölauaks vajalikud "
-"paketid;\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-" * \"Baasdokumentatsiooniga\": paigaldatakse baassüsteem ning põhilised\n"
-"utiliidid ja nende dokumentatsioon. See peaks sobima näiteks serverile;\n"
+" * Initrd: seda võimalust võib kasutada kas initsialiseerimismoodulite "
+"laadimiseks\n"
+"enne alglaadimisseadmeni jõudmist või ramdisk-laadepildi laadimiseks\n"
+"hädaolukorras.\n"
 "\n"
-" * \"Tõeline miinimumpaigaldus\": paigaldatakse minimaalne hulk pakette,\n"
-"mida on vaja Linuxi töötamiseks (vaid käsurealt). See võtab ruumi umbes\n"
-"65 MB.\n"
+" * Initrd-size: ramdiski suurus on tavaliselt 4096 baiti. Kui teil peaks "
+"minema\n"
+"tarvis suuremat, saab seda siin määrata.\n"
 "\n"
-"Ära märkida saab kasti \"Pakettide individuaalne valik\", mis on kasuks, "
-"kui\n"
-"tunnete pakette, mida Teile pakutakse, või kui soovite totaalset kontrolli\n"
-"selle üle, mida Teie masinasse paigaldatakse.\n"
+" * Read-write: tavaliselt initsialiseeritakse juurpartitsioon esmalt vaid "
+"loetavana,\n"
+"et sooritada failisüsteemi kontroll enne seda, kui süsteem ``ellu ärkab''.\n"
+"Siin saab seda muuta.\n"
 "\n"
-"Kui käivitasite paigalduse resiimis \"Uuendus\", võite jätta kõik grupid\n"
-"valimata, mis takistab uute pakettide paigaldamist. Seda tasub tarvitada\n"
-"näiteks olemasoleva süsteemi parandamisel või värskendamisel."
+" * NoVideo: kui Apple'i videoriistvara peaks väga tõsiseid probleeme "
+"tekitama,\n"
+"saab siin valida võimaluse teha alglaadimine resiimis ``novideo'' ehk siis\n"
+"native frame-buffer toega.\n"
+"\n"
+" * Vaikimisi: määrab antud kirje vaikimisi Linuxi valikuks, mida saab "
+"alglaadida\n"
+"yabooti käsurea ilmudes vaid vajutusega klahvile ENTER. Kui vajutate "
+"alglaadimise\n"
+"valikute uurimiseks [Tab], on see kirje tähistatud tärniga (``*'')."
 
-#: ../../help.pm_.c:135
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Finally, depending on whether or not you chose to be able to select\n"
-"individual packages, you will be presented a tree containing all packages\n"
-"classified by groups and subgroups. While browsing the tree, you can select\n"
-"entire groups, subgroups, or individual packages.\n"
+"DrakX will first detect any IDE devices present in your computer. It will\n"
+"also scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
+"found, DrakX will automatically install the appropriate driver.\n"
 "\n"
-"Whenever you select a package on the tree, a description appears on the\n"
-"right. When your selection is finished, click the \"Install\" button which\n"
-"will then launch the installation process. Depending on the speed of your\n"
-"hardware and the number of packages that need to be installed, it may take\n"
-"a while to complete the process. An installation time estimate is displayed\n"
-"on the screen, to help you gauge if there is sufficient time to enjoy a cup\n"
-"of coffee.\n"
-"\n"
-"!! If a server package has been selected, either intentionally or because\n"
-"it was part of a whole group, you will be asked to confirm that you really\n"
-"want those servers to be installed. Under Mandrake Linux, any installed\n"
-"servers are started by default at boot time. Even if they are safe and have\n"
-"no known issues at the time the distribution was shipped, it may happen\n"
-"that security holes are discovered after this version of Mandrake Linux was\n"
-"finalized. If you do not know what a particular service is supposed to do\n"
-"or why it is being installed, then click \"No\". Clicking \"Yes\" will\n"
-"install the listed services and they will be started automatically by\n"
-"default. !!\n"
+"Because hardware detection is not foolproof, DrakX will ask you if you have\n"
+"a PCI SCSI installed. Clicking \" Yes\" will display a list of SCSI cards\n"
+"to choose from. Click \"No\" if you know that you have no SCSI hardware in\n"
+"your machine. If you're not sure, you can check the list of hardware\n"
+"detected in your machine by selecting \"See hardware info \" and clicking\n"
+"the \"Next ->\". Examine the list of hardware and then click on the \"Next\n"
+"->\" button to return to the SCSI interface question.\n"
 "\n"
-"The \"Automatic dependencies\" option simply disables the warning dialog\n"
-"which appears whenever the installer automatically selects a package. This\n"
-"occurs because it has determined that it needs to satisfy a dependency with\n"
-"another package in order to successfully complete the installation.\n"
+"If you had to manually specify your PCI SCSI adapter, DrakX will ask if you\n"
+"want to configure options for it. You should allow DrakX to probe the\n"
+"hardware for the card-specific options which are needed to initialize the\n"
+"adapter. Most of the time, DrakX will get through this step without any\n"
+"issues.\n"
 "\n"
-"The tiny floppy disk icon at the bottom of the list allows to load the\n"
-"package list chosen during a previous installation. Clicking on this icon\n"
-"will ask you to insert a floppy disk previously created at the end of\n"
-"another installation. See the second tip of the previous step on how to\n"
-"create such a floppy disk."
+"If DrakX is not able to probe for the options to automatically determine\n"
+"which parameters need to be passed to the hardware, you'll need to manually\n"
+"configure the driver."
 msgstr ""
-"Sõltuvalt sellest, kas valisite individuaalse pakettide valiku või mitte,\n"
-"näidatakse Teile gruppidesse ja alamgruppidesse rühmitatult kõiki pakette\n"
-"sisaldavat puud. Seda mööda liikudes võite valida või etteantud valiku\n"
-"tühistada tervete gruppide, alamgruppide või üksikute pakettide kaupa.\n"
-"\n"
-"Kui valite puus mõne paketi, ilmub paremal selle kirjeldus. Kui valik on\n"
-"lõpetatud, vajutage nupule \"Paigalda\", mis käivitab paigaldusprotsessi.\n"
-"Sõltuvalt riistvara kiirusest ja valitud pakettide arvust, võib kuluda "
-"päris\n"
-"palju aega selle lõpulejõudmiseks. Ekraanil näidatakse oletatavat aega.\n"
-"mis paigaldamisele kulub, lastes Teil ühtlasi hinnata, kas sellest piisab\n"
-"tassikese kohvi nautimiseks.\n"
+"Esmalt otsib DrakX üles kõik Teie arvuti IDE-seadmed, püüdes samal ajal\n"
+"tuvastada ka PCI siini SCSI-liideseid. Kui viimaseid leitakse ja vastav(ad)\n"
+"draiver(id) on teada, siis laetakse ja paigaldatakse kõik vajalik "
+"automaatselt.\n"
 "\n"
-"!! Kui tahtlikult või seetõttu, et asi kuulus gruppi, on valitud mõni "
-"serveripakett,\n"
-"palutakse Teilt kinnitust, et Te ikka tõesti soovite neid servereid "
-"paigaldada.\n"
-"Mandrake Linuxi puhul käivitatakse kõik paigaldatud serverid vaikimisi\n"
-"alglaadimise käigus. Isegi kui nad olid turvalised ja teadaolevalt "
-"probleemivabad\n"
-"ajal, mis valmis distributsioon, võib kergesti juhtuda, et pärast Mandrake "
-"Linuxi\n"
-"praeguse versiooni valmimist leiti neist turvaauke. Kui Te ei tea, mida "
-"konkreetne\n"
-"teenus pakub või miks see üldse paigaldatakse, klõpsake nupul \"Ei\", sest\n"
-"klõps nupul \"Jah\" paigaldab loetletud serverid ning nad käivituvad\n"
-"alglaadimise ajal automaatselt. !!\n"
+"Riistvara tuvastamine ei pruugi alati siiski õnnestuda ja kui see nii "
+"peaks \n"
+"minema, palub DrakX Teil teatada, kas masinas on mõni PCI SCSI-liides.\n"
+"Vajutage \"Jah\", kui olete kindel, et Teil on SCSI-liides, ning seejärel\n"
+"palutakse Teil ilmuvast loendist sobiv valida. Kui SCSI-liidest ei ole, on "
+"mõtet\n"
+"vastata \"Ei\". Kui Te ei ole kindel, võite kontrollida oma masina "
+"riistvara,\n"
+"vajutades \"Näita riistvara infot\" ja \"Järgmine ->\". Vaadake riistvara "
+"nimekiri\n"
+"üle ning vajutage \"Järgmine ->\", mis toob Teid tagasi SCSI-liidese "
+"küsimuse juurde.\n"
 "\n"
-"Lisavõimalus \"Automaatsõltuvused\" lihtsalt keelab hoiatava dialoogi, mis "
-"ilmub\n"
-"alati, kui paigaldaja valib automaatselt mõne paketi. See juhtub siis, kui "
-"leitakse,\n"
-"et paigalduse edukaks lõpetamiseks on vajalik paigaldada veel mõni muu "
-"pakett.\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"
+"järele liidese spetsiifilised omadused, mida see initsialiseerimiseks "
+"vajab.\n"
+"Tavaliselt õnnestub see edukalt.\n"
 "\n"
-"Väike flopiketta ikoon loendi all võimaldab avada eelmise paigalduse ajal "
-"valitud\n"
-"pakettide nimekirja. Sellel klõpsamise järel palutakse Teil sisestada "
-"flopiketas,\n"
-"mille lõite eelmise paigalduse lõpul. Vaadake ka eelmise sammu teist "
-"nõuannet\n"
-"selle kohta, kuidas sellist flopiketast luua."
+"Kui automaatne parameetrite otsimine ei tööta, tutvuge palun lähemalt\n"
+"oma SCSI liidese dokumentatsiooniga või küsige abi riistvara müüjalt."
 
-#: ../../help.pm_.c:171
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"You are now able to set up your Internet/network connection. If you wish to\n"
-"connect your computer to the Internet or to a local network, click \"OK\".\n"
-"The autodetection of network devices and modem will be launched. If this\n"
-"detection fails, uncheck the \"Use auto-detection\" box next time. You may\n"
-"also choose not to configure the network, or do it later; in that case,\n"
-"simply click the \"Cancel\" button.\n"
-"\n"
-"Available connections are: traditional modem, ISDN modem, ADSL connection,\n"
-"cable modem, and finally a simple LAN connection (Ethernet).\n"
+"Now, it's time to select a printing system for your computer. Other OSs may\n"
+"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"is best for a particular type of configuration.\n"
 "\n"
-"Here, we will not detail each configuration. Simply make sure that you have\n"
-"all the parameters from your Internet Service Provider or system\n"
-"administrator.\n"
+" * \"pdq\" -- which is an acronym for ``print, don't 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 do not have networked printers. (\"pdq\n"
+"\" will handle only very simple network cases and is somewhat slow when\n"
+"used with networks.) It's recommended that you use \"pdq \" if this is your\n"
+"first experience with GNU/Linux.\n"
 "\n"
-"You can consult the ``Starter Guide'' chapter about Internet connections\n"
-"for details about the configuration, or simply wait until your system is\n"
-"installed and use the program described there to configure your connection.\n"
+" * \"CUPS\" - `` Common Unix Printing System'', is an excellent choice for\n"
+"printing to your local printer or to one halfway around the planet. It is\n"
+"simple to configure and can act as a server or a client for the ancient\n"
+"\"lpd \" printing system, so it compatible with older operating systems\n"
+"that may still need print services. While quite powerful, the basic setup\n"
+"is almost as easy as \"pdq\". If you need to emulate a \"lpd\" server, make\n"
+"sure to turn on the \"cups-lpd \" daemon. \"CUPS\" includes graphical\n"
+"front-ends for printing or choosing printer options and for managing the\n"
+"printer.\n"
 "\n"
-"If you wish to configure the network later after installation, or if you\n"
-"are finished configuring your network connection, click \"Cancel\"."
+"If you make a choice now, and later find that you don't like your printing\n"
+"system you may change it by running PrinterDrake from the Mandrake Control\n"
+"Center and clicking the expert button."
 msgstr ""
-"Nüüd võite seadistada oma Interneti-/võrguühenduse. Kui soovite, et arvuti\n"
-"oleks ühendatud Internetti või kohtvõrku, vajutage \"Olgu\". Seejärel "
-"käivitub\n"
-"võrguseadmete ja modemi automaattuvastus. Kui see ei õnnestu, jätke\n"
-"järgmisel korral kastike \"Automaattuvastuse kasutamine\" märkimata.\n"
-"Muidugi võib ka võrgu seadistamisest loobuda või soovida seda hiljem teha.\n"
-"Sellisel juhul vajutage nupule \"Loobu\".\n"
-"\n"
-"Võimalikud ühendusviisid on: tavaline modem, ISDN modem, ADSL ühendus,\n"
-"kaablimodem ning lõpuks kohtvõrk ehk LAN (Ethernet).\n"
-"\n"
-"Siinkohal ei hakka me kogu seadistamist lahti seletama. Kontrollige "
-"lihtsalt, et\n"
-"oleksite oma internetiteenuse pakkujalt või süsteemi administraatorilt "
-"saanud\n"
-"kõik võrguühendusega seonduvad parameetrid.\n"
+"Siin saate valida oma arvutile trükkimissüsteemi. Teised "
+"operatsioonisüsteemid\n"
+"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrake Linuxi puhul saate\n"
+"valida tervelt kahe seast.\n"
 "\n"
-"Seadistamisest kõneleb lähemalt \"Käivitusjuhiste\" Internetiühendusest "
-"pajatav\n"
-"peatükk, kuid võib ka oodata, kuni süsteem on paigaldatud ja kasutada siis "
-"ühenduse seadistamiseks seal kirjeldatud rakendust.\n"
+" * \"pdq\" - mis tähendab ``trüki kohe'' (``print, don't queue'') - tuleks "
+"valida siis,\n"
+"kui Teil on printeriga otseühendus, Te ei soovi näha mingeid järjekordi ja "
+"Teil\n"
+"ei ole võrgus asuvaid printereid. Võrkude puhul on \"pdq\" mõnevõrra aeglane "
+"ja\n"
+"tal võib esineda tegutsemisraskusi. Kui see on Teie esimene retk GNU/Linuxi\n"
+"maailma, valige \"pdq\".\n"
 "\n"
-"Kui soovite seadistada võrku pärast paigaldust või olete lõpetanud selle\n"
-"seadistamise, vajutage nuppu \"Katkesta\"."
+" * \"CUPS\" - ``tavaline UNIXi trükkimissüsteem'' (``Common Unix Printing\n"
+"System'') - on hiilgav valik trükkimiseks Teie kohalikul printeril ja veel "
+"nii pooles\n"
+"maailmas. See on lihtne süsteem, mis võib olla nii kliendiks kui serveriks "
+"iidsele\n"
+"trükkimissüsteemile \"lpd\". See on ka ühilduv varasemate süsteemidega. "
+"\"CUPS\"\n"
+"suudab teha palju asju, kuid põhitegutsemine on sama lihtne kui \"pdq\" "
+"puhul.\n"
+"Kui Teil on vajadus emuleerida \"lpd\"-serverit, tuleb sisse lülitada\n"
+"\"cups-lpd\"-deemon. \"CUPSil\" on ka mitu graafilist kasutajaliidest\n"
+"trükkimiseks või printeri seadistamiseks.\n"
+"Kui leiate hiljem, et siinkohal langetatud valik polnud vahest kõige parem,\n"
+"siis saate seda muuta Mandrake juhtimiskeskuses PrinterDrake abil."
 
-#: ../../help.pm_.c:193
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"You may now choose which services you wish to start at boot time.\n"
+"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
+"automated. DrakX will analyze the disk boot sector and act according to\n"
+"what it finds there:\n"
 "\n"
-"Here are listed all the services available with the current installation.\n"
-"Review them carefully and uncheck those which are not always needed at boot\n"
-"time.\n"
+" * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
+"boot sector. This way you will be able to load either GNU/Linux or another\n"
+"OS.\n"
 "\n"
-"You can get a short explanatory text about a service by selecting a\n"
-"specific service. However, if you are not sure whether a service is useful\n"
-"or not, it is safer to leave the default behavior.\n"
+" * if a grub or LILO boot sector is found, it will replace it with a new\n"
+"one.\n"
 "\n"
-"!! At this stage, be very careful if you intend to use your machine as a\n"
-"server: you will probably not want to start any services which you do not\n"
-"need. Please remember that several services can be dangerous if they are\n"
-"enabled on a server. In general, select only the services you really need.\n"
-"!!"
-msgstr ""
-"Nüüd saate valida, millised teenused peaks käivitama alglaadimisel.\n"
+"If it cannot make a determination, DrakX will ask you where to place the\n"
+"bootloader.\n"
 "\n"
-"Siin on üles loetud kõik teenused, mis on saadaval antud paigalduse puhul.\n"
-"Uurige neid hoolega ja jätke valimata kõik, mida ei ole alglaadimise ajal\n"
-"tingimata vajalik käivitada.\n"
+"\"Boot device\": in most cases, you will not change the default (\"First\n"
+"sector of drive (MBR)\"), but if you prefer, the bootloader can be\n"
+"installed on the second hard drive (\"/dev/hdb\"), or even on a floppy disk\n"
+"(\"On Floppy\").\n"
 "\n"
-"Konkreetset teenust valides näete selle kohta lühikest seletavat teksti. "
-"Kui\n"
-"Te ei ole aga kindel, kas teenus on kasulik või mitte, on mõistlik jätta "
-"kehtima\n"
-"vaikevalik (olgu see siis lubav või mitte).\n"
+"Checking \"Create a boot disk\" allows you to have a rescue bot media\n"
+"handy.\n"
 "\n"
-"!! 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 "
-"tasub\n"
-"valida ainult neid teenuseid, mida Teil tõesti vaja läheb.\n"
-"!!"
-
-#: ../../help.pm_.c:210
-msgid ""
-"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it in\n"
-"local time according to the time zone you selected. It is however possible\n"
-"to deactivate this by unselecting \"Hardware clock set to GMT\" so that the\n"
-"hardware clock is the same as the system clock. This is useful when the\n"
-"machine is hosting another operating system like Windows.\n"
+"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
+"booting the CD-ROM, pressing the >> F1<< key at boot and typing >>rescue<<\n"
+"at the prompt. If your computer cannot boot from the CD-ROM, there are at\n"
+"least two situations where having a boot floppy is critical:\n"
 "\n"
-"The \"Automatic time synchronization\" option will automatically regulate\n"
-"the clock by connecting to a remote time server on the Internet. In the\n"
-"list that is presented, choose a server located near you. Of course you\n"
-"must have a working Internet connection for this feature to work. It will\n"
-"actually install on your machine a time server which can be optionally used\n"
-"by other machines on your local network."
-msgstr ""
-"GNU/Linux kasutab GMT aega (Greenwichi aeg) ning teisendab selle\n"
-"kohalikuks ajaks vastavalt Teie valitud ajavööndile. Seda võib siiski ka "
-"välja\n"
-"lülitada, kui jätta märkima \"Arvutikell kasutab GMT-d\". Sellisel juhul "
-"kajastab\n"
-"arvutikell sama aega, mis süsteemi kell. See võib olla kasulik, kui masinas "
-"on\n"
-"veel mõni operatsioonisüsteem, näiteks Windows.\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
+"of your main disk (unless you are using another boot manager), to allow you\n"
+"to start up with either Windows or GNU/Linux (assuming you have Windows on\n"
+"your system). If at some point you need to reinstall Windows, the Microsoft\n"
+"install process will rewrite the boot sector and remove your ability to\n"
+"start GNU/Linux!\n"
 "\n"
-"Võimalus \"Aja automaatne sünkroniseerimine\" 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 "
-"saab\n"
-"kasutada isegi teiste kohtvõrgus olevate masinate aja täpsustamiseks."
-
-#: ../../help.pm_.c:224
-msgid ""
-"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
-"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely.\n"
+" * if a problem arises and you cannot start GNU/Linux from the hard disk,\n"
+"this floppy will be the only means of starting up GNU/Linux. It contains a\n"
+"fair number of system tools for restoring a system that has crashed due to\n"
+"a power failure, an unfortunate typing error, a forgotten root password, or\n"
+"any other reason.\n"
 "\n"
-"You will be presented the list of available resolutions and color depth\n"
-"available for your hardware. Choose the one that best suit your needs (you\n"
-"will be able to change that after installation though). When you are\n"
-"satisfied with the sample shown in the monitor, click \"OK\". A window will\n"
-"then appear and ask you if you can see it.\n"
+"If you say \"Yes\", you will be asked to insert a disk in the drive. The\n"
+"floppy disk must be blank or have non-critical data on it - DrakX will\n"
+"format the floppy and will rewrite the whole disk."
+msgstr ""
+"LiLo ja grub on GNU/Linuxi alglaadurid. Tavaliselt käib siin kõik täiesti\n"
+"automaatselt. DrakX uurib ketta alglaadimissektorit ja talitab vastavalt\n"
+"sellele, mida ta sealt leiab:\n"
 "\n"
-"If you are doing an \"Expert\" installation, you will enter the X\n"
-"configuration wizard. See the corresponding section of the manual for more\n"
-"information about this wizard.\n"
+" * kui leitakse Windowsi alglaadimissektor, asendatatakse see grub/LiLo\n"
+"alglaadimissektoriga. Nii võite laadida kas GNU/Linuxi või mõne muu OS-i.\n"
 "\n"
-"If you can see the message during the test, and answer \"Yes\", then DrakX\n"
-"will proceed to the next step. If you cannot see the message, it simply\n"
-"means that the configuration was wrong and the test will automatically end\n"
-"after 10 seconds, restoring the screen. Refer then to the video\n"
-"configuration section of the user guide for more information on how to\n"
-"configure your display."
-msgstr ""
-"X (ehk X Window System) kujutab endast GNU/Linuxi graafilise "
-"kasutajaliidese\n"
-"tuuma ja südant, millele toetuvad kõik Mandrake Linuxiga kaasas käivad\n"
-"graafilised töökeskkonnad (KDE, GNOME, AfterStep, WindowMaker jne).\n"
+" * kui leitakse grub-i või LiLo alglaadimissektor, asendatakse see uuega.\n"
 "\n"
-"Siin näidatakse Teie riistvara puhul võimalikke kuvatihedusi ja "
-"värvisügavusi.\n"
-"Valige see, mis Teie vajadustele kõige paremini sobib (seda on võimalik "
-"pärast\n"
-"paigaldust ka muuta). Kui olete monitoril näidatud eelvaatega rahul, "
-"klõpsake nupul\n"
-"\"Olgu\". Seejärel ilmub aken küsimusega, kas Te näete seda.\n"
+"Kui DrakX ei suuda asjast aru saada, küsitakse Teie käest, kuhu alglaadur\n"
+"paigutada.\n"
 "\n"
-"Kui valisite paigalduse \"Ekspertresiimi\", saate võimaluse kasutada X-i\n"
-"seadistamise nõustajat. Selle kohta vaadake lähemalt käsiraamatu vastavat "
-"osa.\n"
+"\"Alglaadimisseade\": enamasti ei peaks muutma vaikeväärtust (\"Ketta\n"
+"avasektor (MBR)\"), aga soovi korral saab alglaaduri paigaldada ka\n"
+"teisele kõvakettale (\"/dev/hdb\") või isegi flopile (\"Flopil\").\n"
+"\n"
+"Märkides ära \"Alglaadimisketta loomine\", saate luua endale käepärase\n"
+"abimehe alglaadimiseks kriisiolukorras.\n"
 "\n"
-"Kui näete testi ajal sõnumit ja vastate \"Jah\", jätkab DrakX järgmise "
-"sammuga.\n"
-"Kui Te aga sõnumit ei näe, tähendab see, et seadistus ei olnud õige ning "
-"test\n"
-"lõpeb automaatselt 10 sekundi pärast, taastades varasema ekraani. Seejärel\n"
-"uurige lähemalt kasutaja käsiraamatu videoseadistuste osa, kus räägitakse\n"
-"põhjalikult monitori ja videokaardi seadistamisest."
-
-#: ../../help.pm_.c:246
-msgid ""
-"Finally, you will be asked whether you want to see the graphical interface\n"
-"at boot. Note this question will be asked even if you chose not to test the\n"
-"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
-"act as a server, or if you were not successful in getting the display\n"
-"configured."
-msgstr ""
-"Lõpuks küsitakse Teie käest, kas soovite kasutada graafilist töökeskkonda\n"
-"kohe alglaadimisel. Pange tähele, et seda päritakse ka siis, kui Te ei "
-"proovinudki\n"
-"seadistusi testida. On üsna ilmne, et vastus kõlab \"Ei\", kui masina "
-"ülesanne\n"
-"on tegutseda serverina või kui Teid ei kippunud seadistamise ajal edu saatma."
-
-#: ../../help.pm_.c:253
-msgid ""
-"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
-"booting from the CD-ROM, press the >>F1<< key at boot and type >>rescue<<\n"
-"at the prompt. But in case your computer cannot boot from the CD-ROM, you\n"
-"should come back to this step for help in at least two situations:\n"
-"\n"
-" * when installing the bootloader, DrakX will rewrite the boot sector (\n"
-"MBR) of your main disk (unless you are using another boot manager), to\n"
-"allow you to start up with either Windows or GNU/Linux (assuming you have\n"
-"Windows in your system). If you need to reinstall Windows, the Microsoft\n"
-"install process will rewrite the boot sector, and then you will not be able\n"
-"to start GNU/Linux!\n"
-"\n"
-" * if a problem arises and you cannot start up GNU/Linux from the hard\n"
-"disk, this floppy disk will be the only means of starting up GNU/Linux. It\n"
-"contains a fair number of system tools for restoring a system, which has\n"
-"crashed due to a power failure, an unfortunate typing error, a typo in a\n"
-"password, or any other reason.\n"
-"\n"
-"If you say \"Yes\", you will be asked to enter a disk inside the drive. The\n"
-"floppy disk you will insert must be empty or contain data which you do not\n"
-"need. You will not have to format it since DrakX will rewrite the whole\n"
-"disk."
-msgstr ""
 "Mandrake Linuxi CD-ROM võib toimida ka päästeresiimis. Seda saab kasutada\n"
 "järgmiselt: teete alglaadimise CD-ROMilt, vajutate selle ajal >>F1<< ning \n"
 "kirjutate käsureale >>rescue<<. Kui Teie arvuti aga ei ole võimeline tegema\n"
@@ -3214,364 +1772,434 @@ msgstr ""
 "seda\n"
 "ise vormindada, selle mure võtab DrakX enda kanda."
 
-#: ../../help.pm_.c:277
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"You now need to choose where you want to install the Mandrake Linux\n"
-"operating system on your hard drive. If your hard drive is empty or if an\n"
-"existing operating system is using all the available space, you will need\n"
-"to partition it. Basically, partitioning a hard drive consists of logically\n"
-"dividing it to create space to install your new Mandrake Linux system.\n"
-"\n"
-"Because the partitioning process' effects are usually irreversible,\n"
-"partitioning can be intimidating and stressful if you are an inexperienced\n"
-"user. Fortunately, there is a wizard which simplifies this process. Before\n"
-"beginning, please consult the manual and take your time.\n"
+"After you have configured the general bootloader parameters, the list of\n"
+"boot options that will be available at boot time will be displayed.\n"
 "\n"
-"If you are running the installation in Expert mode, you will enter\n"
-"DiskDrake, the Mandrake Linux partitioning tool, which allows you to\n"
-"fine-tune your partitions. See the DiskDrake section in the ``Starter\n"
-"Guide''. From the installation interface, you can use the wizards as\n"
-"described here by clicking the dialog's \"Wizard\" button.\n"
+"If there are other operating systems installed on your machine they will\n"
+"automatically be added to the boot menu. You can fine-tune the existing\n"
+"options by clicking \"Add\" to create a new entry; selecting an entry and\n"
+"clicking \"Modify\" or \"Remove\" to modify or remove it. \"OK\" validates\n"
+"your changes.\n"
 "\n"
-"If partitions have already been defined, either from a previous\n"
-"installation or from another partitioning tool, simply select those to\n"
-"install your Linux system.\n"
+"You may also not want to give access to these other operating systems to\n"
+"anyone who goes to the console and reboots the machine. You can delete the\n"
+"corresponding entries for the operating systems to remove them from the\n"
+"bootloader menu, but you will need a boot disk in order to boot those other\n"
+"operating systems!"
+msgstr ""
+"Kui olete määranud alglaaduri üldised parameetrid, näidatakse loendit\n"
+"alglaadimise ajal kasutatavatest valikutest.\n"
 "\n"
-"If partitions are not defined, you will need to create them using the\n"
-"wizard. Depending on your hard drive configuration, several options are\n"
-"available.\n"
+"Kui masinale on paigaldatud veel mõni operatsioonisüsteem, lisatakse see\n"
+"automaatselt alglaaduri menüüsse. Siin saate olemasolevaid valikuid oma\n"
+"maitse järgi häälestada. Valige kirje ja klõpsake nupul \"Muuda\" selle\n"
+"muutmiseks. \"Lisa\" võimaldab luua uue kirje, \"Eemalda\" olemasoleva\n"
+"kustutada ning \"Tehtud\" viib Teid paigalduse järgmise sammu juurde.\n"
 "\n"
-" * \"Use free space\": this option will simply lead to an automatic\n"
-"partitioning of your blank drive(s). You will not be prompted further;\n"
+"Teil võib muidugi olla ka soov mitte anda kellelegi ligipääsu teistele\n"
+"operatsioonisüsteemidele, millisel juhul võite vastavad kirjed kustutada.\n"
+"Aga siis läheb Teil kindlasti vaja alglaadimisketast, et ka ise neile ligi "
+"pääseda!"
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"This dialog allows to finely tune your bootloader:\n"
 "\n"
-" * \"Use existing partition\": the wizard has detected one or more existing\n"
-"Linux partitions on your hard drive. If you want to use them, choose this\n"
-"option. You will then be asked to choose the mount points associated to\n"
-"each of the partitions. The legacy mount points are selected by default,\n"
-"and you should generally keep them.\n"
+" * \"Bootloader to use\": there are three choices for your bootloader:\n"
 "\n"
-" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
-"installed on your hard drive and takes all the space available on it, you\n"
-"have to create free space for Linux data. To do so, you can delete your\n"
-"Microsoft Windows partition and data (see ``Erase entire disk'' or ``Expert\n"
-"mode'' solutions) or resize your Microsoft Windows partition. Resizing can\n"
-"be performed without the loss of any data, provided you previously\n"
-"defragment the Windows partition. Backing up your data won't hurt either..\n"
-"This solution is recommended if you want to use both Mandrake Linux and\n"
-"Microsoft Windows on the same computer.\n"
+"    * \"GRUB\": if you prefer grub (text menu).\n"
 "\n"
-"   Before choosing this option, please understand that after this\n"
-"procedure, the size of your Microsoft Windows partition will be smaller\n"
-"than at the present time. You will have less free space under Microsoft\n"
-"Windows to store your data or to install new software;\n"
+"    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
+"interface.\n"
 "\n"
-" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
-"present on your hard drive and replace them with your new Mandrake Linux\n"
-"system, choose this option. Be careful with this solution because you will\n"
-"not be able to revert your choice after you confirm;\n"
+"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
+"interface.\n"
 "\n"
-"   !! If you choose this option, all data on your disk will be lost. !!\n"
+" * \"Boot device\": in most cases, you will not change the default\n"
+"(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the\n"
+"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
 "\n"
-" * \"Remove Windows\": this will simply erase everything on the drive and\n"
-"begin fresh, partitioning everything from scratch. All data on your disk\n"
-"will be lost;\n"
+" * \"Delay before booting the default image\": after a boot or a reboot of\n"
+"the computer, this is the delay given to the user at the console to select\n"
+"a boot entry other than the default.\n"
 "\n"
-"   !! If you choose this option, all data on your disk will be lost. !!\n"
+"!! Beware that if you choose not to install a bootloader (by selecting\n"
+"\"Skip\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"system! Be sure you know what you do before changing any of the options. !!\n"
 "\n"
-" * \"Expert mode\": choose this option if you want to manually partition\n"
-"your hard drive. Be careful -- it is a powerful but dangerous option. You\n"
-"can very easily lose all your data. Hence, do not choose this unless you\n"
-"know what you are doing. To know how to use the DiskDrake utility used\n"
-"here, refer to the section ``Managing Your Partitions'' of the ````Starter\n"
-"Guide''''"
+"Clicking the \"Advanced\" button in this dialog will offer advanced options\n"
+"that are reserved for the expert user."
 msgstr ""
-"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrake Linux\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"
-"Partitsioneerimine on tegevus, mille käigus tekitatakse kettale loogilised\n"
-"piirkonnad Teie uue Mandrake Linux süsteemi paigaldamiseks.\n"
-"\n"
-"Kuna partitsioneerimine ei ole pööratav 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"
+"See dialoog aitab täpselt häälestada alglaadimist:\n"
 "\n"
-"Kui käivitasite paigalduse ekspertresiimis, ootab Teid ees DiskDrake,\n"
-"Mandrake Linuxi partitsioneerimisvahend, mis võimaldab partitsioone\\ "
-"täpselt häälestada. Vaadake \"Käivitusjuhendis\" DiskDrake peatükki.\n"
-"Paigalduse töökeskkonnas võite kasutada siin kirjeldatud nõustajaid\n"
-"dialoogi nupule \"Nõustaja\" vajutades.\n"
+" * \"Alglaaduri valik\": siin on kolm valikut:\n"
 "\n"
-"Kui partitsioonid on juba olemas kas eelmisest paigaldusest või mõne\n"
-"muu partitsioneerimisvahendi abil looduna, tuleb need lihtsalt valida "
-"Linuxi\n"
-"süsteemi paigaldamiseks.\n"
+"    * \"GRUB\": kui eelistate grubi (tekstimenüü).\n"
 "\n"
-"Kui partitsioone veel ei ole, tuleb need nõustajat kasutades luua. "
-"Sõltuvalt\n"
-"kõvaketta omadustest on selleks mitmeid võimalusi.\n"
+"    * \"LiLo graafilisena\": kui eelistate LiLot graafilisel kuju.\n"
 "\n"
-" * \"Kasuta vaba ruumi\": see partitsioneerib lihtsalt Teie tühja(d) "
-"kõvaketta(d).\n"
-"Mingeid edasisi küsimusi ei esitata.\n"
-"\n"
-" * \"Kasuta olemasolevat partitsiooni\": nõustaja avastas kõvakettal ühe "
-"või\n"
-"rohkem Linuxi partitsiooni. Kui soovite neid kasutada, valige see võimalus.\n"
-"Seejärel palutakse valida iga partitsiooniga seonduvad haakepunktid. "
-"Vaikimisi\n"
-"valitakse need juba ette ära ja üldiselt oleks mõistlik neid mitte muuta.\n"
+"    * \"LiLo tekstiresiimis\": kui eelistate LiLot teksti kujul.\n"
 "\n"
-" * \"Kasuta vaba ruumi Windowsi partitsioonil\": kui kõvakettale on "
-"paigaldatud\n"
-"Microsoft Windows ja see haarab enda alla kogu kõvaketta, võite luua vabale\n"
-"alale nurgakese 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 "
-"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"
-"nii Mandrake Linuxit kui Microsoft Windowsit.\n"
-"\n"
-"   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "
-"protseduuri\n"
-"järel on Teie Microsoft Windowsi partitsioon senisest väiksem, mis tähendab, "
-"et\n"
-"sellel on ka vähem ruumi andmete salvestamiseks või uue tarkvara "
-"paigaldamiseks.\n"
-"\n"
-" * \"Puhasta kogu ketas\": kui soovite kustutada kõik andmed ja "
-"partitsioonid, mis\n"
-"kõvakettal parajasti on, ning asendada need uue Mandrake Linuxi süsteemiga, "
-"on\n"
-"see õige valik. Aga tasub olla ettevaatlik, sest pärast selle valiku "
-"langetamist\n"
-"tagasiteed enam ei ole...\n"
-"\n"
-"   !! Kui valite selle võimaluse, kaotate kõik kõvakettal olevad andmed. !!\n"
+" * \"Alglaadimisseade\": enamasti ei ole sügavat mõtet muuta vaikimisi "
+"valikut\n"
+"(\"/dev/hda\"), aga kui Te väga soovite, võib alglaaduri paigaldada ka "
+"teisele\n"
+"kõvakettale (\"/dev/dhdb\") või isegi flopikettale (\"/dev/fd0\").\n"
 "\n"
-" * \"Eemalda Windows\": see puhastab kõvaketta senistest andmetest ja\n"
-"käivitab uue paigaldusprotsessi, luues kõik partitsioonid uuesti. Kaovad ka\n"
-"kõik kettal olnud andmed.\n"
+" * \"Viivitus\": arvutile alglaadimist tehes pakutakse Teile võimalust "
+"väikeseks\n"
+"pausiks, mille jooksul saab alglaadimismenüüst valida mõne muu kirje kui\n"
+"vaikimisi pakutu.\n"
 "\n"
-"   !! Kui valite selle võimaluse, kaotate kõik kõvakettal olevad andmed. !!\n"
+"!! Pange tähele, et kui Te otsustate alglaadurit mitte paigaldada (klõpsates "
+"siin\n"
+"nupule \"Katkesta\"), peate kuidagi leidma mooduse, kuidas oma Mandrake\n"
+"Linux siiski tööle saada! Ja päris hea oleks, kui Te kindlalt teaksite, mida "
+"teete,\n"
+"enne kui mõnda siin pakutud võimalust muuta. !!\n"
 "\n"
-" ' \"Ekspertresiim\": valige see, kui soovite ise kontrollida kõvaketta "
-"jagamist\n"
-"partitsioonideks. 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, \"Käivitusjuhiste\" osast "
-"\"Partitsioonide\n"
-"haldamine\"."
+"Klõpsuga nupul \"Muud\" saab näha veel mitmeid valikuid, mis on mõeldud\n"
+"kogenud kasutajatele."
 
-#: ../../help.pm_.c:347
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"There you are. Installation is now completed and your GNU/Linux system is\n"
-"ready to use. Just click \"OK\" to reboot the system. You can start\n"
-"GNU/Linux or Windows, whichever you prefer (if you are dual-booting), as\n"
-"soon as the computer has booted up again.\n"
-"\n"
-"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
-"\n"
-" * \"generate auto-install floppy\": to create an installation floppy disk\n"
-"which will automatically perform a whole installation without the help of\n"
-"an operator, similar to the installation you just configured.\n"
+"This is the most crucial decision point for the security of your GNU/Linux\n"
+"system: you have to enter the \"root\" password. \"Root\" is the system\n"
+"administrator and is the only one authorized to make updates, add users,\n"
+"change the overall system configuration, and so on. In short, \"root\" can\n"
+"do everything! That is why you must choose a password that is difficult to\n"
+"guess - DrakX will tell you if the password that you chose too easy. As you\n"
+"can see, you are not forced to enter a password, but we strongly advise you\n"
+"against. GNU/Linux is as prone to operator error as any other operating\n"
+"system. Since \"root\" can overcome all limitations and unintentionally\n"
+"erase all data on partitions by carelessly accessing the partitions\n"
+"themselves, it is important that it be difficult to become \"root\".\n"
 "\n"
-"   Note that two different options are available after clicking the button:\n"
+"The password should be a mixture of alphanumeric characters and at least 8\n"
+"characters long. Never write down the \"root\" password -- it makes it too\n"
+"easy to compromise a system.\n"
 "\n"
-"    * \"Replay\". This is a partially automated installation as the\n"
-"partitioning step (and only this one) remains interactive;\n"
+"One caveat -- do not make the password too long or complicated because you\n"
+"must be able to remember it!\n"
 "\n"
-"    * \"Automated\". Fully automated installation: the hard disk is\n"
-"completely rewritten, all data is lost.\n"
+"The password will not be displayed on screen as you type it in. To reduce\n"
+"the chance of a blind typing error you will need to enter the password\n"
+"twice. If you do happen to make the same typing error twice, this\n"
+"``incorrect'' password will have to be used the first time you connect.\n"
 "\n"
-"   This feature is very handy when installing a great number of similar\n"
-"machines. See the Auto install section on our web site;\n"
+"If you wish access to this computer to be controlled by an authentication\n"
+"server, clisk the \"Advanced\" button.\n"
 "\n"
-" * \"Save packages selection\"(*): saves the package selection as done\n"
-"previously. Then, when doing another installation, insert the floppy inside\n"
-"the drive and run the installation going to the help screen by pressing on\n"
-"the [F1] key, and by issuing >>linux defcfg=\"floppy\"<<.\n"
+"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
+"services, select the appropriate one as \"authentication\". If you do not\n"
+"know which to use, ask your network administrator.\n"
 "\n"
-"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
-"\"mformat a:\")"
+"If you happen to have problems with reminding passwords, you can choose to\n"
+"have \"No password\", if your computer won't be connected to the Internet,\n"
+"and if you trust anybody having access to it."
 msgstr ""
-"Ja nüüd ongi paigaldus selja taga ning Teie GNU/Linuxi süsteem valmis "
-"tööks.\n"
-"Selleks tuleb vaid klõpsata \"Olgu\" ning arvuti teeb taaskäivituse, mille "
-"järel\n"
-"võite valida, kas käivitada GNU/Linux või Windows (kui Teie arvutil on mitu\n"
-"süsteemi).\n"
-"\n"
-"Nupp \"Muud\" (ainult ekspertresiimis) pakub veel kaks võimalust:\n"
-"\n"
-" * \"Tekita automaatpaigalduse flopi\": loob paigaldusflopi, mis sooritab "
-"kogu\n"
-"paigalduse ilma kasutajata, paigaldus ise on samasugune nagu äsja\n"
-"seljataha jäänu.\n"
+"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"
+"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"
 "\n"
-"   Selle valiku korral ilmub veel kaks erinevat võimalust:\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 - "
+"see\n"
+"võib muuta ligipääsu Teie süsteemile võõrastele liiga hõlpsaks.\n"
 "\n"
-"    * \"Ümbermängimine\". See on osaliselt automaatne, sest "
-"partitsioneerimisel\n"
-"(aga ka ainult seal) on võimalik sekkuda.\n"
+"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"
-"    * \"Automaatne\". Täisautomaatne paigaldus: kõvaketas kirjutatakse "
-"täielikult\n"
-"uuesti, kõik varasemad andmed kustutatakse.\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"
+"administraatorina sisselogimisel.\n"
 "\n"
-"   See võimalus võib olla kasulik, kui paigaldamine on kavas ette võtta "
-"paljudel\n"
-"ühesugustel masinatel. Lähemalt vaadake meie veebileheküljel\n"
-"automaatpaigalduse sektsiooni.\n"
+"Ekspertresiimis päritakse Teie käest, kas soovite ühendust mõne\n"
+"autentimisserveriga (nt NIS või LDAP).\n"
 "\n"
-" * \"Salvesta pakettide valik\"(*): salvestab paigalduse käigus valitud "
-"pakettide\n"
-"nimekirja. Kui nüüd võtate ette uue paigalduse, asetage flopi seadmesse "
-"ning\n"
-"käivitage paigaldus klahvile [F1] vajutades abiekraani vahendusel, andes "
-"käsu\n"
-">>linux defcfg=\"floppy\"<<.\n"
+"Kui Teie võrgus on kasutusel LDAP, NIS või PDC Windowsi domeeni autentimise\n"
+"teenused, valige neist sobilik autentimismeetodiks. Kui Te aga ei juhtu "
+"teadma,\n"
+"mida teha, pöörduge oma võrgu administraatori poole.\n"
 "\n"
-"(*) Selleks läheb vaja FAT-vormingus flopit (sellise loomiseks GNU/Linuxis\n"
-"andke käsk \"mformat a:\")"
+"Kui arvuti ei ole ühendatud ühtegi administreeritavasse võrku, on mõttekas\n"
+"valida autentimisviis \"Kohalikud failid\"."
 
-#: ../../help.pm_.c:378
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Any partitions that have been newly defined must be formatted for use\n"
-"(formatting means creating a filesystem on it).\n"
-"\n"
-"At this time, you may wish to reformat some already existing partitions to\n"
-"erase any data they contain. If you wish to do that, please select those\n"
-"partitions as well.\n"
+"Please select the correct port. For example, the \"COM1\" port under\n"
+"Windows is named \"ttyS0\" under GNU/Linux."
+msgstr ""
+"Palun valige õige port. Näiteks MS Windowsi \"COM1\" kannab\n"
+"GNU/Linuxis nime \"ttyS0\"."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"Usually, DrakX has no problems detecting the number of buttons on your\n"
+"mouse. If it does, it assumes you have a two-button mouse and will\n"
+"configure it for third-button emulation. The third-button mouse button of a\n"
+"two-button mouse can be ``pressed'' by simultaneously clicking the left and\n"
+"right mouse buttons. DrakX will automatically know whether your mouse uses\n"
+"a PS/2, serial or USB interface.\n"
 "\n"
-"Please note that it is 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 do not have to\n"
-"reformat partitions containing data that you wish to keep (typically\n"
-"\"/home\").\n"
+"If for some reason you wish to specify a different type of mouse, select it\n"
+"from the provided list.\n"
 "\n"
-"Please be careful when selecting partitions. After formatting, all data on\n"
-"the selected partitions will be deleted and you will not be able to recover\n"
-"it.\n"
+"If you choose a mouse other than the default, a test screen will be\n"
+"displayed. Use the buttons and wheel to verify that the settings are\n"
+"correct and that the mouse is working correctly. If the mouse is not\n"
+"working well, press the space bar or [Return] key to cancel the test and to\n"
+"go back to the list of choices.\n"
+"\n"
+"Wheel mice are occasionally not detected automatically, so you will need to\n"
+"select your mouse from a list. Be sure to select the one corresponding to\n"
+"the port that your mouse is attached to. After selecting a mouse and\n"
+"pressing the \"Next ->\" button, a mouse image is displayed on-screen.\n"
+"Scroll the mouse wheel to ensure that it is activated correctly. Once you\n"
+"see the on-screen scroll wheel moving as you scroll your mouse wheel, test\n"
+"the buttons and check that the mouse pointer moves on-screen as you move\n"
+"your mouse."
+msgstr ""
+"Tavaliselt tuvastab DrakX hõlpsasti, mitme nupuga hiirt Te kasutate. Kui\n"
+"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"
+"automaatselt, kas tegemist on PS/2, jadapordi või USB-hiirega.\n"
 "\n"
-"Click on \"OK\" when you are ready to format partitions.\n"
+"Kui soovite muuta hiiretüüpi, valige pakutud nimekirjast sobiv tüüp.\n"
 "\n"
-"Click on \"Cancel\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Kui valite mõne muu hiiretüübi kui vaikimisi määratu, palutakse Teil seda\n"
+"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"
 "\n"
-"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
-"for bad blocks on the disk."
-msgstr ""
-"Kõik värskelt loodud partitsioonid tuleb enne kasutamist vormindada\n"
-"ehk sinna tuleb luua failisüsteemid.\n"
+"Vahel ei õnnestu rattaga hiirt automaatselt tuvastada. Siis tuleb see "
+"loendist\n"
+"käsitsi valida. Kontrollige, et valite õigesse porti ühendatud hiiretüübi. "
+"Kui\n"
+"vajutate nupule \"Järgmine ->\", näidatakse hiire kujutist. Siis tuleb Teil "
+"liigutada\n"
+"hiireratast, et see korrektselt aktiveerida. Seejärel testige, kas kõik "
+"nupud\n"
+"ja liigutused toimivad korralikult."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"Your choice of preferred language will affect the language of the\n"
+"documentation, the installer and the system in general. Select first the\n"
+"region you are located in, and then the language you speak.\n"
 "\n"
-"Samuti võib vormindada varem olemas olnud partitsioonid, kui soovite\n"
-"seal leiduvad andmed ära kustutada.\n"
+"Clicking on the \"Advanced\" button will allow you to select other\n"
+"languages to be installed on your workstation, thereby installing the\n"
+"language-specific files for system documentation and applications. For\n"
+"example, if you will host users from Spain on your machine, select English\n"
+"as the default language in the tree view and \"Espanol\" in the Advanced\n"
+"section.\n"
 "\n"
-"Pange tähele, et alati ei ole kõigi vanade partitsioonide vormindamine\n"
-"vajalik. Kindlasti tuleb vormindada partitsioonid, kus varem asus \"/\", \"/"
-"usr\"\n"
-"või \"/var\", aga kasutajate faile sisaldav \"/home\" võiks jääda alles.\n"
+"Note that you're not limited to choosing a single additional language. Once\n"
+"you have selected additional locales, click the \"Next ->\" button to\n"
+"continue.\n"
 "\n"
-"Olge partitsioonide valikul hoolas. Pärast vormindamist on kõik valitud\n"
-"partitsioonidel asunud andmed kustutatud ning neid pole võimalik taastada.\n"
+"To switch between the various languages installed on the system, you can\n"
+"launch the \"/usr/sbin/localedrake\" command as \"root\" to change the\n"
+"language used by the entire system. Running the command as a regular user\n"
+"will only 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"
 "\n"
-"Klõpsake \"Olgu\", kui olete vormindamiseks valmis.\n"
+"Klõpsates nupul \"Muud\", 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"
+"Hispaaniast, valige puuvaates põhikeeleks eesti keel ning sektsioonis\n"
+"\"Muud\" märkige ära \"Hispaania|Hispaania\".\n"
 "\n"
-"Klõpsake \"Katkesta\", kui soovite valida oma uue Mandrake Linuxi süsteemi\n"
-"paigaldamiseks mõne muu partitsiooni.\n"
+"Paigaldada võib ka mitu keelt. Kui olete valinud, millised lisakeeled\n"
+"paigaldada, klõpsake jätkamiseks nupul \"Järgmine ->\".\n"
 "\n"
-"Klõpsake \"Muud\", kui soovite valida partitsioone, millel kontrollitaks "
-"halbade\n"
-"blokkide olemasolu."
+"Ühelt keelelt teisele lülitumiseks võite administraatorina anda käsu\n"
+"\"/usr/sbin/localedrake\", mis võimaldab muuta kogu süsteemi keelt,\n"
+"või tavakasutajana muuta ainult enda kohta käivat keeleseadistust."
 
-#: ../../help.pm_.c:404
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Your new Mandrake Linux operating system is currently being installed.\n"
-"Depending on the number of packages you will be installing and the speed of\n"
-"your computer, this operation could take from a few minutes to a\n"
-"significant amount of time.\n"
+"Depending on the default language you chose in Section , DrakX will\n"
+"automatically select a particular type of keyboard configuration. However,\n"
+"you might not have a keyboard that corresponds exactly to your language:\n"
+"for example, if you are an English speaking Swiss person, you may have a\n"
+"Swiss keyboard. Or if you speak English but are located in Quebec, you may\n"
+"find yourself in the same situation where your native language and keyboard\n"
+"do not match. In either case, this installation step will allow you to\n"
+"select an appropriate keyboard from a list.\n"
+"\n"
+"Click on the \"More \" button to be presented with the complete list of\n"
+"supported keyboards.\n"
 "\n"
-"Please be patient."
+"If you choose a keyboard layout based on a non-Latin alphabet, the next\n"
+"dialog will allow you to choose the key binding that will switch the\n"
+"keyboard between the Latin and non-Latin layouts."
 msgstr ""
-"Teie uut Mandrake Linux süsteemi hakati nüüd paigaldama.\n"
-"Selleks võib olenevalt valitud pakettide arvust ja Teie arvuti\n"
-"kiirusest kuluda mõni kuni mõnikümmend minutit.\n"
+"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.\n"
+"\n"
+"Klõpsake nupul \"Rohkem\", mis näitab kõiki toetatud klaviatuure.\n"
 "\n"
-"Palun varuge kannatust."
+"Kui valite mitte-ladina tähestikuga klaviatuuri, palutakse Teil järgmises\n"
+"dialoogis valida klahv või klahvikombinatsioon, mis vahetab ladina ja\n"
+"mitte-ladina asetusega klaviatuuri."
 
-#: ../../help.pm_.c:412
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
-"packages have been updated since the initial release. Some bugs may have\n"
-"been fixed, and security issues solved. To allow you to benefit from these\n"
-"updates, you are now able to download them from the Internet. Choose\n"
-"\"Yes\" if you have a working Internet connection, or \"No\" if you prefer\n"
-"to install updated packages later.\n"
+"This step is activated only if an old GNU/Linux partition has been found on\n"
+"your machine.\n"
 "\n"
-"Choosing \"Yes\" displays a list of places from which updates can be\n"
-"retrieved. Choose the one nearest you. Then a package-selection tree\n"
-"appears: review the selection, and press \"Install\" to retrieve and\n"
-"install the selected package(s), or \"Cancel\" to abort."
+"DrakX now needs to know if you want to perform a new install or an upgrade\n"
+"of an existing Mandrake Linux system:\n"
+"\n"
+" * \"Install\": For the most part, this completely wipes out the old\n"
+"system. If you wish to change how your hard drives are partitioned, or\n"
+"change the file system, you should use this option. However, depending on\n"
+"your partitioning scheme, you can prevent some of your existing data from\n"
+"being over- written.\n"
+"\n"
+" * \"Upgrade\": this installation class allows you to update the packages\n"
+"currently installed on your Mandrake Linux system. Your current\n"
+"partitioning scheme and user data is not altered. Most of other\n"
+"configuration steps remain available, similar to a standard installation.\n"
+"\n"
+"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
+"to Mandrake Linux version \"8.1\" is not recommended."
 msgstr ""
-"On tõenäoline, et praegu, kui Te paigaldate Mandrake Linuxit, on mõned\n"
-"paketid jõudnud pärast väljalaset juba uuenduskuuri üle elada. Mõnes on ära\n"
-"parandatud paar väiksemat viga, mõnes turvaprobleemid. Et võiksite neist\n"
-"uuendustest tulu lõigata, on Teil nüüd võimalik need Internetist alla "
-"laadida.\n"
-"Klõpsake \"Jah\", kui Teie internetiühendus töötab, või \"Ei\", kui "
-"eelistate\n"
-"pakette uuendada millalgi hiljem.\n"
+"Seda sammu on vaja ainult siis, kui masinas leiti vana\n"
+"GNU/Linuxi partitsioon.\n"
 "\n"
-"Kui valite \"Jah\", näidatakse Teile loendit kohtadega, kust uuendusi "
-"tõmmata\n"
-"saab. Valige endale lähim paik. Seejärel ilmub paketivaliku puu. Vaadake "
-"see\n"
-"üle ning vajutage \"Paigalda\", kui soovite valitud paketi(d) alla laadida "
-"ja\n"
-"paigaldada, või \"Katkesta\", kui Te ei soovi seda teha."
+"DrakX soovib nüüd teada, kas tahate paigaldada uue süsteemi või uuendada\n"
+"olemasolevat Mandrake Linuxi süsteemi:\n"
+"\n"
+" * \"Paigaldus\": üldiselt pühib see vana süsteemi täielikult minema. Kui\n"
+"soovite muuta praeguseid partitsioone või failisüsteemi, siis võiks seda "
+"võimalust\n"
+"kasutada. Sõltuvalt kettajagamise viisist on võimalik ka mõningaid andmeid\n"
+"ülekirjutamise eest päästa.\n"
+"\n"
+" * \"Uuendus\": see paigaldusviis võimaldab uuendada praegu olemasolevasse\n"
+"Mandrake Linuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
+"kasutajate\n"
+"andmeid ei muudeta. Enamik seadistussamme on kasutatavad sarnaselt "
+"tavapärasele\n"
+"paigaldusele.\n"
+"\n"
+"Võimalus \"Uuendus\" peaks toimima edukalt Mandrake Linuxi süsteemides\n"
+"alates versioonist 8.1. Uuenduse proovimist varasemate versioonide peal\n"
+"me siiski ei soovita."
 
-#: ../../help.pm_.c:425
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Before continuing, you should read carefully the terms of the license. It\n"
-"covers the whole Mandrake Linux distribution, and if you do not agree with\n"
-"all the terms included in it, click on the \"Refuse\" button which will\n"
-"immediately terminate the installation. To continue with the installation,\n"
-"click on the \"Accept\" button."
+"\"Country\": check the current country selection. If you are not in this\n"
+"country, click on the button and choose another one."
 msgstr ""
-"Enne jätkamist lugege hoolikalt läbi litsentsileping. See kehtib kogu "
-"Mandrake\n"
-"Linuxi distributsiooni kohta ja kui Te ei ole selles mingi punktiga nõus, "
-"vajutage\n"
-"\"Keeldun\", mis katkestab otsekohe paigaldusprotsessi. Paigalduse "
-"jätkamiseks\n"
-"vajutage \"Nõustun\"."
+"\"Maa\": võimaldab konrollida praegust maa valikut. Kui see ei ole riik,\n"
+"kus Te viibite, vajutage nuppu ja valige mõni muu maa."
 
-#: ../../help.pm_.c:432
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"At this point, it is time to choose the security level desired for the\n"
-"machine. As a rule of thumb, the more exposed the machine is, and the more\n"
-"the data stored in it is crucial, the higher the security level should be.\n"
-"However, a higher security level is generally obtained at the expense of\n"
-"ease of use. Refer to the \"msec\" chapter of the ``Reference Manual'' to\n"
-"get more information about the meaning of these levels.\n"
+"More than one Microsoft partition has been detected on your hard drive.\n"
+"Please choose the one you want to resize in order to install your new\n"
+"Mandrake Linux operating system.\n"
 "\n"
-"If you do not know what to choose, keep the default option."
+"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
+"\"Capacity\".\n"
+"\n"
+"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\n"
+"\n"
+"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
+"\"sd\" if it is a SCSI hard drive.\n"
+"\n"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
+"hard drives:\n"
+"\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+"\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+"\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+"\n"
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc.\n"
+"\n"
+"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
+"disk or partition is called \"C:\")."
 msgstr ""
-"Nüüd on aeg valida masinale meelepärane turvatase. Rusikareeglina peaks\n"
-"turvatase olema seda kõrgem, mida ligipääsule avatum see on ja mida rohkem\n"
-"leidub sellel olulise tähtsusega andmeid. Samas tähendab kõrgem turvatase\n"
-"üldiselt kasutamislihtsuse kahanemist. Turvatasemete täpsema kirjelduse\n"
-"leiate käsiraamatu peatükist \"msec\".\n"
+"Teie arvuti kõvakettal on rohkem kui üks Microsoft Windowsi partitsioon.\n"
+"Palun valige välja see, mille suurust soovite Mandrake Linuxi jaoks muuta.\n"
 "\n"
-"Kui Te ei tea, mida valida, leppige pakutud võimalusega."
+"Teie abistamiseks on igal partitsioonil näidatud \"Nimi Linuxis\", \"Nimi "
+"Windowsis\" ja \"Mahutavus\".\n"
+"\n"
+"\"Nimi Linuxis\" koosneb kõvakettatüübist, selle numbrist ja partitsiooni\n"
+"numbrist (näiteks \"hda1\").\n"
+"\n"
+"Kõvaketta tüüp on \"hd\", kui on tegemist IDE-kettaga, ja \"sd\", kui on\n"
+"tegemist SCSI-kettaga.\n"
+"\n"
+"Kõvaketta number on alati täht \"hd\" või \"sd\" järel. IDE-ketastel:\n"
+"\n"
+" * \"a\" - esmase IDE kontrolleri ülem,\n"
+"\n"
+" * \"b\" - esmase IDE kontrolleri allutatu,\n"
+"\n"
+" * \"c\" - teisese IDE kontrolleri ülem,\n"
+"\n"
+" * \"d\" - teisese IDE kontrolleri allutatu.\n"
+"\n"
+"SCSI-ketaste puhul on \"a\" esimene, \"b\" teine ja nii edasi.\n"
+"\n"
+"\n"
+"\"Nimi Windowsis\" on täht, millega Microsoft Windows vastavat seadet\n"
+"tähistab (esimene ketas või partitsioon kannab nime \"C:\")."
 
-#: ../../help.pm_.c:442
+#: ../../help.pm:1
+#, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
 "installation of your Mandrake Linux system. If partitions have already been\n"
@@ -3586,66 +2214,70 @@ msgid ""
 "To partition the selected hard drive, you can use these options:\n"
 "\n"
 " * \"Clear all\": this option deletes all partitions on the selected hard\n"
-"drive;\n"
+"drive\n"
 "\n"
-" * \"Auto allocate\": this option enables to automatically create ext3 and\n"
-"swap partitions on your hard drive's free space;\n"
+" * \"Auto allocate\": this option enables you to automatically create ext3\n"
+"and swap partitions in free space of your hard drive\n"
 "\n"
 "\"More\": gives access to additional features:\n"
 "\n"
 " * \"Save partition table\": saves the partition table to a floppy. Useful\n"
 "for later partition-table recovery, if necessary. It is strongly\n"
-"recommended to perform this step;\n"
+"recommended that you perform this step.\n"
 "\n"
-" * \"Restore partition table\": allows to restore a previously saved\n"
-"partition table from a floppy disk;\n"
+" * \"Restore partition table\": allows you to restore a previously saved\n"
+"partition table from a floppy disk.\n"
 "\n"
 " * \"Rescue partition table\": if your partition table is damaged, you can\n"
 "try to recover it using this option. Please be careful and remember that it\n"
-"can fail;\n"
+"doesn't always work.\n"
 "\n"
-" * \"Reload partition table\": discards all changes and loads your initial\n"
-"partition table;\n"
+" * \"Reload partition table\": discards all changes and reloads the\n"
+"partition table that was originally on the hard drive.\n"
 "\n"
 " * \"Removable media automounting\": unchecking this option will force\n"
 "users to manually mount and unmount removable medias such as floppies and\n"
 "CD-ROMs.\n"
 "\n"
 " * \"Wizard\": use this option if you wish to use a wizard to partition\n"
-"your hard drive. This is recommended if you do not have a good knowledge of\n"
-"partitioning;\n"
+"your hard drive. This is recommended if you do not have a good\n"
+"understanding of partitioning.\n"
 "\n"
-" * \"Undo\": use this option to cancel your changes;\n"
+" * \"Undo\": use this option to cancel your changes.\n"
 "\n"
 " * \"Toggle to normal/expert mode\": allows additional actions on\n"
-"partitions (type, options, format) and gives more information;\n"
+"partitions (type, options, format) and gives more information about the\n"
+"hard drive.\n"
 "\n"
 " * \"Done\": when you are finished partitioning your hard drive, this will\n"
 "save your changes back to disk.\n"
 "\n"
+"When defining the size of a partition, you can finely set the partition\n"
+"size by using the Arrow keys of your keyboard.\n"
+"\n"
 "Note: you can reach any option using the keyboard. Navigate through the\n"
-"partitions using [Tab] and [Up/Down] arrows.\n"
+"partitions using [Tab] and the [Up/Down] arrows.\n"
 "\n"
 "When a partition is selected, you can use:\n"
 "\n"
-" * Ctrl-c to create a new partition (when an empty partition is selected);\n"
+" * Ctrl-c to create a new partition (when an empty partition is selected)\n"
 "\n"
-" * Ctrl-d to delete a partition;\n"
+" * Ctrl-d to delete a partition\n"
 "\n"
-" * Ctrl-m to set the mount point.\n"
+" * Ctrl-m to set the mount point\n"
 "\n"
-"To get information about the different filesystem types available, please\n"
+"To get information about the different file system types available, please\n"
 "read the ext2FS chapter from the ``Reference Manual''.\n"
 "\n"
 "If you are installing on a PPC machine, you will want to create a small HFS\n"
-"``bootstrap'' partition of at least 1MB, which will be used by the yaboot\n"
+"``bootstrap'' partition of at least 1MB which will be used by the yaboot\n"
 "bootloader. If you opt to make the partition a bit larger, say 50MB, you\n"
 "may find it a useful place to store a spare kernel and ramdisk images for\n"
 "emergency boot situations."
 msgstr ""
 "Nüüd peate valima partitsiooni(d), kuhu soovite Mandrake Linuxi paigaldada.\n"
 "Kui need on juba olemas kas GNU/Linuxi varasema paigalduse või mõne muu\n"
-"partitsioneerimisvahendi tegevuse tulemusena, võite kasutada olemasolevaid\n"
+"kettajagamisvahendi tegevuse tulemusena, võite kasutada olemasolevaid\n"
 "partitsioone. Vastasel juhul tuleb need luua.\n"
 "\n"
 "Partitsioon on loogiliselt eraldatud kõvaketta piirkond, mille suurust\n"
@@ -3695,6 +2327,9 @@ msgstr ""
 " * \"Tava/Ekspertresiimi lülitamine\": võimaldab partitsioonidega ette\n"
 "võtta lisaoperatsioone (tüüp, võtmed, vorming) ning pakub rohkem infot.\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"
@@ -3715,835 +2350,1056 @@ msgstr ""
 "on see päris hea koht, kuhu hädaolukorraks paigutada tagavarakernel\n"
 "ja ramdisk-laadepildid."
 
-#: ../../help.pm_.c:513
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"More than one Microsoft partition has been detected on your hard drive.\n"
-"Please choose the one you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"At this point, DrakX will allow you to choose the security level desired\n"
+"for the machine. As a rule of thumb, the security level should be set\n"
+"higher if the machine will contain crucial data, or if it will be a machine\n"
+"directly exposed to the Internet. The trade-off of a higher security level\n"
+"is generally obtained at the expense of ease of use. Refer to the \"msec\"\n"
+"chapter of the ``Command Line Manual'' to get more information about the\n"
+"meaning of these levels.\n"
 "\n"
-"Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
-"\"Capacity\".\n"
+"If you do not know what to choose, keep the default option."
+msgstr ""
+"Nüüd on aeg valida masinale meelepärane turvatase. Rusikareeglina peaks\n"
+"turvatase olema seda kõrgem, mida ligipääsule avatum see on ja mida rohkem\n"
+"leidub sellel olulise tähtsusega andmeid. Samas tähendab kõrgem turvatase\n"
+"üldiselt kasutamislihtsuse kahanemist. Turvatasemete täpsema kirjelduse\n"
+"leiate käsiraamatu peatükist \"msec\".\n"
 "\n"
-"\"Linux name\" is structured: \"hard drive type\", \"hard drive number\",\n"
-"\"partition number\" (for example, \"hda1\").\n"
+"Kui Te ei tea, mida valida, leppige pakutud võimalusega."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"At the time you are installing Mandrake Linux, it is likely that some\n"
+"packages have been updated since the initial release. Bugs may have been\n"
+"fixed, security issues resolved. To allow you to benefit from these\n"
+"updates, you are now able to download them from the Internet. Choose\n"
+"\"Yes\" if you have a working Internet connection, or \"No\" if you prefer\n"
+"to install updated packages later.\n"
 "\n"
-"\"Hard drive type\" is \"hd\" if your hard dive is an IDE hard drive and\n"
-"\"sd\" if it is a SCSI hard drive.\n"
+"Choosing \"Yes\" displays a list of places from which updates can be\n"
+"retrieved. Choose the one nearest you. A package-selection tree will\n"
+"appear: review the selection, and press \"Install\" to retrieve and install\n"
+"the selected package( s), or \"Cancel\" to abort."
+msgstr ""
+"On tõenäoline, et praegu, kui Te paigaldate Mandrake Linuxit, on mõned\n"
+"paketid jõudnud pärast väljalaset juba uuenduskuuri üle elada. Mõnes on ära\n"
+"parandatud paar väiksemat viga, mõnes turvaprobleemid. Et võiksite neist\n"
+"uuendustest tulu lõigata, on Teil nüüd võimalik need Internetist alla "
+"laadida.\n"
+"Klõpsake \"Jah\", kui Teie internetiühendus töötab, või \"Ei\", kui "
+"eelistate\n"
+"pakette uuendada millalgi hiljem.\n"
 "\n"
-"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". With IDE\n"
-"hard drives:\n"
+"Kui valite \"Jah\", näidatakse Teile loendit kohtadega, kust uuendusi "
+"tõmmata\n"
+"saab. Valige endale lähim paik. Seejärel ilmub paketivaliku puu. Vaadake "
+"see\n"
+"üle ning vajutage \"Paigalda\", kui soovite valitud paketi(d) alla laadida "
+"ja\n"
+"paigaldada, või \"Katkesta\", kui Te ei soovi seda teha."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"Any partitions that have been newly defined must be formatted for use\n"
+"(formatting means creating a file system).\n"
 "\n"
-" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
+"At this time, you may wish to reformat some already existing partitions to\n"
+"erase any data they contain. If you wish to do that, please select those\n"
+"partitions as well.\n"
 "\n"
-" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
+"Please note that it is 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 do not have to\n"
+"reformat partitions containing data that you wish to keep (typically\n"
+"\"/home\").\n"
 "\n"
-" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
+"Please be careful when selecting partitions. After formatting, all data on\n"
+"the selected partitions will be deleted and you will not be able to recover\n"
+"it.\n"
 "\n"
-" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"Click on \"Next ->\" when you are ready to format partitions.\n"
 "\n"
-"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
-"\"second lowest SCSI ID\", etc.\n"
+"Click on \"<- Previous\" if you want to choose another partition for your\n"
+"new Mandrake Linux operating system installation.\n"
 "\n"
-"\"Windows name\" is the letter of your hard drive under Windows (the first\n"
-"disk or partition is called \"C:\")."
+"Click on \"Advanced\" if you wish to select partitions that will be checked\n"
+"for bad blocks on the disk."
 msgstr ""
-"Teie arvuti kõvakettal on rohkem kui üks Microsoft Windowsi partitsioon.\n"
-"Palun valige välja see, mille suurust soovite Mandrake Linuxi jaoks muuta.\n"
+"Kõik värskelt loodud partitsioonid tuleb enne kasutamist vormindada\n"
+"ehk sinna tuleb luua failisüsteemid.\n"
 "\n"
-"Teie abistamiseks on igal partitsioonil näidatud \"Nimi Linuxis\", \"Nimi "
-"Windowsis\" ja \"Mahutavus\".\n"
+"Samuti võib vormindada varem olemas olnud partitsioonid, kui soovite\n"
+"seal leiduvad andmed ära kustutada.\n"
 "\n"
-"\"Nimi Linuxis\" koosneb kõvakettatüübist, selle numbrist ja partitsiooni\n"
-"numbrist (näiteks \"hda1\").\n"
+"Pange tähele, et alati ei ole kõigi vanade partitsioonide vormindamine\n"
+"vajalik. Kindlasti tuleb vormindada partitsioonid, kus varem asus \"/\", \"/"
+"usr\"\n"
+"või \"/var\", aga kasutajate faile sisaldav \"/home\" võiks jääda alles.\n"
 "\n"
-"Kõvaketta tüüp on \"hd\", kui on tegemist IDE-kettaga, ja \"sd\", kui on\n"
-"tegemist SCSI-kettaga.\n"
+"Olge partitsioonide valikul hoolas. Pärast vormindamist on kõik valitud\n"
+"partitsioonidel asunud andmed kustutatud ning neid ei ole võimalik "
+"taastada.\n"
 "\n"
-"Kõvaketta number on alati täht \"hd\" või \"sd\" järel. IDE-ketastel:\n"
+"Klõpsake \"Järgmine ->\", kui olete vormindamiseks valmis.\n"
 "\n"
-" * \"a\" - esmase IDE kontrolleri ülem,\n"
+"Klõpsake \"<- Eelmine\", kui soovite valida oma uue Mandrake Linuxi "
+"süsteemi\n"
+"paigaldamiseks mõne muu partitsiooni.\n"
 "\n"
-" * \"b\" - esmase IDE kontrolleri allutatu,\n"
+"Klõpsake \"Muud\", kui soovite valida partitsioone, millel kontrollitaks "
+"halbade\n"
+"blokkide olemasolu."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"There you are. Installation is now complete and your GNU/Linux system is\n"
+"ready to use. Just click \"Next ->\" to reboot the system. The first thing\n"
+"you should see after your computer has finished doing its hardware tests is\n"
+"the bootloader menu, giving you the choice of which operating system to\n"
+"start.\n"
 "\n"
-" * \"c\" - teisese IDE kontrolleri ülem,\n"
+"The \"Advanced\" button (in Expert mode only) shows two more buttons to:\n"
 "\n"
-" * \"d\" - teisese IDE kontrolleri allutatu.\n"
+" * \"generate auto-install floppy\": to create an installation floppy disk\n"
+"that will automatically perform a whole installation without the help of an\n"
+"operator, similar to the installation you just configured.\n"
 "\n"
-"SCSI-ketaste puhul on \"a\" esimene, \"b\" teine ja nii edasi.\n"
+"   Note that two different options are available after clicking the button:\n"
 "\n"
+"    * \"Replay\". This is a partially automated installation. The\n"
+"partitioning step is the only interactive procedure.\n"
 "\n"
-"\"Nimi Windowsis\" on täht, millega Microsoft Windows vastavat seadet\n"
-"tähistab (esimene ketas või partitsioon kannab nime \"C:\")."
-
-#: ../../help.pm_.c:544
-msgid "Please be patient. This operation can take several minutes."
-msgstr "Palun varuge kannatust. Selleks võib kuluda mõnigi minut."
+"    * \"Automated\". Fully automated installation: the hard disk is\n"
+"completely rewritten, all data is lost.\n"
+"\n"
+"   This feature is very handy when installing a number of similar machines.\n"
+"See the Auto install section on our web site for more information.\n"
+"\n"
+" * \"Save packages selection\"(*): saves a list of the package selected in\n"
+"this installation. To use this selection with another installation, insert\n"
+"the floppy and start the installation. At the prompt, press the [F1] key\n"
+"and type >>linux defcfg=\"floppy\" <<.\n"
+"\n"
+"(*) You need a FAT-formatted floppy (to create one under GNU/Linux, type\n"
+"\"mformat a:\")"
+msgstr ""
+"Ja nüüd ongi paigaldus selja taga ning Teie GNU/Linuxi süsteem valmis "
+"tööks.\n"
+"Selleks tuleb vaid klõpsata \"Järgmine ->\" ning arvuti teeb taaskäivituse, "
+"mille järel\n"
+"võite valida, kas käivitada GNU/Linux või Windows (kui Teie arvutil on mitu\n"
+"süsteemi).\n"
+"\n"
+"Nupp \"Muud\" (ainult ekspertresiimis) pakub veel kaks võimalust:\n"
+"\n"
+" * \"Loo automaatpaigalduse flopi\": loob paigaldusflopi, mis sooritab kogu\n"
+"paigalduse ilma kasutajata, paigaldus ise on samasugune nagu äsja\n"
+"seljataha jäänu.\n"
+"\n"
+"   Selle valiku korral ilmub veel kaks erinevat võimalust:\n"
+"\n"
+"    * \"Ümbermängimine\". See on osaliselt automaatne, sest "
+"partitsioneerimisel\n"
+"(aga ka ainult seal) on võimalik sekkuda.\n"
+"\n"
+"    * \"Automaatne\". Täisautomaatne paigaldus: kõvaketas kirjutatakse "
+"täielikult\n"
+"uuesti, kõik varasemad andmed kustutatakse.\n"
+"\n"
+"   See võimalus võib olla kasulik, kui paigaldamine on kavas ette võtta "
+"paljudel\n"
+"ühesugustel masinatel. Lähemalt vaadake meie veebileheküljel\n"
+"automaatpaigalduse sektsiooni.\n"
+"\n"
+" * \"Salvesta pakettide valik\"(*): salvestab paigalduse käigus valitud "
+"pakettide\n"
+"nimekirja. Kui nüüd võtate ette uue paigalduse, asetage flopi seadmesse "
+"ning\n"
+"käivitage paigaldus klahvile [F1] vajutades abiekraani vahendusel, andes "
+"käsu\n"
+">>linux defcfg=\"floppy\"<<.\n"
+"\n"
+"(*) Selleks läheb vaja FAT-vormingus flopit (sellise loomiseks GNU/Linuxis\n"
+"andke käsk \"mformat a:\")"
 
-#: ../../help.pm_.c:547
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"DrakX now needs to know if you want to perform a default (\"Recommended\")\n"
-"installation or if you want to have greater control (\"Expert\") over your\n"
-"installation. You can also choose to do a new installation or upgrade your\n"
-"existing Mandrake Linux system:\n"
+"At this point, you need to decide where you want to install the Mandrake\n"
+"Linux operating system on your hard drive. If your hard drive is empty or\n"
+"if an existing operating system is using all the available space you will\n"
+"have to partition the drive. Basically, partitioning a hard drive consists\n"
+"of logically dividing it to create the space needed to install your new\n"
+"Mandrake Linux system.\n"
+"\n"
+"Because the process of partitioning a hard drive is usually irreversible\n"
+"and can lead to lost data if there is an existing operating system already\n"
+"installed on the drive, partitioning can be intimidating and stressful if\n"
+"you are an inexperienced user. Fortunately, DrakX includes a wizard which\n"
+"simplifies this process. Before continuing with this step, read through the\n"
+"rest of this section and above all, take your time.\n"
 "\n"
-" * \"Install\": completely wipes out the old system. However, depending on\n"
-"what is currently installed on your machine, you may be able to keep some\n"
-"old partitions (Linux or otherwise) unchanged;\n"
+"Depending on your hard drive configuration, several options are available:\n"
 "\n"
-" * \"Upgrade\": this installation class allows to simply update the\n"
-"packages currently installed on your Mandrake Linux system. It keeps your\n"
-"hard drives' current partitions as well as user configurations. All other\n"
-"configuration steps remain available, similar to a normal installation;\n"
+" * \"Use free space\": this option will perform an automatic partitioning\n"
+"of your blank drive(s). If you use this option there will be no further\n"
+"prompts.\n"
 "\n"
-" * \"Upgrade Packages Only\": this new installation class allows you to\n"
-"upgrade an existing Mandrake Linux system while keeping all system\n"
-"configurations unchanged. Adding new packages to the current installation\n"
-"is also possible.\n"
+" * \"Use existing partition\": the wizard has detected one or more existing\n"
+"Linux partitions on your hard drive. If you want to use them, choose this\n"
+"option. You will then be asked to choose the mount points associated with\n"
+"each of the partitions. The legacy mount points are selected by default,\n"
+"and for the most part it's a good idea to keep them.\n"
 "\n"
-"Upgrades should work fine on Mandrake Linux systems using version \"8.1\"\n"
-"or later.\n"
+" * \"Use the free space on the Windows partition\": if Microsoft Windows is\n"
+"installed on your hard drive and takes all the space available on it, you\n"
+"have to create free space for Linux data. To do so, you can delete your\n"
+"Microsoft Windows partition and data (see `` Erase entire disk'' solution)\n"
+"or resize your Microsoft Windows FAT partition. Resizing can be performed\n"
+"without the loss of any data, provided you previously defragment the\n"
+"Windows partition and that it uses the FAT format. Backing up your data is\n"
+"strongly recommended.. Using this option is recommended if you want to use\n"
+"both Mandrake Linux and Microsoft Windows on the same computer.\n"
 "\n"
-"Depending on your GNU/Linux knowledge, select one of the following choices:\n"
+"   Before choosing this option, please understand that after this\n"
+"procedure, the size of your Microsoft Windows partition will be smaller\n"
+"then when you started. You will have less free space under Microsoft\n"
+"Windows to store your data or to install new software.\n"
 "\n"
-" * Recommended: choose this if you have never installed a GNU/Linux\n"
-"operating system. The installation will be very easy and you will only be\n"
-"asked a few questions;\n"
+" * \"Erase entire disk\": if you want to delete all data and all partitions\n"
+"present on your hard drive and replace them with your new Mandrake Linux\n"
+"system, choose this option. Be careful, because you will not be able to\n"
+"undo your choice after you confirm.\n"
 "\n"
-" * Expert: if you have a good GNU/Linux understanding, you may wish to\n"
-"perform a highly customized installation. Some of the decisions you will\n"
-"have to make may be difficult if you do not have good GNU/Linux knowledge,\n"
-"so it is not recommended that those without a fair amount of experience\n"
-"select this installation class."
-msgstr ""
-"DrakX soovib nüüd teada, kas eelistate sooritada tavalist (\"Soovitatav\")\n"
-"paigaldust või kontrollida seda olulisel määral (\"Ekspert\"). Valida saab "
-"ka\n"
-"seda, kas tegemist on uue paigaldusega või varasema süsteemi uuendamisega.\n"
+"   !! If you choose this option, all data on your disk will be deleted. !!\n"
 "\n"
-" * \"Paigaldamine\": pühib täielikult minema varasema(d) süsteemi(d). "
-"Sõltuvalt\n"
-"sellest, mis on praegu Teie masinale paigaldatud, on siiski võimalik jätta "
-"mõned\n"
-"vanad partitsioonid (olgu Linux või mitte) muutmata.\n"
+" * \"Remove Windows\": this will simply erase everything on the drive and\n"
+"begin fresh, partitioning everything from scratch. All data on your disk\n"
+"will be lost.\n"
 "\n"
-" * \"Uuendamine\": selle abil saab uuendada praeguse Mandrake Linuxi "
-"süsteemi\n"
-"pakette. Kõvaketta partitsioonid ja kasutaja(te) seadistused jäävad "
-"puutumata.\n"
-"Muud seadistamisjärgud on siiski sarnaselt tavapaigaldusele interaktiivsed.\n"
-"\n"
-" * \"Ainult pakettide uuendamine\": see uus paigaldusviis võimaldab "
-"uuendada\n"
-"olemasolevat Mandrake Linuxi süsteemi, jättes kõik selle seadistused "
-"puutumata.\n"
-"Praegusele süsteemile on võimalik lisada ka uusi pakette.\n"
-"\n"
-"Uuendamine peaks toimina edukalt Mandrake Linuxi süsteemidel, mille "
-"versioon\n"
-"on \"8.1\" või uuem.\n"
-"\n"
-"Sõltuvalt Teie GNU/Linuxi alastest teadmistest saate valida erineva "
-"tasemega\n"
-"paigaldus- või uuendusmeetodi:\n"
-"\n"
-"* Soovitatav: Te ei ole varem GNU/Linuxit paigaldanud. Kõik tehakse lihtsaks "
-"ja esitatakse vähe küsimusi.\n"
-"\n"
-"* Ekspert: Te tunnete end GNU/Linuxi keskkonnas vabalt ja soovite\n"
-"süsteemi, mis sobiks nagu valatult Teie täpsete ootustega.\n"
-"Aga palun, palun: ÄRGE VALIGE SEDA, KUI TE TÄPSELT EI TEA, MIDA TEETE!"
-
-#: ../../help.pm_.c:582
-msgid ""
-"Normally, DrakX selects the right keyboard for you (depending on the\n"
-"language you have chosen). However, you might not have a keyboard that\n"
-"corresponds exactly to your language: for example, if you are an English\n"
-"speaking Swiss person, you may still want your keyboard to be a Swiss\n"
-"keyboard. Or if you speak English but are located in Quebec, you may find\n"
-"yourself in the same situation. In both cases, you will have to go back to\n"
-"this installation step and select an appropriate keyboard from the list.\n"
-"\n"
-"Click on the \"More\" button to be presented with the complete list of\n"
-"supported keyboards.\n"
+"   !! If you choose this option, all data on your disk will be lost. !!\n"
 "\n"
-"If you choose a keyboard layout based on a non-latin alphabet, you will be\n"
-"asked in the next dialog to choose the key binding that will switch the\n"
-"keyboard layout between the latin and non-latin layouts."
+" * \"Custom disk partitionning\": choose this option if you want to\n"
+"manually partition your hard drive. Be careful -- it is a powerful but\n"
+"dangerous choice and you can very easily lose all your data. That's why\n"
+"this option is really only recommended if you have done something like this\n"
+"before and have some experience. For more instructions on how to use the\n"
+"DiskDrake utility, refer to the ``Managing Your Partitions '' section in\n"
+"the ``Starter Guide''."
 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.\n"
+"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrake Linux\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"
+"Partitsioneerimine on tegevus, mille käigus tekitatakse kettale loogilised\n"
+"piirkonnad Teie uue Mandrake Linux süsteemi paigaldamiseks.\n"
 "\n"
-"Klõpsake nupul \"Rohkem\", mis näitab kõiki toetatud klaviatuure.\n"
+"Kuna partitsioneerimine ei ole pööratav 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"
 "\n"
-"Kui valite mitte-ladina tähestikuga klaviatuuri, palutakse Teil järgmises\n"
-"dialoogis valida klahv või klahvikombinatsioon, mis vahetab ladina ja\n"
-"mitte-ladina asetusega klaviatuuri."
-
-#: ../../help.pm_.c:598
-msgid ""
-"The first step is to choose your preferred language.\n"
+"Sõltuvalt kõvaketta omadustest on ketta jagamiseks ehk partitsioneerimiseks\n"
+"mitmeid võimalusi.\n"
 "\n"
-"Please choose your preferred language for installation and system usage.\n"
+" * \"Kasuta vaba ruumi\": see partitsioneerib lihtsalt Teie tühja(d) "
+"kõvaketta(d).\n"
+"Mingeid edasisi küsimusi ei esitata.\n"
 "\n"
-"Clicking on the \"Advanced\" button will allow you to select other\n"
-"languages to be installed on your workstation. Selecting other languages\n"
-"will install the language-specific files for system documentation and\n"
-"applications. For example, if you host users from Spain on your machine,\n"
-"select English as the main language in the tree view and in the Advanced\n"
-"section, click on the box corresponding to \"Spanish|Spain\".\n"
+" * \"Kasuta olemasolevat partitsiooni\": nõustaja avastas kõvakettal "
+"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"
+"valitakse need juba ette ära ja üldiselt oleks mõistlik neid mitte muuta.\n"
 "\n"
-"Note that multiple languages may be installed. Once you have selected any\n"
-"additional locales, click the \"OK\" button to continue.\n"
+" * \"Kasuta vaba ruumi Windowsi partitsioonil\": kui kõvakettale on "
+"paigaldatud\n"
+"Microsoft Windows ja see haarab enda alla kogu kõvaketta, võite luua vabale\n"
+"alale nurgakese 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 "
+"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"
+"nii Mandrake Linuxit kui Microsoft Windowsit.\n"
 "\n"
-"To switch from one language to the other, you can launch the\n"
-"\"/usr/sbin/localedrake\" command as \"root\" to change the whole system\n"
-"language, or as a simple user to only change that user's default language."
-msgstr ""
-"Esimene samm on meelepärase keele valik.\n"
+"   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "
+"protseduuri\n"
+"järel on Teie Microsoft Windowsi partitsioon senisest väiksem, mis tähendab, "
+"et\n"
+"sellel on ka vähem ruumi andmete salvestamiseks või uue tarkvara "
+"paigaldamiseks.\n"
 "\n"
-"Palun valige keel, mida kasutada paigaldamisel ja hilisemas töös.\n"
+" * \"Puhasta kogu ketas\": kui soovite kustutada kõik andmed ja "
+"partitsioonid, mis\n"
+"kõvakettal parajasti on, ning asendada need uue Mandrake Linuxi süsteemiga, "
+"on\n"
+"see õige valik. Aga tasub olla ettevaatlik, sest pärast selle valiku "
+"langetamist\n"
+"tagasiteed enam ei ole...\n"
 "\n"
-"Klõpsates nupul \"Muud\", 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"
-"Hispaaniast, valige puuvaates põhikeeleks inglise keel ning sektsioonis\n"
-"\"Muud\" märkige ära \"Hispaania|Hispaania\".\n"
+"   !! Kui valite selle võimaluse, kaotate kõik kõvakettal olevad andmed. !!\n"
 "\n"
-"Paigaldada võib ka mitu keelt. Kui olete valinud, millised lisakeeled\n"
-"paigaldada, klõpsake jätkamiseks nupul \"Olgu\".\n"
+" * \"Eemalda Windows\": see puhastab kõvaketta senistest andmetest ja\n"
+"käivitab uue paigaldusprotsessi, luues kõik partitsioonid uuesti. Kaovad ka\n"
+"kõik kettal olnud andmed.\n"
 "\n"
-"Ühelt keelelt teisele lülitumiseks võite administraatorina anda käsu\n"
-"\"/usr/sbin/localedrake\", mis võimaldab muuta kogu süsteemi keelt,\n"
-"või tavakasutajana muuta ainult enda kohta käivat keeleseadistust."
+"   !! Kui valite selle võimaluse, kaotate kõik kõvakettal olevad andmed. !!\n"
+"\n"
+" ' \"Ekspertresiim\": valige see, kui soovite ise kontrollida kõvaketta "
+"jagamist\n"
+"partitsioonideks. 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, \"Käivitusjuhiste\" osast "
+"\"Partitsioonide\n"
+"haldamine\"."
 
-#: ../../help.pm_.c:617
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"DrakX generally detects the number of buttons your mouse possesses. If not,\n"
-"it assumes you have a two-button mouse and will set it up for third-button\n"
-"emulation. DrakX will automatically know whether it is a PS/2, serial or\n"
-"USB mouse.\n"
-"\n"
-"If you wish to specify a different type of mouse, select the appropriate\n"
-"type from the provided list.\n"
+"Checking \"Create a boot disk\" allows you to have a rescue bot media\n"
+"handy.\n"
 "\n"
-"If you choose a mouse other than the default, a test screen will be\n"
-"displayed. Use the buttons and wheel to verify that the settings are\n"
-"correct. If the mouse is not working well, press the space bar or [Return]\n"
-"to \"Cancel\" and choose again.\n"
+"The Mandrake Linux CD-ROM has a built-in rescue mode. You can access it by\n"
+"booting the CD-ROM, pressing the >> F1<< key at boot and typing >>rescue<<\n"
+"at the prompt. If your computer cannot boot from the CD-ROM, there are at\n"
+"least two situations where having a boot floppy is critical:\n"
+"\n"
+" * when installing the bootloader, DrakX will rewrite the boot sector (MBR)\n"
+"of your main disk (unless you are using another boot manager), to allow you\n"
+"to start up with either Windows or GNU/Linux (assuming you have Windows on\n"
+"your system). If at some point you need to reinstall Windows, the Microsoft\n"
+"install process will rewrite the boot sector and remove your ability to\n"
+"start GNU/Linux!\n"
+"\n"
+" * if a problem arises and you cannot start GNU/Linux from the hard disk,\n"
+"this floppy will be the only means of starting up GNU/Linux. It contains a\n"
+"fair number of system tools for restoring a system that has crashed due to\n"
+"a power failure, an unfortunate typing error, a forgotten root password, or\n"
+"any other reason.\n"
+"\n"
+"If you say \"Yes\", you will be asked to insert a disk in the drive. The\n"
+"floppy disk must be blank or have non-critical data on it - DrakX will\n"
+"format the floppy and will rewrite the whole disk."
+msgstr ""
+"Märkides ära \"Alglaadimisketta loomine\", on Teil võimalik luua endale\n"
+"käepärane abimees alglaadimiseks kriisiolukorras.\n"
 "\n"
-"Sometimes, wheel mouses are not automatically detected. You will need to\n"
-"manually select it in the list. Be sure to select the one corresponding to\n"
-"the correct port it is attached to. After you have pressed the \"OK\"\n"
-"button, a mouse image will be displayed. You then need to move the wheel of\n"
-"your mouse to activate it correctly. Then test that all buttons and\n"
-"movements are correct."
-msgstr ""
-"Tavaliselt tuvastab DrakX hõlpsasti, mitme nupuga hiirt Te kasutate. Kui\n"
-"see välja ei tule, eeldatakse, et Teil on kahe nupuga hiir, ning "
-"kasutatakse\n"
-"kolmanda nupu emuleerimist. DrakX tuvastab automaatselt, kas tegemist on\n"
-"PS/2, jadapordi või USB-hiirega.\n"
+"Mandrake Linuxi CD-ROM võib toimida ka päästeresiimis. Seda saab kasutada\n"
+"järgmiselt: teete alglaadimise CD-ROMilt, vajutate selle ajal >>F1<< ning \n"
+"kirjutate käsureale >>rescue<<. Kui Teie arvuti aga ei ole võimeline tegema\n"
+"alglaadimist CD-ROMilt, tuleks tulla selle sammu juurde tagasi abi otsima\n"
+"vähemalt kahe situatsiooni korral:\n"
 "\n"
-"Kui soovite muuta hiiretüüpi, valige pakutud nimekirjast sobiv tüüp.\n"
+" * alglaadurit paigaldades kirjutab DrakX üle Teie põhiketta avasektori "
+"(MBR;\n"
+"muidugi ainult juhul, kui Te ei kasuta mõnda muud alglaadurit), mis "
+"võimaldab\n"
+"käivitada näiteks nii Windowsi kui GNU/Linuxi (eeldusel mõistagi, et Teie\n"
+"süsteemis on Windows). Kui tekib vajadus Windows uuesti paigaldada, "
+"kirjutab\n"
+"Microsofti paigaldusprotsess avasektori üle ning Te ei suuda enam käivitada\n"
+"GNU/Linuxit!\n"
 "\n"
-"Kui valite mõne muu hiiretüübi kui vaikimisi määratu, palutakse Teil seda\n"
-"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"
+" *kui tekib mingi probleem ja GNU/Linuxit pole võimalik käivitada "
+"kõvakettalt,\n"
+"on flopiketas ainuke võimalus seda käima saada. Sellel leiduvad mõningad\n"
+"süsteemi taastamise vahendid, kui too on kannatada saanud voolukatkestuse,\n"
+"ebaõnnestunud redigeerimise, paroolieksimuse või mõne muu põhjuse tõttu.\n"
 "\n"
-"Vahel ei õnnestu rattaga hiirt automaatselt tuvastada. Siis tuleb see "
-"loendist\n"
-"käsitsi valida. Kontrollige, et valite õigesse porti ühendatud hiiretüübi. "
-"Kui\n"
-"vajutate nupule \"Olgu\", näidatakse hiire kujutist. Siis tuleb Teil "
-"liigutada\n"
-"hiireratast, et see korrektselt aktiveerida. Seejärel testige, kas kõik "
-"nupud\n"
-"ja liigutused toimivad korralikult."
+"Kui vastate \"Jah\", palutakse sisestada seadmesse flopiketas. See peab "
+"olema\n"
+"puhas või vähemalt andmetega, mida Teil enam vaja ei lähe. Teil pole vaja "
+"seda\n"
+"ise vormindada, selle mure võtab DrakX enda kanda."
 
-#: ../../help.pm_.c:638
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Please select the correct port. For example, the \"COM1\" port under\n"
-"Windows is named \"ttyS0\" under GNU/Linux."
+"Finally, you will be asked whether you want to see the graphical interface\n"
+"at boot. Note this question will be asked even if you chose not to test the\n"
+"configuration. Obviously, you want to answer \"No\" if your machine is to\n"
+"act as a server, or if you were not successful in getting the display\n"
+"configured."
 msgstr ""
-"Palun valige õige port. Näiteks MS Windowsi \"COM1\" kannab\n"
-"GNU/Linuxis nime \"ttyS0\"."
+"Lõpuks küsitakse Teie käest, kas soovite kasutada graafilist töökeskkonda\n"
+"kohe alglaadimisel. Pange tähele, et seda päritakse ka siis, kui Te ei "
+"proovinudki\n"
+"seadistusi testida. On üsna ilmne, et vastus kõlab \"Ei\", kui masina "
+"ülesanne\n"
+"on tegutseda serverina või kui Teid ei kippunud seadistamise ajal edu saatma."
 
-#: ../../help.pm_.c:642
-msgid ""
-"This is the most crucial decision in regards with the security of your\n"
-"GNU/Linux system: you have to enter the \"root\" password. \"Root\" is the\n"
-"system administrator and is the only one authorized to make updates, add\n"
-"users, change the overall system configuration, and so on. In short,\n"
-"\"root\" can do everything! That is why you must choose a password that is\n"
-"difficult to guess -- DrakX will tell you if it is too easy. As you can\n"
-"see, you can choose not to enter a password, but we strongly advise you\n"
-"against this if only for one reason: do not think that because you booted\n"
-"GNU/Linux that your other operating systems are safe from mistakes. Since\n"
-"\"root\" can overcome all limitations and unintentionally erase all data on\n"
-"partitions by carelessly accessing the partitions themselves, it is\n"
-"important for it to be difficult to become \"root\".\n"
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"In the case that different servers are available for your card, with or\n"
+"without 3D acceleration, you are then proposed to choose the server that\n"
+"best suits your needs."
+msgstr ""
+"Juhul, kui Teie kaardile peaks saada olema erinevaid servereid nii 3D\n"
+"kiirendusega kui ilma, saate valida serveri, mis Teie vajadustele\n"
+"kõige enam vastab."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"Resolution\n"
 "\n"
-"The password should be a mixture of alphanumeric characters and at least 8\n"
-"characters long. Never write down the \"root\" password -- it makes it too\n"
-"easy to compromise a system.\n"
+"   You can choose here resolutions and color depth between those available\n"
+"for your hardware. Choose the one that best suit your needs (you will be\n"
+"able to change that after installation though). Asample of the chosen\n"
+"configuration is shown in the monitor."
+msgstr ""
+"Kuvatihedus\n"
 "\n"
-"However, please do not make the password too long or complicated because\n"
-"you must be able to remember it without too much effort.\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"
+"hiljem muuta. Valitud seadistust näidatakse monitoril."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"Monitor\n"
 "\n"
-"The password will not be displayed on screen as you type it in. Hence, you\n"
-"will have to type the password twice to reduce the chance of a typing\n"
-"error. If you do happen to make the same typing error twice, this\n"
-"``incorrect'' password will have to be used the first time you connect.\n"
+"   The installer can normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is not the case, you can choose in\n"
+"this list the monitor you actually own."
+msgstr ""
+"Monitor\n"
 "\n"
-"In Expert mode, you will be asked if you will be connecting to an\n"
-"authentication server, like NIS or LDAP.\n"
+"   Paigaldaja tuvastab ja seadistab tavaliselt automaatselt Teie masinaga\n"
+"ühendatud monitori. Kui see ei peaks siiski õnnestuma, saate siin toodud\n"
+"nimekirjast valida monitori, mis Teil tegelikult on."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
+"on which all the graphical environments (KDE, GNOME, AfterStep,\n"
+"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
 "\n"
-"If your network uses either LDAP, NIS, or PDC Windows Domain authentication\n"
-"services, select the appropriate one as \"authentication\". If you have no\n"
-"clue, ask your network administrator.\n"
+"You will be presented the list of different parameters to change to get an\n"
+"optimal graphical display: Graphic Card\n"
 "\n"
-"If your computer is not connected to any administrated network, you will\n"
-"want to choose \"Local files\" for authentication."
-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"
-"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"
+"   The installer can normally automatically detect and configure the\n"
+"graphic card installed on your machine. If it is not the case, you can\n"
+"choose in this list the card you actually own.\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 - "
-"see\n"
-"võib muuta ligipääsu Teie süsteemile võõrastele liiga hõlpsaks.\n"
+"   In the case that different servers are available for your card, with or\n"
+"without 3D acceleration, you are then proposed to choose the server that\n"
+"best suits your needs.\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 Te teete "
-"ühesuguse\n"
-"vea kaks korda järjest, on just see \"vigane\" parool, mida Teilt oodatakse\n"
-"administraatorina sisselogimisel.\n"
 "\n"
-"Ekspertresiimis päritakse Teie käest, kas soovite ühendust mõne\n"
-"autentimisserveriga (nt NIS või LDAP).\n"
 "\n"
-"Kui Teie võrgus on kasutusel LDAP või PDC Windowsi domeeni autentimise\n"
-"teenused, valige neist sobilik autentimismeetodiks. Kui Te aga ei juhtu "
-"teadma,\n"
-"mida teha, pöörduge oma võrgu administraatori poole.\n"
+"Monitor\n"
 "\n"
-"Kui arvuti ei ole ühendatud ühtegi administreeritavasse võrku, on mõttekas\n"
-"valida autentimisviis \"Kohalikud failid\"."
-
-#: ../../help.pm_.c:678
-msgid ""
-"LILO and grub are GNU/Linux bootloaders. Normally, this stage is totally\n"
-"automated. In fact, DrakX analyzes the disk boot sector and acts\n"
-"accordingly, depending on what it finds there:\n"
+"   The installer can normally automatically detect and configure the\n"
+"monitor connected to your machine. If it is not the case, you can choose in\n"
+"this list the monitor you actually own.\n"
 "\n"
-" * if a Windows boot sector is found, it will replace it with a grub/LILO\n"
-"boot sector. Hence, you will be able to load either GNU/Linux or another\n"
-"OS;\n"
 "\n"
-" * if a grub or LILO boot sector is found, it will replace it with a new\n"
-"one.\n"
 "\n"
-"if in doubt, DrakX will display a dialog with various options.\n"
+"Resolution\n"
 "\n"
-" * \"Bootloader to use\": you have three choices:\n"
+"   You can choose here resolutions and color depth between those available\n"
+"for your hardware. Choose the one that best suit your needs (you will be\n"
+"able to change that after installation though). Asample of the chosen\n"
+"configuration is shown in the monitor.\n"
 "\n"
-"    * \"GRUB\": if you prefer grub (text menu);\n"
 "\n"
-"    * \"LILO with graphical menu\": if you prefer LILO with its graphical\n"
-"interface;\n"
 "\n"
-"    * \"LILO with text menu\": if you prefer LILO with its text menu\n"
-"interface.\n"
+"Test\n"
 "\n"
-" * \"Boot device\": in most cases, you will not change the default\n"
-"(\"/dev/hda\"), but if you prefer, the bootloader can be installed on the\n"
-"second hard drive (\"/dev/hdb\"), or even on a floppy disk (\"/dev/fd0\");\n"
+"   the system will try to open a graphical screen at the desired\n"
+"resolution. If you can see the message during the test and answer \"Yes\",\n"
+"then DrakX will proceed to the next step. If you cannot see the message, it\n"
+"means that some part of the autodetected configuration was incorrect and\n"
+"the test will automatically end after 12 seconds, bringing you back to the\n"
+"menu. Change settings until you get a correct graphical display.\n"
 "\n"
-" * \"Delay before booting the default image\": when rebooting the computer,\n"
-"this is the delay granted to the user to choose -- in the bootloader menu,\n"
-"another boot entry than the default one.\n"
 "\n"
-"!! Beware that if you choose not to install a bootloader (by selecting\n"
-"\"Cancel\" here), you must ensure that you have a way to boot your Mandrake\n"
-"Linux system! Also, be sure you know what you do before changing any of the\n"
-"options. !!\n"
 "\n"
-"Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
-"options, which are reserved for the expert user."
+"Options\n"
+"\n"
+"   You can here choose whether you want to have your machine automatically\n"
+"switch to a graphical interface at boot. Obviously, you want to check\n"
+"\"No\" if your machine is to act as a server, or if you were not successful\n"
+"in getting the display configured."
 msgstr ""
-"LILO ja grub on GNU/Linuxi alglaadurid. Tavaliselt käib see täiesti "
-"automaatselt.\n"
-"DrakX analüüsib Teie kõvaketta algsektorit ning tegutseb vastavalt sellele,\n"
-"mida ta sealt leiab:\n"
+"X (ehk X Window System) kujutab endast GNU/Linuxi graafilise "
+"kasutajaliidese\n"
+"tuuma ja südant, millele toetuvad kõik Mandrake Linuxiga kaasas käivad\n"
+"graafilised töökeskkonnad (KDE, GNOME, AfterStep, WindowMaker jne).\n"
 "\n"
-" * kui avastatakse Windowsi alglaadimissektor, asendatakse see grub/LILO\n"
-"alglaadimissektoriga, pärast mida on Teil võimalus laadida kas GNU/Linux\n"
-"või mõni muu operatsioonisüsteem.\n"
+"Siin näidatakse Teile tervet nimekirja parameetreid, mida saab muuta,\n"
+"et graafiline kasutajaliides oleks just Teile meelepärane: Videokaart\n"
 "\n"
-" * kui leitakse grubi või LILO alglaadimissektor, asendatakse see uuega.\n"
+"   Paigaldaja tuvastab ja seadistab tavaliselt automaatselt masinale\n"
+"paigaldatud videokaardi. Kui see ei õnnestu, saate nimekirjast valida\n"
+"kaardi, mis tegelikult on masinale paigaldatud.\n"
 "\n"
-"kui DrakX ei suuda selgusele jõuda, palub ta valiku teha Teil.\n"
+"   Juhul, kui Teie kaardile peaks saada olema erinevaid servereid nii 3D\n"
+"kiirendusega kui ilma, saate valida serveri, mis Teie vajadustele\n"
+"kõige enam vastab.\n"
 "\n"
-" * \"Alglaaduri valik\": siin on kolm valikut:\n"
 "\n"
-"    * \"GRUB\": kui eelistate grubi (tekstimenüü).\n"
 "\n"
-"    * \"LILO graafilisena\": kui eelistate LILOt graafilisel kuju.\n"
+"Monitor\n"
 "\n"
-"    * \"LILO tekstiresiimis\": kui eelistate LILOt teksti kujul.\n"
+"   Paigaldaja tuvastab ja seadistab tavaliselt automaatselt Teie masinaga\n"
+"ühendatud monitori. Kui see ei peaks siiski õnnestuma, saate siin toodud\n"
+"nimekirjast valida monitori, mis Teil tegelikult on.\n"
 "\n"
-" * \"Alglaadimisseade\": enamasti ei ole sügavat mõtet muuta vaikimisi "
-"valikut\n"
-"(\"/dev/hda\"), aga kui Te väga soovite, võib alglaaduri paigaldada ka "
-"teisele\n"
-"kõvakettale (\"/dev/dhdb\") või isegi flopikettale (\"/dev/fd0\").\n"
 "\n"
-" * \"Viivitus\": arvutile alglaadimist tehes pakutakse Teile võimalust "
-"väikeseks\n"
-"pausiks, mille jooksul saab alglaadimismenüüst valida mõne muu kirje kui\n"
-"vaikimisi pakutu.\n"
 "\n"
-"!! Pange tähele, et kui Te otsustate alglaadurit mitte paigaldada (klõpsates "
-"siin\n"
-"nupule \"Katkesta\"), peate kuidagi leidma mooduse, kuidas oma Mandrake\n"
-"Linux siiski tööle saada! Ja päris hea oleks, kui Te kindlalt teaksite, mida "
-"teete,\n"
-"enne kui mõnda siin pakutud võimalust muuta. !!\n"
+"Resolution\n"
 "\n"
-"Klõpsuga nupul \"Muud\" saab näha veel mitmeid valikuid, mis on mõeldud\n"
-"kogenud kasutajatele."
+"   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"
+"hiljem muuta. Valitud seadistust näidatakse monitoril.\n"
+"\n"
+"\n"
+"\n"
+"Test\n"
+"\n"
+"   süsteem püüab avada graafilist akent soovitud kuvatihedusega. Kui näete\n"
+"testi ajal sõnumit ja vastate \"Jah\", 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"
+"Teid menüüsse tagasi. Seal saate muuta seadistusi, kuni Teil õnnestub\n"
+"leida see, mis tagab korrektse ja meelepärase graaafilise kasutajaliidese.\n"
+"\n"
+"\n"
+"\n"
+"Valikud\n"
+"\n"
+"   Siin saab määrata, kas soovite, et masin käivitaks alglaadimise ajal\n"
+"automaatselt graafilise kasutajaliidese. Ilmselt on Teie vastus \"Ei\",\n"
+"kui soovite, et masin toimiks serverina, või kui Teid ei kippunud\n"
+"seadistamise ajal edu saatma."
 
-#: ../../help.pm_.c:718
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"After you have configured the general bootloader parameters, the list of\n"
-"boot options which will be available at boot time will be displayed.\n"
+"Graphic Card\n"
 "\n"
-"If there is another operating system installed on your machine, it will\n"
-"automatically be added to the boot menu. Here, you can choose to fine-tune\n"
-"the existing options. Select an entry and click \"Modify\" to modify or\n"
-"remove it. \"Add\" creates a new entry. and \"Done\" goes on to the next\n"
-"installation step.\n"
+"   The installer can normally automatically detect and configure the\n"
+"graphic card installed on your machine. If it is not the case, you can\n"
+"choose in this list the card you actually own.\n"
 "\n"
-"You may also not want to give access to these other operating systems to\n"
-"anyone. In which case, you can delete the corresponding entries. But then,\n"
-"you will need a boot disk in order to boot those other operating systems!"
+"   In the case that different servers are available for your card, with or\n"
+"without 3D acceleration, you are then proposed to choose the server that\n"
+"best suits your needs."
 msgstr ""
-"Kui olete määranud alglaaduri üldised parameetrid, näidatakse loendit\n"
-"alglaadimise ajal kasutatavatest valikutest.\n"
+"Videokaart\n"
 "\n"
-"Kui masinale on paigaldatud veel mõni operatsioonisüsteem, lisatakse see\n"
-"automaatselt alglaaduri menüüsse. Siin saate olemasolevaid valikuid oma\n"
-"maitse järgi häälestada. Valige kirje ja klõpsake nupul \"Muuda\" selle\n"
-"muutmiseks või kustutamiseks. \"Lisa\" võimaldab luua uue kirje ning\n"
-"\"Tehtud\" viib Teid paigalduse järgmise sammu juurde.\n"
+"   Paigaldaja tuvastab ja seadistab tavaliselt automaatselt masinale\n"
+"paigaldatud videokaardi. Kui see ei õnnestu, saate nimekirjast valida\n"
+"kaardi, mis tegelikult on masinale paigaldatud.\n"
 "\n"
-"Teil võib muidugi olla ka soov mitte anda kellelegi ligipääsu teistele\n"
-"operatsioonisüsteemidele, millisel juhul võite vastavad kirjed kustutada.\n"
-"Aga siis läheb Teil kindlasti vaja alglaadimisketast, et ka ise neile ligi "
-"pääseda!"
+"   Juhul, kui Teie kaardile peaks saada olema erinevaid servereid nii 3D\n"
+"kiirendusega kui ilma, saate valida serveri, mis Teie vajadustele\n"
+"kõige enam vastab."
 
-#: ../../help.pm_.c:732
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"You must indicate where you wish to place the information required to boot\n"
-"GNU/Linux.\n"
+"GNU/Linux manages time in GMT (Greenwich Mean Time) and translates it to\n"
+"local time according to the time zone you selected. If the clock on your\n"
+"motherboard is set to local time, you may deactivate this by unselecting\n"
+"\"Hardware clock set to GMT \", which will let GNU/Linux know that the\n"
+"system clock and the hardware clock are in the same timezone. This is\n"
+"useful when the machine also hosts another operating system like Windows.\n"
 "\n"
-"Unless you know exactly what you are doing, choose \"First sector of drive\n"
-"(MBR)\"."
+"The \"Automatic time synchronization \" option will automatically regulate\n"
+"the clock by connecting to a remote time server on the Internet. For this\n"
+"feature to work, you must have a working Internet connection. It is best to\n"
+"choose a time server located near you. This option actually installs a time\n"
+"server that can used by other machines on your local network."
 msgstr ""
-"Nüüd peate valima, milliselt kettaosalt soovite GNU/Linuxit laadida.\n"
+"GNU/Linux kasutab GMT (Greenwichi) aega ning teisendab selle\n"
+"kohalikuks ajaks vastavalt Teie valitud ajavööndile. Seda võib siiski ka "
+"välja\n"
+"lülitada, kui jätta märkimata \"Arvutikell kasutab GMT-d\". Sellisel juhul "
+"kajastab\n"
+"arvutikell sama aega, mis süsteemi kell. See võib olla kasulik, kui masinas "
+"on\n"
+"veel mõni operatsioonisüsteem, näiteks Windows.\n"
 "\n"
-"Valige \"Kõvaketta esimene sektor (MBR)\", kui Te ei tea täpselt, mida\n"
-"teha."
+"Võimalus \"Aja automaatne sünkroniseerimine\" 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 "
+"saab\n"
+"kasutada isegi teiste kohtvõrgus olevate masinate aja täpsustamiseks."
 
-#: ../../help.pm_.c:739
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Here, we select a printing system for your computer. Other OSes may offer\n"
-"you one, but Mandrake Linux offers two.\n"
+"This step is used to choose which services you wish to start at boot time.\n"
+"\n"
+"DrakX will list all the services available on the current installation.\n"
+"Review each one carefully and uncheck those which are not always needed at\n"
+"boot time.\n"
 "\n"
-" * \"pdq\" -- which means ``print, don't queue'', is the choice if you have\n"
-"a direct connection to your printer and you want to be able to panic out of\n"
-"printer jams, and you do not have networked printers. It will handle only\n"
-"very simple network cases and is somewhat slow for networks. Pick \"pdq\"\n"
-"if this is your first voyage to GNU/Linux. You can change your choices\n"
-"after installation by running PrinterDrake from the Mandrake Control Center\n"
-"and clicking the expert button.\n"
+"A short explanatory text will be displayed about a service when it is\n"
+"selected. However, if you are not sure whether a service is useful or not,\n"
+"it is safer to leave the default behavior.\n"
 "\n"
-" * \"CUPS\" -- ``Common Unix Printing System'', is excellent at printing to\n"
-"your local printer and also halfway-around the planet. It is simple and can\n"
-"act as a server or a client for the ancient \"lpd\" printing system. Hence,\n"
-"it is compatible with the systems that went before. It can do many tricks,\n"
-"but the basic setup is almost as easy as \"pdq\". If you need this to\n"
-"emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
-"graphical front-ends for printing or choosing printer options."
+"!! At this stage, be very careful if you intend to use your machine as a\n"
+"server: you will probably not want to start any services that you do not\n"
+"need. Please remember that several services can be dangerous if they are\n"
+"enabled on a server. In general, select only the services you really need.\n"
+"!!"
 msgstr ""
-"Siin saate valida oma arvutile trükkimissüsteemi. Teised "
-"operatsioonisüsteemid\n"
-"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrake Linuxi puhul saate\n"
-"valida tervelt kahe seast.\n"
+"Nüüd saate valida, millised teenused peaks käivitama alglaadimisel.\n"
 "\n"
-" * \"pdq\" - mis tähendab ``trüki kohe'' (``print, don't queue'') - tuleks "
-"valida siis,\n"
-"kui Teil on printeriga otseühendus, Te ei soovi näha mingeid järjekordi ja "
-"Teil\n"
-"ei ole võrgus asuvaid printereid. Võrkude puhul on \"pdq\" mõnevõrra aeglane "
-"ja\n"
-"tal võib esineda tegutsemisraskusi. Kui see on Teie esimene retk GNU/Linuxi\n"
-"maailma, valige \"pdq\". Kui soovite valikut hiljem muuta, siis saate seda "
-"teha\n"
-"Mandrake juhtimiskeskuses PrinterDrake abil.\n"
+"Siin on üles loetud kõik teenused, mis on saadaval antud paigalduse puhul.\n"
+"Uurige neid hoolega ja jätke valimata kõik, mida ei ole alglaadimise ajal\n"
+"tingimata vajalik käivitada.\n"
 "\n"
-" * \"CUPS\" - ``tavaline UNIXi trükkimissüsteem'' (``Common Unix Printing\n"
-"System'') - on hiilgav valik trükkimiseks Teie kohalikul printeril ja veel "
-"nii pooles\n"
-"maailmas. See on lihtne süsteem, mis võib olla nii kliendiks kui serveriks "
-"iidsele\n"
-"trükkimissüsteemile \"lpd\". See on ka ühilduv varasemate süsteemidega. "
-"\"CUPS\"\n"
-"suudab teha palju asju, kuid põhitegutsemine on sama lihtne kui \"pdq\" "
-"puhul.\n"
-"Kui Teil on vajadus emuleerida \"lpd\"-serverit, tuleb sisse lülitada\n"
-"\"cups-lpd\"-deemon. \"CUPSil\" on ka mitu graafilist kasutajaliidest\n"
-"trükkimiseks või printeri seadistamiseks."
+"Konkreetset teenust valides näete selle kohta lühikest seletavat teksti. "
+"Kui\n"
+"Te ei ole aga kindel, kas teenus on kasulik või mitte, on mõistlik jätta "
+"kehtima\n"
+"vaikevalik (olgu see siis lubav või mitte).\n"
+"\n"
+"!! 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 "
+"tasub\n"
+"valida ainult neid teenuseid, mida Teil tõesti vaja läheb.\n"
+"!!"
 
-#: ../../help.pm_.c:759
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"DrakX now detects any IDE device present in your computer. It will also\n"
-"scan for one or more PCI SCSI cards on your system. If a SCSI card is\n"
-"found, DrakX will automatically install the appropriate driver.\n"
+"\"Printer\": clicking on the \"No Printer\" button will open the printer\n"
+"configuration wizard. Consult the corresponding chapter of the ``Starter\n"
+"Guide'' for more information on how to setup a new printer. The interface\n"
+"presented there is similar to the one used during installation."
+msgstr ""
+"\"Printer\": klõps nupul \"Printer puudub\" avab printeri seadistamise\n"
+"nõustaja. Uurige lähemalt käivitusjuhiste vastavast peatükist, kuidas\n"
+"uut printerit häälestada. Siin näidatav sarnaneb sellele, mida võisite\n"
+"näha paigalduse ajal."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"You will now set up your Internet/network connection. If you wish to\n"
+"connect your computer to the Internet or to a local network, click \"Next\n"
+"->\". Mandrake Linux will attempt to autodetect network devices and modems.\n"
+"If this detection fails, uncheck the \"Use auto detection\" box. You may\n"
+"also choose not to configure the network, or to do it later, in which case\n"
+"clicking the \"Cancel\" button will take you to the next step.\n"
 "\n"
-"Because hardware detection does not always detect a piece of hardware,\n"
-"DrakX will ask you to confirm if a PCI SCSI card is present. Click \"Yes\"\n"
-"if you know that there is a SCSI card installed in your machine. You will\n"
-"be presented with a list of SCSI cards to choose from. Click \"No\" if you\n"
-"have no SCSI hardware. If you are unsure, you can check the list of\n"
-"hardware detected in your machine by selecting \"See hardware info\" and\n"
-"clicking \"OK\". Examine the hardware list and then click on the \"OK\"\n"
-"button to return to the SCSI interface question.\n"
+"When configuring your network, the available connections options are:\n"
+"traditional modem, ISDN modem, ADSL connection, cable modem, and finally a\n"
+"simple LAN connection (Ethernet).\n"
 "\n"
-"If you have to manually specify your adapter, DrakX will ask if you want to\n"
-"specify options for it. You should allow DrakX to probe the hardware for\n"
-"the card-specific options which the hardware needs to initialize. This\n"
-"usually works well.\n"
+"We will not detail each configuration option - just make sure that you have\n"
+"all the parameters, such as IP address, default gateway, DNS servers, etc.\n"
+"from your Internet Service Provider or system administrator.\n"
 "\n"
-"If DrakX is not able to probe for the options which need to be passed, you\n"
-"will need to manually provide options to the driver."
+"You can consult the ``Starter Guide'' chapter about Internet connections\n"
+"for details about the configuration, or simply wait until your system is\n"
+"installed and use the program described there to configure your connection."
 msgstr ""
-"Esmalt otsib DrakX üles kõik Teie arvuti IDE-seadmed, püüdes samal ajal\n"
-"tuvastada ka PCI siini SCSI-liideseid. Kui viimaseid leitakse ja vastav(ad)\n"
-"draiver(id) on teada, siis laetakse ja paigaldatakse kõik vajalik "
-"automaatselt.\n"
+"Nüüd võite seadistada oma Interneti-/võrguühenduse. Kui soovite, et arvuti\n"
+"oleks ühendatud Internetti või kohtvõrku, vajutage \"Järgmine\". Seejärel "
+"käivitub\n"
+"võrguseadmete ja modemi automaattuvastus. Kui see ei õnnestu, jätke\n"
+"järgmisel korral kastike \"Automaattuvastuse kasutamine\" märkimata.\n"
+"Muidugi võib ka võrgu seadistamisest loobuda või seda hiljem teha.\n"
+"Sellisel juhul vajutage nupule \"Katkesta\".\n"
 "\n"
-"Riistvara tuvastamine ei pruugi alati siiski õnnestuda ja kui see nii "
-"peaks \n"
-"minema, palub DrakX Teil teatada, kas masinas on mõni PCI SCSI-liides.\n"
-"Vajutage \"Jah\", kui olete kindel, et Teil on SCSI-liides, ning seejärel\n"
-"palutakse Teil ilmuvast loendist sobiv valida. Kui SCSI-liidest ei ole, on "
-"mõtet\n"
-"vastata \"Ei\". Kui Te ei ole kindel, võite kontrollida oma masina "
-"riistvara,\n"
-"vajutades \"Näita riistvara infot\" ja \"Olgu\". Vaadake riistvara nimekiri "
-"üle\n"
-"ning vajutage \"Olgu\", mis toob Teid tagasi SCSI-liidese küsimuse juurde.\n"
+"Võimalikud ühendusviisid on: tavaline modem, ISDN modem, ADSL ühendus,\n"
+"kaablimodem ning lõpuks kohtvõrk ehk LAN (Ethernet).\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"
-"järele liidese spetsiifilised omadused, mida see initsialiseerimiseks "
-"vajab.\n"
-"Tavaliselt õnnestub see edukalt.\n"
+"Siinkohal ei hakka me kogu seadistamist lahti seletama. Kontrollige "
+"lihtsalt, et\n"
+"oleksite oma internetiteenuse pakkujalt või süsteemi administraatorilt "
+"saanud\n"
+"kõik võrguühendusega seonduvad parameetrid.\n"
 "\n"
-"Kui automaatne parameetrite otsimine ei tööta, tutvuge palun lähemalt\n"
-"oma SCSI liidese dokumentatsiooniga või küsige abi riistvara müüjalt."
+"Seadistamisest kõneleb lähemalt \"Käivitusjuhiste\" Internetiühendusest "
+"pajatav\n"
+"peatükk, kuid võib ka oodata, kuni süsteem on paigaldatud ja kasutada siis\n"
+"ühenduse seadistamiseks seal kirjeldatud rakendust."
 
-#: ../../help.pm_.c:781
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"You can add additional entries for yaboot, either for other operating\n"
-"systems, alternate kernels, or for an emergency boot image.\n"
+"If you told the installer that you wanted to individually select packages,\n"
+"it will present a tree containing all packages classified by groups and\n"
+"subgroups. While browsing the tree, you can select entire groups,\n"
+"subgroups, or individual packages.\n"
 "\n"
-"For other OSes, the entry consists only of a label and the \"root\"\n"
-"partition.\n"
+"Whenever you select a package on the tree, a description appears on the\n"
+"right to let you know the purpose of the package.\n"
+"\n"
+"!! If a server package has been selected, either because you specifically\n"
+"chose the individual package or because it was part of a group of packages,\n"
+"you will be asked to confirm that you really want those servers to be\n"
+"installed. By default Mandrake Linux will automatically start any installed\n"
+"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 that\n"
+"security holes are discovered after this version of Mandrake Linux was\n"
+"finalized. If you do not know what a particular service is supposed to do\n"
+"or why it is being installed, then click \"No\". Clicking \"Yes \" will\n"
+"install the listed services and they will be started automatically by\n"
+"default during boot. !!\n"
+"\n"
+"The \"Automatic dependencies\" option is used to disable the warning dialog\n"
+"which appears whenever the installer automatically selects a package to\n"
+"resolve a dependency issue. Some packages have relationships between each\n"
+"other such that installation of a package requires that some other program\n"
+"is already installed. The installer can determine which packages are\n"
+"required to satisfy a dependency to successfully complete the installation.\n"
+"\n"
+"The tiny floppy disk icon at the bottom of the list allows you to load a\n"
+"package list created during a previous installation. This is useful if you\n"
+"have a number of machines that you wish to configure identically. Clicking\n"
+"on this icon will ask you to insert a floppy disk previously created at the\n"
+"end of another installation. See the second tip of last step on how to\n"
+"create such a floppy."
+msgstr ""
+"Sõltuvalt sellest, kas valisite individuaalse pakettide valiku või mitte,\n"
+"näidatakse Teile gruppidesse ja alamgruppidesse rühmitatult kõiki pakette\n"
+"sisaldavat puud. Seda mööda liikudes võite valida või etteantud valiku\n"
+"tühistada tervete gruppide, alamgruppide või üksikute pakettide kaupa.\n"
 "\n"
-"For Linux, there are a few possible options:\n"
+"Kui valite puus mõne paketi, ilmub paremal selle kirjeldus, mis annab\n"
+"teada, milline on paketi ülesanne.\n"
 "\n"
-" * Label: this is simply the name you will have to type at the yaboot\n"
-"prompt to select this boot option;\n"
+"!! Kui tahtlikult või seetõttu, et asi kuulus gruppi, on valitud mõni "
+"serveripakett,\n"
+"palutakse Teilt kinnitust, et Te ikka tõesti soovite neid servereid "
+"paigaldada.\n"
+"Mandrake Linuxi puhul käivitatakse kõik paigaldatud serverid vaikimisi\n"
+"alglaadimise käigus. Isegi kui nad olid turvalised ja teadaolevalt "
+"probleemivabad\n"
+"ajal, mis valmis distributsioon, võib kergesti juhtuda, et pärast Mandrake "
+"Linuxi\n"
+"praeguse versiooni valmimist leiti neist turvaauke. Kui Te ei tea, mida "
+"konkreetne\n"
+"teenus pakub või miks see üldse paigaldatakse, klõpsake nupul \"Ei\", sest\n"
+"klõps nupul \"Jah\" paigaldab loetletud serverid ning nad käivituvad\n"
+"alglaadimise ajal automaatselt. !!\n"
 "\n"
-" * Image: this would be the name of the kernel to boot. Typically, vmlinux\n"
-"or a variation of vmlinux with an extension;\n"
+"Lisavõimalus \"Automaatsõltuvused\" lihtsalt keelab hoiatava dialoogi, mis "
+"ilmub\n"
+"alati, kui paigaldaja valib automaatselt mõne paketi. See juhtub siis, kui "
+"leitakse,\n"
+"et paigalduse edukaks lõpetamiseks on vajalik paigaldada veel mõni muu "
+"pakett.\n"
+"\n"
+"Väike flopiketta ikoon loendi all võimaldab avada eelmise paigalduse ajal "
+"valitud\n"
+"pakettide nimekirja. Sellel klõpsamise järel palutakse Teil sisestada "
+"flopiketas,\n"
+"mille lõite eelmise paigalduse lõpul. Vaadake ka eelmise sammu teist "
+"nõuannet\n"
+"selle kohta, kuidas sellist flopiketast luua."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"It is now time to specify which programs you wish to install on your\n"
+"system. There are thousands of packages available for Mandrake Linux, and\n"
+"to make it simpler to manage the packages have been placed into groups of\n"
+"similar applications.\n"
 "\n"
-" * Root: the \"root\" device or ``/'' for your Linux installation;\n"
+"Packages are sorted into groups corresponding to a particular use of your\n"
+"machine. Mandrake Linux has four predefined installations available. You\n"
+"can think of these installation classes as containers for various packages.\n"
+"You can mix and match applications from the various containers, so a\n"
+"``Workstation'' installation can still have applications from the\n"
+"``Development'' container installed.\n"
 "\n"
-" * Append: on Apple hardware, the kernel append option is used quite often\n"
-"to assist in initializing video hardware, or to enable keyboard mouse\n"
-"button emulation for the often lacking 2nd and 3rd mouse buttons on a stock\n"
-"Apple mouse. The following are some examples:\n"
+" * \"Workstation\": if you plan to use your machine as a workstation,\n"
+"select one or more of the applications that are in the workstation\n"
+"container.\n"
 "\n"
-"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
+" * \"Development\": if plan on using your machine for programming, choose\n"
+"the appropriate packages from the container.\n"
 "\n"
-"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
+" * \"Server\": if your machine is intended to be a server, select which of\n"
+"the more common services you wish to install on your machine.\n"
 "\n"
-" * Initrd: this option can be used either to load initial modules, before\n"
-"the boot device is available, or to load a ramdisk image for an emergency\n"
-"boot situation;\n"
+" * \"Graphical Environment\": this is where you will choose your preferred\n"
+"graphical environment. At least one must be selected if you want to have a\n"
+"graphical interface available.\n"
 "\n"
-" * Initrd-size: the default ramdisk size is generally 4,096 bytes. If you\n"
-"need to allocate a large ramdisk, this option can be used;\n"
+"Moving the mouse cursor over a group name will display a short explanatory\n"
+"text about that group. If you unselect all groups when performing a regular\n"
+"installation (as opposed to an upgrade), a dialog will pop up proposing\n"
+"different options for a minimal installation:\n"
 "\n"
-" * Read-write: normally the \"root\" partition is initially brought up in\n"
-"read-only, to allow a filesystem check before the system becomes ``live''.\n"
-"Here, you can override this option;\n"
+" * \"With X\": install the minimum number of packages possible to have a\n"
+"working graphical desktop.\n"
 "\n"
-" * NoVideo: should the Apple video hardware prove to be exceptionally\n"
-"problematic, you can select this option to boot in ``novideo'' mode, with\n"
-"native frame buffer support;\n"
+" * \"With basic documentation\": installs the base system plus basic\n"
+"utilities and their documentation. This installation is suitable for\n"
+"setting up a server.\n"
 "\n"
-" * Default: selects this entry as being the default Linux selection,\n"
-"selectable by just pressing ENTER at the yaboot prompt. This entry will\n"
-"also be highlighted with a ``*'', if you press [Tab] to see the boot\n"
-"selections."
-msgstr ""
-"Yabooti jaoks on võimalik lisada kirjeid kas teiste operatsioonisüsteemide,\n"
-"alternatiivsete kernelite või hädaolukorras alglaadimistõmmise leidmiseks.\n"
+" * \"Truly minimal install\": will install the absolute minimum number of\n"
+"packages necessary to get a working Linux system. With this installation\n"
+"you will only have a command line interface. The total size of this\n"
+"installation is 65 megabytes.\n"
 "\n"
-"Teiste operatsioonisüsteemide kirje sisaldab vaid pealdist ja "
-"juurpartitsiooni.\n"
+"You can check the \"Individual package selection\" box, which is useful if\n"
+"you are familiar with the packages being offered or if you want to have\n"
+"total control over what will be installed.\n"
 "\n"
-"Linuxi puhul on võimalusi rohkem:\n"
+"If you started the installation in \"Upgrade\" mode, you can unselect all\n"
+"groups to avoid installing any new package. This is useful for repairing or\n"
+"updating an existing system."
+msgstr ""
+"Nüüd on aeg määrata rakendused, mida soovite oma süsteemi paigaldada.\n"
+"Mandrake Linux pakub tuhandeid pakette ja mõistagi ei eelda keegi, et Te\n"
+"neid kõiki juba ette tunneksite.\n"
 "\n"
-" * Pealdis: lihtsalt nimetus, mida tuleb kirjutada, kui yaboot pärib teilt "
-"alglaadimise\n"
-"ajal, mida laadida.\n"
+"Paketid on rühmitatud gruppidesse vastavalt nende kasutusalale. Grupid ise "
+"on\n"
+"jagatud nelja sektsiooni:\n"
 "\n"
-" * Laadepilt: alglaaditava kerneli nimetus, tavaliselt vmlinux koos või ilma "
-"laiendita.\n"
+" * \"Tööjaam\": kui kavatsete kasutada arvutit tööjaamana, valige siit "
+"sektsioonist\n"
+"üks või enam gruppidest;\n"
 "\n"
-" * Juur: juurseade ehk Teie Linuxi ``/''.\n"
+" * \"Arendus\": kui kavatsete kasutada arvutit programmeerimiseks, valige\n"
+"soovitud grupid siit;\n"
 "\n"
-" * Lisand: eriti Apple'i puhul kasutatakse kerneli lisa sageli "
-"videoriistvara lähtestamiseks\n"
-"või hiirenupu emuleerimiseks klaviatuuril, sest Apple'i riistvarapoodides on "
-"vaid\n"
-"harva näha kahe või kolme nupuga hiiri. Mõned näited:\n"
+" * \"Server\": kui arvuti peab täitma serveri ülesandeid, saate siit "
+"valida,\n"
+"milliseid kõige enam levinud teenuseid oma masinale paigaldada;\n"
 "\n"
-"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
-"hda=autotune\n"
+" * \"Graafiline töökeskkond\": lõppeks saate siit valida meelepärase "
+"graafilise\n"
+"töökeskkonna. Neist tuleb valida vähemalt üks, kui soovite kasutada "
+"graafilist tööjaama!\n"
 "\n"
-"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
+"Hiire liigutamine grupi nimele toob nähtavale selle lühikirjelduse. Kui "
+"olete\n"
+"tavapärast paigaldust tehes kõik grupid valimata jätnud (seega talitanud\n"
+"vastupidi uuenduse mõttele), ilmub dialoog, mis pakub mitmesuguseid\n"
+"võimalusi minimaalseks paigalduseks.\n"
 "\n"
-" * Initrd: seda võimalust võib kasutada kas initsialiseerimismoodulite "
-"laadimiseks\n"
-"enne alglaadimisseadmeni jõudmist või ramdisk-laadepildi laadimiseks\n"
-"hädaolukorras.\n"
+" * \"X-iga\": paigaldatakse minimaalselt graafiliseks töölauaks vajalikud "
+"paketid;\n"
 "\n"
-" * Initrd-size: ramdiski suurus on tavaliselt 4096 baiti. Kui teil peaks "
-"minema\n"
-"tarvis suuremat, saab seda siin määrata.\n"
+" * \"Baasdokumentatsiooniga\": paigaldatakse baassüsteem ning põhilised\n"
+"utiliidid ja nende dokumentatsioon. See peaks sobima näiteks serverile;\n"
 "\n"
-" * Read-write: tavaliselt initsialiseeritakse juurpartitsioon esmalt vaid "
-"loetavana,\n"
-"et sooritada failisüsteemi kontroll enne seda, kui süsteem ``ellu ärkab''.\n"
-"Siin saab seda muuta.\n"
+" * \"Tõeline miinimumpaigaldus\": paigaldatakse minimaalne hulk pakette,\n"
+"mida on vaja Linuxi töötamiseks (vaid käsurealt). See võtab ruumi umbes\n"
+"65 MB.\n"
 "\n"
-" * NoVideo: kui Apple'i videoriistvara peaks olema tõeliselt "
-"problemaatiline,\n"
-"saab siin valida võimaluse teha alglaadimine resiimis ``novideo'' ehk siis\n"
-"native frame-buffer toega.\n"
+"Ära märkida saab kasti \"Pakettide individuaalne valik\", mis on kasuks, "
+"kui\n"
+"tunnete pakette, mida Teile pakutakse, või kui soovite totaalset kontrolli\n"
+"selle üle, mida Teie masinasse paigaldatakse.\n"
 "\n"
-" * Vaikimisi: määrab antud kirje vaikimisi Linuxi valikuks, mida saab "
-"alglaadida\n"
-"yabooti käsurea ilmudes vaid vajutusega klahvile ENTER. Kui vajutate "
-"alglaadimise\n"
-"valikute uurimiseks [Tab], on see kirje märgistatud tärniga (``*'')."
+"Kui käivitasite paigalduse resiimis \"Uuendus\", võite jätta kõik grupid\n"
+"valimata, mis takistab uute pakettide paigaldamist. Seda tasub tarvitada\n"
+"näiteks olemasoleva süsteemi parandamisel või värskendamisel."
 
-#: ../../help.pm_.c:828
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able to boot\n"
-"either GNU/Linux, MacOS or MacOSX if present on your computer. Normally,\n"
-"these other operating systems are correctly detected and installed. If this\n"
-"is not the case, you can add an entry by hand in this screen. Be careful to\n"
-"choose the correct parameters.\n"
+"The Mandrake Linux installation is distributed on several CD-ROMs. DrakX\n"
+"knows if a selected package is located on another CD-ROM so it will eject\n"
+"the current CD and ask you to insert the correct CD as required."
+msgstr ""
+"Mandrake Linuxi paigalduspaketid on jagatud mitme CD-ROMi vahel. DrakX\n"
+"suudab ära tunda, kui valitud pakett asub muul CD-ROMil, ning väljastab "
+"siis\n"
+"seesoleva CD ja palub sisestada selle, mida parajasti vaja läheb."
+
+#: ../../help.pm:1
+#, c-format
+msgid ""
+"Here are Listed the existing Linux partitions detected on your hard drive.\n"
+"You can keep the choices made by the wizard, since they are good for most\n"
+"common installations. If you make any changes, you must at least define a\n"
+"root partition (\"/\"). Do not choose too small a partition or you will not\n"
+"be able to install enough software. If you want to store your data on a\n"
+"separate partition, you will also need to create a \"/home\" partition\n"
+"(only possible if you have more than one Linux partition available).\n"
 "\n"
-"Yaboot's main options are:\n"
+"Each partition is listed as follows: \"Name\", \"Capacity\".\n"
 "\n"
-" * Init Message: a simple text message displayed before the boot prompt;\n"
+"\"Name\" is structured: \"hard drive type\", \"hard drive number\",\n"
+"\"partition number\" (for example, \"hda1\").\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"
+"\"Hard drive type\" is \"hd\" if your hard drive is an IDE hard drive and\n"
+"\"sd\" if it is a SCSI hard drive.\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"
+"\"Hard drive number\" is always a letter after \"hd\" or \"sd\". For IDE\n"
+"hard drives:\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 before your\n"
-"default kernel description is selected;\n"
+" * \"a\" means \"master hard drive on the primary IDE controller\";\n"
 "\n"
-" * Enable CD Boot?: checking this option allows you to choose ``C'' for CD\n"
-"at the first boot prompt;\n"
+" * \"b\" means \"slave hard drive on the primary IDE controller\";\n"
 "\n"
-" * Enable OF Boot?: checking this option allows you to choose ``N'' for\n"
-"Open Firmware at the first boot prompt;\n"
+" * \"c\" means \"master hard drive on the secondary IDE controller\";\n"
 "\n"
-" * Default OS: you can select which OS will boot by default when the Open\n"
-"Firmware Delay expires."
+" * \"d\" means \"slave hard drive on the secondary IDE controller\".\n"
+"\n"
+"With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
+"\"second lowest SCSI ID\", etc."
 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"
+"Ülal on toodud kõik Teie kõvakettal olemasolevad Linuxi partitsioonid\n"
+"Vaikimisi on need enamasti üsna mõistlikud. Kui teete nendes muutusi,\n"
+"pidage meeles, et kindlasti vajate juurpartitsiooni (\"/\"). Liiga väikeste\n"
+"partitsioonide puhul võib tekkida raskusi piisava hulga tarkvara "
+"paigaldamisel.\n"
+"Kasutajate jaoks on sageli mõistlik luua eraldi \"/home\" partitsioon.\n"
+"(Seda mõistagi juhul, kui tegemist on enam kui ühe Linuxi partitsiooniga).\n"
 "\n"
-"Yabooti põhivalikud on järgmised:\n"
+"Iga partitsiooni juures on toodud abiinfona \"Nimi\" ja \"Mahutavus\".\n"
 "\n"
-" * Initsialiseerimisteade: tavaline tekstisõnum, mida näidatakse enne\n"
-"alglaadimise käsurea ilmumist.\n"
+"\"Nimi\" koosneb kõvakettatüübist, selle numbrist ja partitsiooni\n"
+"numbrist (näiteks \"hda1\").\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"
+"Kõvaketta tüüp on \"hd\", kui on tegemist IDE kettaga, ning \"sd\", kui on\n"
+"tegemist SCSI kettaga.\n"
 "\n"
-" * Open Firmware viivitus: Erinevalt LILOst 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"
+"Kõvaketta number on alati täht \"hd\" või \"sd\" järel. IDE ketastel:\n"
 "\n"
-" * Kernel alglaadimise viivitus: See on sarnane LILO alglaadimise "
-"viivitusele.\n"
-"Pärast Linuxi valimist tekib sekundikümnendikes määratav viivitus, enne kui\n"
-"valitakse kerneli vaikekirjeldus.\n"
+" * \"a\" - esmase IDE kontrolleri ülem,\n"
 "\n"
-" * Lubada alglaadimine CD-lt?: Selle valimine võimaldab alglaadimise "
-"käsureale\n"
-"``C'' kirjutades valida CD.\n"
+" * \"b\" - esmase IDE kontrolleri allutatu,\n"
 "\n"
-" * Lubada OF alglaadimine?: Selle valimine võimaldab alglaadimise käsureale\n"
-"``N'' kirjutades valida Open Firmware.\n"
+" * \"c\" - teisese IDE kontrolleri ülem,\n"
 "\n"
-" * OS vaikimisi: Siin võite valida, milline operatsioonisüsteem laaditakse "
-"vaikimisi,\n"
-"kui Open Firmware viivitus läbi saab."
+" * \"d\" - teisese IDE kontrolleri allutatu.\n"
+"\n"
+"SCSI ketaste puhul on \"a\" esimene, \"b\" teine ja nii edasi."
 
-#: ../../help.pm_.c:860
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Here are presented various parameters concerning your machine. Depending on\n"
-"your installed hardware, you may (or may not), see the following entries:\n"
-"\n"
-" * \"Mouse\": check the current mouse configuration and click on the button\n"
-"to change it if necessary;\n"
-"\n"
-" * \"Keyboard\": check the current keyboard map configuration and click on\n"
-"the button to change that if necessary;\n"
-"\n"
-" * \"Timezone\": DrakX, by default, guesses your time zone from the\n"
-"language you have chosen. But here again, as for the choice of a keyboard,\n"
-"you may not be in the country for which the chosen language should\n"
-"correspond. Hence, you may need to click on the \"Timezone\" button in\n"
-"order to configure the clock according to the time zone you are in;\n"
-"\n"
-" * \"Printer\": clicking on the \"No Printer\" button will open the printer\n"
-"configuration wizard. Consult the correpsonding chapter of the ``Starter\n"
-"Guide'' for more information on how to setup a new printer. The interface\n"
-"presented there is similar to the one used at installation time;\n"
-"\n"
-" * \"Sound card\": if a sound card is detected on your system, it will be\n"
-"displayed here.\n"
+"GNU/Linux is a multi-user system, meaning each user can have their own\n"
+"preferences, their own files and so on. You can read the ``Starter Guide''\n"
+"to learn more about multi-user systems. But unlike \"root\", which is the\n"
+"system administrator, the users you add at this point will not be\n"
+"authorized to change anything except their own files and their own\n"
+"configuration, protecting the system from unintentional or malicious\n"
+"changes that impact the system as a whole. You will have to create at least\n"
+"one regular user for yourself -- this is the account which you should use\n"
+"for routine, day-to-day use. Although it is very easy to log in as \"root\"\n"
+"to do anything and everything, it may also be very dangerous! A mistake\n"
+"could mean that your system would not work any more. If you make a serious\n"
+"mistake as a regular user, the worst that will happen is that you will lose\n"
+"some information, but 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"
+"you typed in and copy it to the \"User name\" field, which is the name this\n"
+"user will enter to log onto the system. If you like, you may override the\n"
+"default and change the username. The next step is to enter a password. From\n"
+"a security point of view, a non-privileged (regular) user password is not\n"
+"as crucial as the \"root\" password, but that is no reason to neglect it by\n"
+"making it blank or too simple: after all, your files could be the ones at\n"
+"risk.\n"
+"\n"
+"Once you click on \"Accept user\", you can add other users. Add a user for\n"
+"each one of your friends: your father or your sister, for example. Click\n"
+"\"Next ->\" when you have finished adding users.\n"
 "\n"
-" * \"TV card\": if a TV card is detected on your system, it will be\n"
-"displayed here.\n"
+"Clicking the \"Advanced\" button allows you to change the default \"shell\"\n"
+"for that user (bash by default).\n"
 "\n"
-" * \"ISDN card\": if an ISDN card is detected on your system, it will be\n"
-"displayed here. You can click on the button to change the parameters\n"
-"associated to it."
+"When you are finished adding all users, you will be asked to choose a user\n"
+"that can automatically log into the system when the computer boots up. If\n"
+"you are interested in that feature (and do not care much about local\n"
+"security), choose the desired user and window manager, then click \"Next\n"
+"->\". If you are not interested in this feature, uncheck the \"Do you want\n"
+"to use this feature?\" box."
 msgstr ""
-"Siin näidatakse mitmeid Teie masinat puudutavaid parameetreid. Sõltuvalt\n"
-"riistvarast võite siin näha (või mitte näha) järgmisi kirjeid:\n"
-"\n"
-" * \"Hiir\": võimalus kontrollida hiire seadistusi ja neid vajadusel muuta.\n"
-"\n"
-" * \"Klaviatuur\": võimalus kontrollida klaviatuuritabeli seadistusi ja "
-"neid\n"
-"vajaduse korral muuta.\n"
-"\n"
-" * \"Ajavöönd\": 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 \"Ajavöönd"
-"\",\n"
-"et seada kell selle ajavööndi ajale, kus Te parajasti viibite.\n"
+"GNU/Linux on paljude kasutajatega sü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"
+"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"
+"sisse administraatorina, võib see olla ka väga ohtlik! Vähimgi viga võib sel"
+"\\ puhul tähendada, et süsteem lakkab töötamast. Kui teete tõsise vea "
+"tavakasutajana,\n"
+"võite kaotada ainult mõningat infot, kuid süsteem jääb töökorda.\n"
 "\n"
-" * \"Printer\": klõps nupul \"Printer puudub\" avab printeri seadistamise "
-"nõustaja.\n"
-"Seda, kuidas uut printerit seadistada, vaadake lähemalt käivitusjuhiste "
-"vastavast\n"
-"peatükist. Siin nähtav on sarnane paigaldusajal nähtuga.\n"
+"Kõigepealt tuleks sisestada oma tegelik nimi. See ei ole mõistagi "
+"kohustuslik - tegelikult võite sisestada, mida soovite. DrakX võtab esimese "
+"sisestatud sõna\n"
+"ning määrab selle \"kasutajanimeks\". 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"
+"lõppeks on ju mängus Teie failid.\n"
 "\n"
-" * \"Helikaart\": kui süsteemis leiti helikaart, näidatakse seda. Paigalduse "
-"ajal pole\n"
-"seda võimalik (ümber) seadistada.\n"
+"Kui klõpsate nupule \"Kasutaja õige\", 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 \"Järgmine ->\".\n"
 "\n"
-" * \"TV-kaart\": kui süsteemis leiti TV-kaart, näidatakse seda. Paigalduse "
-"ajal pole\n"
-"seda võimalik (ümber) seadistada.\n"
+"Klõps nupule \"Täpsemalt\" võimaldab muuta kasutajale määratavat vaike-"
+"\"shelli\"\n"
+"(vaikimisi on see bash).\n"
 "\n"
-" * \"ISDN-kaart\": kui süsteemis leiti ISDN-kaart, näidatakse seda. Nupule "
-"vajutades\n"
-"saab muuta sellega seonduvaid parameetreid."
+"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"
+"Teile huvi pakub (ja kohalik turvalisus muret ei valmista), valige "
+"meelepärane\n"
+"kasutaja ning aknahaldur ja vajutage \"Järgmine ->\". Kui Te sellest aga "
+"huvitatud ei ole,\n"
+"eemaldage märge kastist \"Kas soovite seda võimalust kasutada?\"."
 
-#: ../../help.pm_.c:891
+#: ../../help.pm:1
+#, c-format
 msgid ""
-"Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data present on it will be lost\n"
-"and will not be recoverable!"
+"Before continuing, you should carefully read the terms of the license. It\n"
+"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"terms in it, check the \"Accept\" box. If not, simply turn off your\n"
+"computer."
 msgstr ""
-"Valige kõvaketas, mida soovite puhastada oma uue Mandrake Linuxi\n"
-"paigaldamiseks. Ettevaatust, kõik sellel leiduvad andmed hävitatakse\n"
-"ega ole enam taastatavad."
+"Enne jätkamist lugege hoolikalt läbi litsentsileping. See kehtib kogu "
+"Mandrake\n"
+"Linuxi distributsiooni kohta. Kui Te kõigi selle tingimustega nõus olete,\n"
+"märkige ära kast \"Nõus\". Kui Teile aga miski ei meeldi, siis lülitage\n"
+"lihtsalt arvuti välja."
 
-#: ../../help.pm_.c:896
-msgid ""
-"Click on \"OK\" if you want to delete all data and partitions present on\n"
-"this hard drive. Be careful, after clicking on \"OK\", you will not be able\n"
-"to recover any data and partitions present on this hard drive, including\n"
-"any Windows data.\n"
-"\n"
-"Click on \"Cancel\" to stop this operation without losing any data and\n"
-"partitions present on this hard drive."
-msgstr ""
-"Valige \"Olgu\", kui soovite kustutada kõik sellel kettal asuvad\n"
-"partitsioonid. Ettevaatust, pärast \"Olgu\" klõpsamist ei ole enam\n"
-"võimalik sellelt kettalt andmeid taastada.\n"
-"\n"
-"Katkestamiseks valige \"Katkesta\"."
+#: ../../install2.pm:1
+#, c-format
+msgid "You must also format %s"
+msgstr "Vormindada tuleb ka %s"
 
-#: ../../install2.pm_.c:111
+#: ../../install2.pm:1
 #, c-format
 msgid ""
 "Can't access kernel modules corresponding to your kernel (file %s is "
@@ -4554,21 +3410,78 @@ msgstr ""
 "fail %s), mis enamasti tähendab, et Teie alglaadimisflopi ei ole sünkroonis "
 "paigaldus-andmekandjaga (palun looge uus alglaadimisflopi)"
 
-#: ../../install2.pm_.c:167
+#: ../../install_any.pm:1
 #, c-format
-msgid "You must also format %s"
-msgstr "Vormindada tuleb ka %s"
+msgid ""
+"An error occurred - no valid devices were found on which to create new "
+"filesystems. Please check your hardware for the cause of this problem"
+msgstr ""
+"Tekkis viga: failisüsteemi loomiseks ei leitud ühtki seadet. Palun "
+"kontrollige oma riistvara."
+
+#: ../../install_any.pm:1 ../../partition_table.pm:1
+#, c-format
+msgid "Error reading file %s"
+msgstr "Viga faili %s lugemisel"
 
-#: ../../install_any.pm_.c:423
+#: ../../install_any.pm:1
+#, 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:1
+#, c-format
+msgid "This floppy is not FAT formatted"
+msgstr "See flopi ei ole FAT-vormingus"
+
+#: ../../install_any.pm:1
+#, c-format
+msgid "Insert a FAT formatted floppy in drive %s"
+msgstr "Pange FAT-vormingus flopi seadmesse %s"
+
+#: ../../install_any.pm:1
+#, c-format
+msgid "Can't use broadcast with no NIS domain"
+msgstr "Üldlevi kasutamine on ilma NIS domeenita võimatu"
+
+#: ../../install_any.pm:1
+#, c-format
+msgid ""
+"The following packages will be removed to allow upgrading your system: %s\n"
+"\n"
+"\n"
+"Do you really want to remove these packages?\n"
+msgstr ""
+"Süsteemi uuendamiseks tuleb eemaldada järgmised paketid: %s\n"
+"\n"
+"\n"
+"Kas tõesti eemaldada need paketid?\n"
+
+#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
+#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1
+#, c-format
+msgid "No"
+msgstr "Ei"
+
+#: ../../install_any.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
+#: ../../ugtk2.pm:1 ../../modules/interactive.pm:1 ../../standalone/drakgw:1
+#, c-format
+msgid "Yes"
+msgstr "Jah"
+
+#: ../../install_any.pm:1
 #, 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"
-"issues, but some new could be found. In that case, you must make sure to "
-"upgrade\n"
-"as soon as possible.\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"
 "\n"
 "Do you really want to install these servers?\n"
@@ -4584,158 +3497,112 @@ msgstr ""
 "\n"
 "Kas tõesti paigaldada need serverid?\n"
 
-#: ../../install_any.pm_.c:441
+#: ../../install_gtk.pm:1
 #, c-format
-msgid ""
-"The following packages will be removed to allow upgrading your system: %s\n"
-"\n"
-"\n"
-"Do you really want to remove these packages?\n"
-msgstr ""
-"Süsteemi uuendamiseks tuleb eemaldada järgmised paketid: %s\n"
-"\n"
-"\n"
-"Kas tõesti eemaldada need paketid?\n"
+msgid "System configuration"
+msgstr "Süsteemi sätted"
 
-#: ../../install_any.pm_.c:471
-msgid "Can't use broadcast with no NIS domain"
-msgstr "Üldlevi kasutamine on ilma NIS domeenita võimatu"
-
-#: ../../install_any.pm_.c:879
+#: ../../install_gtk.pm:1
 #, c-format
-msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "Pange FAT-vormingus flopi seadmesse %s"
-
-#: ../../install_any.pm_.c:883
-msgid "This floppy is not FAT formatted"
-msgstr "See flopi ei ole FAT-vormingus"
-
-#: ../../install_any.pm_.c:895
-msgid ""
-"To use this saved packages selection, boot installation with ``linux "
-"defcfg=floppy''"
-msgstr ""
-"Selle paketivaliku kasutamiseks alustage paigaldamist käsuga \"linux "
-"defcfg=floppy\""
+msgid "System installation"
+msgstr "Süsteemi paigaldus"
 
-#: ../../install_any.pm_.c:918 ../../partition_table.pm_.c:767
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Error reading file %s"
-msgstr "Viga faili %s lugemisel"
+msgid "Bringing down the network"
+msgstr "Võrgu seiskamine"
 
-#: ../../install_any.pm_.c:1040
-msgid ""
-"An error occurred - no valid devices were found on which to create new "
-"filesystems. Please check your hardware for the cause of this problem"
-msgstr ""
-"Tekkis viga: failisüsteemi loomiseks ei leitud ühtki seadet. Palun "
-"kontrollige oma riistvara."
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "Bringing up the network"
+msgstr "Võrgu käimapanek"
 
-#: ../../install_interactive.pm_.c:21
+#: ../../install_interactive.pm:1
 #, c-format
-msgid ""
-"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
-"You can find some information about them at: %s"
-msgstr ""
-"Osa Teie riistvarast nõuab tarnijapoolseid draivereid.\n"
-"Infot nende kohta saate: %s"
+msgid "Partitioning failed: %s"
+msgstr "Ketta jagamine ebaõnnestus: %s"
 
-#: ../../install_interactive.pm_.c:56
-msgid ""
-"You must have a root partition.\n"
-"For this, create a partition (or click on an existing one).\n"
-"Then choose action ``Mount point'' and set it to `/'"
-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 '/'"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "The DrakX Partitioning wizard found the following solutions:"
+msgstr "DrakX kettajagamise nõustaja leidis sellised lahendused:"
 
-#: ../../install_interactive.pm_.c:61
-msgid "You must have a swap partition"
-msgstr "Teil peab olema saaleala"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "I can't find any room for installing"
+msgstr "Paigalduseks ei ole üldse ruumi"
 
-#: ../../install_interactive.pm_.c:62
+#: ../../install_interactive.pm:1
+#, c-format
 msgid ""
-"You don't have a swap partition.\n"
-"\n"
-"Continue anyway?"
+"You can now partition %s.\n"
+"When you are done, don't forget to save using `w'"
 msgstr ""
-"Saaleala ei ole määratud.\n"
-"\n"
-"Kas ikkagi jätkata?"
-
-#: ../../install_interactive.pm_.c:65 ../../install_steps.pm_.c:169
-msgid "You must have a FAT partition mounted in /boot/efi"
-msgstr "Teil peab olema FAT-partitsioon haagitud asukohas /boot/efi"
-
-#: ../../install_interactive.pm_.c:90
-msgid "Use free space"
-msgstr "Kasuta vaba ruumi"
-
-#: ../../install_interactive.pm_.c:92
-msgid "Not enough free space to allocate new partitions"
-msgstr "Ei ole piisavalt ruumi uute partitsioonide jaoks"
-
-#: ../../install_interactive.pm_.c:100
-msgid "Use existing partitions"
-msgstr "Kasuta olemasolevat partitsiooni"
+"Nüüd saate partitsioneerida %s kõvaketta\n"
+"Kui olete valmis, salvestage käsuga 'w'"
 
-#: ../../install_interactive.pm_.c:102
-msgid "There is no existing partition to use"
-msgstr "Kasutatavat partitsiooni ei leitud"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "Use fdisk"
+msgstr "Kasuta fdisk-i"
 
-#: ../../install_interactive.pm_.c:109
-msgid "Use the Windows partition for loopback"
-msgstr "Kasuta Windowsi partitsiooni loopbackina"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "Custom disk partitioning"
+msgstr "Partitsioneerin ise"
 
-#: ../../install_interactive.pm_.c:112
-msgid "Which partition do you want to use for Linux4Win?"
-msgstr "Millisele partitsioonile soovite paigaldada Linux4Win?"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "ALL existing partitions and their data will be lost on drive %s"
+msgstr "Kettal %s hävivad KÕIK partitsioonid ja andmed"
 
-#: ../../install_interactive.pm_.c:114
-msgid "Choose the sizes"
-msgstr "Valige suurused"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "You have more than one hard drive, which one do you install linux on?"
+msgstr "Teil on rohkem kui üks kõvaketas, millisele neist paigaldate Linuxi?"
 
-#: ../../install_interactive.pm_.c:115
-msgid "Root partition size in MB: "
-msgstr "Juurpartitsiooni suurus (MB): "
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "Erase entire disk"
+msgstr "Tühjenda kogu ketas"
 
-#: ../../install_interactive.pm_.c:116
-msgid "Swap partition size in MB: "
-msgstr "Saaleala suurus (MB): "
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "Remove Windows(TM)"
+msgstr "Eemalda Windows(TM)"
 
-#: ../../install_interactive.pm_.c:126
-msgid "Use the free space on the Windows partition"
-msgstr "Kasuta vaba ruumi Windowsi partitsioonil"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "There is no FAT partition to resize (or not enough space left)"
+msgstr "Sobivat FAT-partitsiooni ei leitud (ei ole piisavalt ruumi)"
 
-#: ../../install_interactive.pm_.c:129
-msgid "Which partition do you want to resize?"
-msgstr "Millist partitsiooni soovite muuta?"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "FAT resizing failed: %s"
+msgstr "FATi suuruse muutmine ebaõnnestus: %s"
 
-#: ../../install_interactive.pm_.c:131
+#: ../../install_interactive.pm:1
+#, c-format
 msgid "Resizing Windows partition"
 msgstr "Arvutan Windowsi failisüsteemi piire"
 
-#: ../../install_interactive.pm_.c:134
+#: ../../install_interactive.pm:1 ../../diskdrake/interactive.pm:1
 #, c-format
-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 "Resizing"
+msgstr "Muudan suurust"
 
-#: ../../install_interactive.pm_.c:137
-msgid ""
-"Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
-"installation."
-msgstr ""
-"Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
-"alglaadimine, käivitage Windows ja seejärel utiliit 'defrag' ning tulge siis "
-"Mandrake Linuxi paigalduse juurde tagasi."
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "partition %s"
+msgstr "partitsioon %s"
+
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "Which size do you want to keep for Windows on"
+msgstr "Kui palju ruumi jätate Windowsi jaoks?"
 
-#: ../../install_interactive.pm_.c:138
+#: ../../install_interactive.pm:1
+#, c-format
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4753,309 +3620,168 @@ msgstr ""
 "Palun kasutage enne scandisk-i, defrag-i ja tehke tagavarakoopia.\n"
 "Kui olete oma otsuses kindel, vajutage \"Olgu\"."
 
-#: ../../install_interactive.pm_.c:148
-msgid "Which size do you want to keep for Windows on"
-msgstr "Kui palju ruumi jätate Windowsi jaoks?"
-
-#: ../../install_interactive.pm_.c:149
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "partition %s"
-msgstr "partitsioon %s"
-
-#: ../../install_interactive.pm_.c:156
-#, c-format
-msgid "FAT resizing failed: %s"
-msgstr "FATi suuruse muutmine ebaõnnestus: %s"
-
-#: ../../install_interactive.pm_.c:171
 msgid ""
-"There is no FAT partition to resize or to use as loopback (or not enough "
-"space left)"
-msgstr "Sobivat FAT-partitsiooni ei leitud (ei ole piisavalt ruumi)"
-
-#: ../../install_interactive.pm_.c:177
-msgid "Erase entire disk"
-msgstr "Tühjenda kogu ketas"
-
-#: ../../install_interactive.pm_.c:177
-msgid "Remove Windows(TM)"
-msgstr "Eemalda Windows(TM)"
-
-#: ../../install_interactive.pm_.c:180
-msgid "You have more than one hard drive, which one do you install linux on?"
-msgstr "Teil on rohkem kui üks kõvaketas, millisele neist paigaldate Linuxi?"
+"Your Windows partition is too fragmented. Please reboot your computer under "
+"Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
+"installation."
+msgstr ""
+"Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
+"alglaadimine, käivitage Windows ja seejärel utiliit 'defrag' ning tulge siis "
+"Mandrake Linuxi paigalduse juurde tagasi."
 
-#: ../../install_interactive.pm_.c:183
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "ALL existing partitions and their data will be lost on drive %s"
-msgstr "Kettal %s hävivad KÕIK partitsioonid ja andmed"
-
-#: ../../install_interactive.pm_.c:191
-msgid "Custom disk partitioning"
-msgstr "Partitsioneerin ise"
-
-#: ../../install_interactive.pm_.c:195
-msgid "Use fdisk"
-msgstr "Kasuta fdisk-i"
+msgid "Computing the size of the Windows partition"
+msgstr "Vaba ruumi arvutamine Windowsi partitsioonil"
 
-#: ../../install_interactive.pm_.c:198
+#: ../../install_interactive.pm:1
 #, c-format
 msgid ""
-"You can now partition %s.\n"
-"When you are done, don't forget to save using `w'"
+"The FAT resizer is unable to handle your partition, \n"
+"the following error occured: %s"
 msgstr ""
-"Nüüd saate partitsioneerida %s kõvaketta\n"
-"Kui olete valmis, salvestage käsuga 'w'"
-
-#: ../../install_interactive.pm_.c:227
-msgid "You don't have enough free space on your Windows partition"
-msgstr "Teil ei ole piisavalt vaba ruumi Windowsi partitsioonil"
-
-#: ../../install_interactive.pm_.c:243
-msgid "I can't find any room for installing"
-msgstr "Paigalduseks ei ole üldse ruumi"
-
-#: ../../install_interactive.pm_.c:246
-msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX kettajagamise nõustaja leidis sellised lahendused:"
+"FAT-partitsiooni suurust ei õnnestunud muuta, \n"
+"ilmnes selline viga: %s"
 
-#: ../../install_interactive.pm_.c:250
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Partitioning failed: %s"
-msgstr "Ketta jagamine ebaõnnestus: %s"
-
-#: ../../install_interactive.pm_.c:260
-msgid "Bringing up the network"
-msgstr "Võrgu käimapanek"
-
-#: ../../install_interactive.pm_.c:265
-msgid "Bringing down the network"
-msgstr "Võrgu seiskamine"
-
-#: ../../install_steps.pm_.c:76
-msgid ""
-"An error occurred, but I don't know how to handle it nicely.\n"
-"Continue at your own risk."
-msgstr ""
-"Tekkis mingi viga, aga seda ei suuda programm ise klaarida.\n"
-"Jätkake omal vastutusel."
+msgid "Which partition do you want to resize?"
+msgstr "Millist partitsiooni soovite muuta?"
 
-#: ../../install_steps.pm_.c:211
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Duplicate mount point %s"
-msgstr "Haakepunkt %s on määratud topelt"
+msgid "Use the free space on the Windows partition"
+msgstr "Kasuta vaba ruumi Windowsi partitsioonil"
 
-#: ../../install_steps.pm_.c:380
-msgid ""
-"Some important packages didn't get installed properly.\n"
-"Either your cdrom drive or your cdrom is defective.\n"
-"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
-"\"\n"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "There is no FAT partition to use as loopback (or not enough space left)"
 msgstr ""
-"Mõned tähtsad paketid ei saanud korralikult paika.\n"
-"Teie CD-lugeja või CD on ilmselt vigane.\n"
-"Paketifaile CD-l saate kontrollida käsuga \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
+"Sobivat FAT-partitsiooni loopback-ina kasutamiseks ei leitud (ei ole "
+"piisavalt ruumi)"
 
-#: ../../install_steps.pm_.c:450
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Welcome to %s"
-msgstr "See ongi %s"
-
-#: ../../install_steps.pm_.c:543 ../../install_steps.pm_.c:769
-msgid "No floppy drive available"
-msgstr "Flopiseade ei ole kättesaadav"
+msgid "Swap partition size in MB: "
+msgstr "Saaleala suurus (MB): "
 
-#: ../../install_steps_auto_install.pm_.c:76
-#: ../../install_steps_stdio.pm_.c:22
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Entering step `%s'\n"
-msgstr "Järgmine samm: '%s'\n"
-
-#: ../../install_steps_gtk.pm_.c:146
-msgid ""
-"Your system is low on resources. You may have some problem installing\n"
-"Mandrake Linux. If that occurs, you can try a text install instead. For "
-"this,\n"
-"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'"
-
-#: ../../install_steps_gtk.pm_.c:157 ../../install_steps_interactive.pm_.c:237
-msgid "Install Class"
-msgstr "Paigaldusmeetod"
-
-#: ../../install_steps_gtk.pm_.c:160
-msgid "Please choose one of the following classes of installation:"
-msgstr "Palun valige üks järgnevatest paigaldusmeetoditest:"
-
-#: ../../install_steps_gtk.pm_.c:236 ../../install_steps_interactive.pm_.c:683
-msgid "Package Group Selection"
-msgstr "Paketigruppide valik"
-
-#: ../../install_steps_gtk.pm_.c:269 ../../install_steps_interactive.pm_.c:698
-msgid "Individual package selection"
-msgstr "Valik paketthaaval"
+msgid "Root partition size in MB: "
+msgstr "Juurpartitsiooni suurus (MB): "
 
-#: ../../install_steps_gtk.pm_.c:292 ../../install_steps_interactive.pm_.c:621
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Total size: %d / %d MB"
-msgstr "Suurus kokku: %d / %d MB"
-
-#: ../../install_steps_gtk.pm_.c:334
-msgid "Bad package"
-msgstr "Vigane pakett"
+msgid "Choose the sizes"
+msgstr "Valige suurused"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Name: %s\n"
-msgstr "Nimi: %s\n"
+msgid "Which partition do you want to use for Linux4Win?"
+msgstr "Millisele partitsioonile soovite paigaldada Linux4Win?"
 
-#: ../../install_steps_gtk.pm_.c:336
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Version: %s\n"
-msgstr "Versioon: %s\n"
+msgid "Use the Windows partition for loopback"
+msgstr "Kasuta Windowsi partitsiooni loopbackina"
 
-#: ../../install_steps_gtk.pm_.c:337
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Size: %d KB\n"
-msgstr "Suurus: %d KB\n"
+msgid "There is no existing partition to use"
+msgstr "Kasutatavat partitsiooni ei leitud"
 
-#: ../../install_steps_gtk.pm_.c:338
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Importance: %s\n"
-msgstr "Tähtsus: %s\n"
-
-#: ../../install_steps_gtk.pm_.c:360
-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"
-
-#: ../../install_steps_gtk.pm_.c:365
-msgid "The following packages are going to be installed"
-msgstr "Paigaldamiseks on valitud järgmised paketid"
-
-#: ../../install_steps_gtk.pm_.c:366
-msgid "The following packages are going to be removed"
-msgstr "Eemaldamiseks on valitud järgmised paketid"
+msgid "Use existing partitions"
+msgstr "Kasuta olemasolevat partitsiooni"
 
-#: ../../install_steps_gtk.pm_.c:378
-msgid "You can't select/unselect this package"
-msgstr "Seda paketti ei saa (mitte) valida"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "Not enough free space to allocate new partitions"
+msgstr "Ei ole piisavalt ruumi uute partitsioonide jaoks"
 
-#: ../../install_steps_gtk.pm_.c:390
-msgid "This is a mandatory package, it can't be unselected"
-msgstr "See pakett on kohustuslik"
+#: ../../install_interactive.pm:1
+#, c-format
+msgid "Use free space"
+msgstr "Kasuta vaba ruumi"
 
-#: ../../install_steps_gtk.pm_.c:392
-msgid "You can't unselect this package. It is already installed"
-msgstr "See pakett on juba paigaldatud"
+#: ../../install_interactive.pm:1 ../../install_steps.pm:1
+#, c-format
+msgid "You must have a FAT partition mounted in /boot/efi"
+msgstr "Teil peab olema FAT-partitsioon haagitud asukohas /boot/efi"
 
-#: ../../install_steps_gtk.pm_.c:395
+#: ../../install_interactive.pm:1
+#, c-format
 msgid ""
-"This package must be upgraded.\n"
-"Are you sure you want to deselect it?"
+"You don't have a swap partition.\n"
+"\n"
+"Continue anyway?"
 msgstr ""
-"Selle paketi peaks uuendama.\n"
-"Olete kindel, et Te ei vali seda?"
-
-#: ../../install_steps_gtk.pm_.c:398
-msgid "You can't unselect this package. It must be upgraded"
-msgstr "Selle paketi peate valima, sest selle uuendamine on kohustuslik"
-
-#: ../../install_steps_gtk.pm_.c:403
-msgid "Show automatically selected packages"
-msgstr "Näita automaatselt valitud pakette"
-
-#: ../../install_steps_gtk.pm_.c:404 ../../install_steps_interactive.pm_.c:261
-#: ../../install_steps_interactive.pm_.c:265
-#: ../../standalone/drakbackup_.c:4211
-msgid "Install"
-msgstr "Paigaldamine"
-
-#: ../../install_steps_gtk.pm_.c:407
-msgid "Load/Save on floppy"
-msgstr "Laadi flopilt/Salvesta flopile"
-
-#: ../../install_steps_gtk.pm_.c:408
-msgid "Updating package selection"
-msgstr "Paketivaliku uuendamine"
-
-#: ../../install_steps_gtk.pm_.c:413
-msgid "Minimal install"
-msgstr "Minimaalne paigaldus"
-
-#: ../../install_steps_gtk.pm_.c:428 ../../install_steps_interactive.pm_.c:529
-msgid "Choose the packages you want to install"
-msgstr "Valige paketid, mida soovite paigaldada"
-
-#: ../../install_steps_gtk.pm_.c:444 ../../install_steps_interactive.pm_.c:767
-msgid "Installing"
-msgstr "Paigaldan"
-
-#: ../../install_steps_gtk.pm_.c:450
-msgid "Estimating"
-msgstr "Oletan"
-
-#: ../../install_steps_gtk.pm_.c:457
-msgid "Time remaining "
-msgstr "Aega jäänud "
-
-#: ../../install_steps_gtk.pm_.c:469
-msgid "Please wait, preparing installation..."
-msgstr "Palun oodake, valmistun paigalduseks..."
+"Saaleala ei ole määratud.\n"
+"\n"
+"Kas ikkagi jätkata?"
 
-#: ../../install_steps_gtk.pm_.c:551
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "%d packages"
-msgstr "%d paketti"
+msgid ""
+"You must have a root partition.\n"
+"For this, create a partition (or click on an existing one).\n"
+"Then choose action ``Mount point'' and set it to `/'"
+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 '/'"
 
-#: ../../install_steps_gtk.pm_.c:556
+#: ../../install_interactive.pm:1
 #, c-format
-msgid "Installing package %s"
-msgstr "Paketi %s paigaldamine"
-
-#: ../../install_steps_gtk.pm_.c:593 ../../install_steps_interactive.pm_.c:195
-#: ../../install_steps_interactive.pm_.c:791
-#: ../../standalone/drakautoinst_.c:197
-msgid "Accept"
-msgstr "Nõus"
-
-#: ../../install_steps_gtk.pm_.c:593 ../../install_steps_interactive.pm_.c:195
-#: ../../install_steps_interactive.pm_.c:791
-msgid "Refuse"
-msgstr "Keeldun"
+msgid ""
+"Some hardware on your computer needs ``proprietary'' drivers to work.\n"
+"You can find some information about them at: %s"
+msgstr ""
+"Osa Teie riistvarast nõuab tarnijapoolseid draivereid.\n"
+"Infot nende kohta saate: %s"
 
-#: ../../install_steps_gtk.pm_.c:594 ../../install_steps_interactive.pm_.c:792
+#: ../../install_messages.pm:1
 #, c-format
 msgid ""
-"Change your Cd-Rom!\n"
+"Congratulations, installation is complete.\n"
+"Remove the boot media and press return to reboot.\n"
 "\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."
+"\n"
+"For information on fixes which are available for this release of Mandrake "
+"Linux,\n"
+"consult the Errata available from:\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Information on configuring your system is available in the post\n"
+"install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
-"Vahetage CD-ROM!\n"
+"Õnnitlen, paigaldamine on edukalt lõpetatud.\n"
+"Võtke palun välja flopi ja/või CD ja vajutage Enter alglaadimiseks.\n"
 "\n"
-"Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <Olgu>.\n"
-"Kui teil säherdust ei ole, vajutage <Katkesta>."
-
-#: ../../install_steps_gtk.pm_.c:608 ../../install_steps_gtk.pm_.c:612
-#: ../../install_steps_interactive.pm_.c:804
-#: ../../install_steps_interactive.pm_.c:808
-msgid "Go on anyway?"
-msgstr "Ikkagi edasi?"
-
-#: ../../install_steps_gtk.pm_.c:608 ../../install_steps_interactive.pm_.c:804
-msgid "There was an error ordering packages:"
-msgstr "Pakettide tellimisel tekkis viga:"
+"\n"
+"Informatsiooni selle distributsiooni paranduste kohta (Errata) saab\n"
+"Mandrake Linuxi koduleheküljelt:\n"
+"\n"
+"\n"
+"%s\n"
+"\n"
+"\n"
+"Abi süsteemi edasiseks seadistamiseks saab eelkõige dokumendist\n"
+"\"Official Mandrake Linux User's Guide\"."
 
-#: ../../install_steps_gtk.pm_.c:612 ../../install_steps_interactive.pm_.c:808
-msgid "There was an error installing packages:"
-msgstr "Pakettide paigaldamisel tekkis viga:"
+#: ../../install_messages.pm:1
+#, c-format
+msgid "http://www.mandrakelinux.com/en/91errata.php3"
+msgstr "http://www.mandrakelinux.com/en/91errata.php3"
 
-#: ../../install_steps_interactive.pm_.c:10
+#: ../../install_messages.pm:1
+#, c-format
 msgid ""
 "\n"
 "Warning\n"
@@ -5117,19 +3843,8 @@ msgstr ""
 "nende autorile ning on kaitstud tarkvara puhul kehtivate intellektuaalse\n"
 "omandi ja autoriõiguse seadustega.\n"
 
-#: ../../install_steps_interactive.pm_.c:67
-msgid "An error occurred"
-msgstr "Tekkis mingi viga"
-
-#: ../../install_steps_interactive.pm_.c:85
-msgid "Do you really want to leave the installation?"
-msgstr "Kas tõesti loobuda paigaldusest ja väljuda?"
-
-#: ../../install_steps_interactive.pm_.c:112
-msgid "License agreement"
-msgstr "Lõppkasutaja litsentsileping"
-
-#: ../../install_steps_interactive.pm_.c:113
+#: ../../install_messages.pm:1
+#, c-format
 msgid ""
 "Introduction\n"
 "\n"
@@ -5369,288 +4084,670 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
-#: ../../install_steps_interactive.pm_.c:197
-msgid "Are you sure you refuse the licence?"
-msgstr "Kas Te tõesti ei ole litsentsilepinguga nõus?"
-
-#: ../../install_steps_interactive.pm_.c:217
-#: ../../install_steps_interactive.pm_.c:995
-#: ../../standalone/keyboarddrake_.c:25
-msgid "Keyboard"
-msgstr "Klaviatuur"
+#: ../../install_steps_auto_install.pm:1 ../../install_steps_stdio.pm:1
+#, c-format
+msgid "Entering step `%s'\n"
+msgstr "Järgmine samm: '%s'\n"
 
-#: ../../install_steps_interactive.pm_.c:218
-msgid "Please choose your keyboard layout."
-msgstr "Palun valige klaviatuuriasetus."
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Go on anyway?"
+msgstr "Ikkagi edasi?"
 
-#: ../../install_steps_interactive.pm_.c:219
-msgid "Here is the full list of keyboards available"
-msgstr "Võimalike klaviatuuride täielik nimekiri"
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "There was an error installing packages:"
+msgstr "Pakettide paigaldamisel tekkis viga:"
 
-#: ../../install_steps_interactive.pm_.c:237
-msgid "Which installation class do you want?"
-msgstr "Millist paigaldusmeetodit Te soovite?"
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "There was an error ordering packages:"
+msgstr "Pakettide tellimisel tekkis viga:"
 
-#: ../../install_steps_interactive.pm_.c:241
-msgid "Install/Update"
-msgstr "Paigaldamine/Uuendus"
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid ""
+"Change your Cd-Rom!\n"
+"\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."
+msgstr ""
+"Vahetage CD-ROM!\n"
+"\n"
+"Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <Olgu>.\n"
+"Kui teil säherdust ei ole, vajutage <Katkesta>."
 
-#: ../../install_steps_interactive.pm_.c:241
-msgid "Is this an install or an update?"
-msgstr "Kas see on paigaldus või uuendus?"
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Refuse"
+msgstr "Keeldun"
 
-#: ../../install_steps_interactive.pm_.c:250
-msgid "Recommended"
-msgstr "Soovitatav"
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "Accept"
+msgstr "Nõus"
 
-#: ../../install_steps_interactive.pm_.c:253
-#: ../../install_steps_interactive.pm_.c:256
-msgid "Expert"
-msgstr "Ekspert"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Installing package %s"
+msgstr "Paketi %s paigaldamine"
 
-#: ../../install_steps_interactive.pm_.c:261
-#: ../../install_steps_interactive.pm_.c:265
-msgid "Upgrade"
-msgstr "Uuendus"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "%d packages"
+msgstr "%d paketti"
 
-#: ../../install_steps_interactive.pm_.c:261
-#: ../../install_steps_interactive.pm_.c:265
-msgid "Upgrade packages only"
-msgstr "Ainult pakettide uuendamine"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "No details"
+msgstr "Üksikasjadeta"
 
-#: ../../install_steps_interactive.pm_.c:282
-msgid "Please choose the type of your mouse."
-msgstr "Palun valige hiire tüüp."
+#: ../../install_steps_gtk.pm:1 ../../diskdrake/hd_gtk.pm:1
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Details"
+msgstr "Üksikasjad"
 
-#: ../../install_steps_interactive.pm_.c:288 ../../standalone/mousedrake_.c:52
-msgid "Mouse Port"
-msgstr "Hiire port"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Please wait, preparing installation..."
+msgstr "Palun oodake, valmistun paigalduseks..."
 
-#: ../../install_steps_interactive.pm_.c:289 ../../standalone/mousedrake_.c:53
-msgid "Please choose on which serial port your mouse is connected to."
-msgstr "Millisesse jadaporti on Teie hiir ühendatud?"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Time remaining "
+msgstr "Aega jäänud "
 
-#: ../../install_steps_interactive.pm_.c:297
-msgid "Buttons emulation"
-msgstr "Nuppude emuleerimine"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Estimating"
+msgstr "Oletan"
 
-#: ../../install_steps_interactive.pm_.c:299
-msgid "Button 2 Emulation"
-msgstr "Emuleeri 2. hiirenuppu"
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Installing"
+msgstr "Paigaldan"
 
-#: ../../install_steps_interactive.pm_.c:300
-msgid "Button 3 Emulation"
-msgstr "Emuleeri 3. hiirenuppu"
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Choose the packages you want to install"
+msgstr "Valige paketid, mida soovite paigaldada"
 
-#: ../../install_steps_interactive.pm_.c:321
-msgid "Configuring PCMCIA cards..."
-msgstr "PCMCIA kaartide seadmine..."
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Minimal install"
+msgstr "Minimaalne paigaldus"
 
-#: ../../install_steps_interactive.pm_.c:321
-msgid "PCMCIA"
-msgstr "PCMCIA"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Updating package selection"
+msgstr "Paketivaliku uuendamine"
 
-#: ../../install_steps_interactive.pm_.c:328
-msgid "Configuring IDE"
-msgstr "IDE seadistamine"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Load/Save on floppy"
+msgstr "Laadi flopilt/Salvesta flopile"
 
-#: ../../install_steps_interactive.pm_.c:328
-msgid "IDE"
-msgstr "IDE"
+#: ../../install_steps_gtk.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
+#: ../../ugtk2.pm:1 ../../interactive/newt.pm:1
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "<- Previous"
+msgstr "<- Eelmine"
 
-#: ../../install_steps_interactive.pm_.c:345
-msgid "No partition available"
-msgstr "Ei leia partitsioone"
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Install"
+msgstr "Paigaldamine"
 
-#: ../../install_steps_interactive.pm_.c:348
-msgid "Scanning partitions to find mount points"
-msgstr "Partitsioonidelt haakepunktide otsimine"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Show automatically selected packages"
+msgstr "Näita automaatselt valitud pakette"
 
-#: ../../install_steps_interactive.pm_.c:356
-msgid "Choose the mount points"
-msgstr "Valige haakepunktid"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "You can't unselect this package. It must be upgraded"
+msgstr "Selle paketi peate valima, sest selle uuendamine on kohustuslik"
 
-#: ../../install_steps_interactive.pm_.c:386
+#: ../../install_steps_gtk.pm:1
+#, 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"
+"This package must be upgraded.\n"
+"Are you sure you want to deselect it?"
 msgstr ""
-"Ruumi 1MB-se alglaadimisala loomiseks napib! Paigaldus jätkub, kuid süsteemi "
-"alglaadimiseks tuleb Teil luua DiskDrake abil alglaadimisala"
+"Selle paketi peaks uuendama.\n"
+"Olete kindel, et Te ei vali seda?"
 
-#: ../../install_steps_interactive.pm_.c:395
-msgid "No root partition found to perform an upgrade"
-msgstr "Uuendamiseks vajalikku juurpartitsiooni ei leitud"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "You can't unselect this package. It is already installed"
+msgstr "See pakett on juba paigaldatud"
 
-#: ../../install_steps_interactive.pm_.c:396
-msgid "Root Partition"
-msgstr "Juurpartitsioon"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "This is a mandatory package, it can't be unselected"
+msgstr "See pakett on kohustuslik"
 
-#: ../../install_steps_interactive.pm_.c:397
-msgid "What is the root partition (/) of your system?"
-msgstr "Millisel partitsioonil hoiate juurkataloogi (/)?"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "You can't select/unselect this package"
+msgstr "Seda paketti ei saa valida/valimata jätta"
 
-#: ../../install_steps_interactive.pm_.c:411
-msgid "You need to reboot for the partition table modifications to take place"
-msgstr "Partitsioonitabeli säilitamiseks vajate alglaadimist"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "The following packages are going to be removed"
+msgstr "Eemaldamiseks on valitud järgmised paketid"
 
-#: ../../install_steps_interactive.pm_.c:435
-msgid "Choose the partitions you want to format"
-msgstr "Valige partitsioonid, mida soovite vormindada"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "The following packages are going to be installed"
+msgstr "Paigaldamiseks on valitud järgmised paketid"
 
-#: ../../install_steps_interactive.pm_.c:436
-msgid "Check bad blocks?"
-msgstr "Blokkide kontroll?"
+#: ../../install_steps_gtk.pm:1
+#, 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"
 
-#: ../../install_steps_interactive.pm_.c:463
-msgid "Formatting partitions"
-msgstr "Vormindan partitsioone"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Importance: %s\n"
+msgstr "Tähtsus: %s\n"
 
-#: ../../install_steps_interactive.pm_.c:465
+#: ../../install_steps_gtk.pm:1
 #, c-format
-msgid "Creating and formatting file %s"
-msgstr "Loon ja vormindan faili %s"
+msgid "Size: %d KB\n"
+msgstr "Suurus: %d KB\n"
 
-#: ../../install_steps_interactive.pm_.c:470
+#: ../../install_steps_gtk.pm:1
 #, c-format
-msgid ""
-"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
-"you can loose data)"
-msgstr ""
-"Failisüsteemi %s kontroll ebaõnnestus. Kas soovite vigu parandada? "
-"(Ettevaatust, võite kaotada andmed!)"
+msgid "Version: %s\n"
+msgstr "Versioon: %s\n"
 
-#: ../../install_steps_interactive.pm_.c:472
-msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "Saaleala on paigalduseks liiga väike, palun suurendage seda"
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Name: %s\n"
+msgstr "Nimi: %s\n"
 
-#: ../../install_steps_interactive.pm_.c:479
-msgid "Looking for available packages and rebuilding rpm database..."
-msgstr "Otsin saadaolevaid pakette ja loon uuesti rpm andmebaasi..."
+#: ../../install_steps_gtk.pm:1
+#, c-format
+msgid "Bad package"
+msgstr "Vigane pakett"
 
-#: ../../install_steps_interactive.pm_.c:480
-msgid "Looking for available packages..."
-msgstr "Otsin saadaolevaid pakette..."
+#: ../../install_steps_gtk.pm:1 ../../mouse.pm:1 ../../services.pm:1
+#: ../../diskdrake/hd_gtk.pm:1 ../../standalone/drakbackup:1
+#, c-format
+msgid "Other"
+msgstr "Muu"
 
-#: ../../install_steps_interactive.pm_.c:483
-msgid "Looking at packages already installed..."
-msgstr "Tuvastan juba paigaldatud pakette..."
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Total size: %d / %d MB"
+msgstr "Suurus kokku: %d / %d MB"
 
-#: ../../install_steps_interactive.pm_.c:487
-msgid "Finding packages to upgrade..."
-msgstr "Otsin uuendatavaid pakette..."
+#: ../../install_steps_gtk.pm:1 ../../interactive.pm:1 ../../my_gtk.pm:1
+#: ../../ugtk2.pm:1 ../../interactive/newt.pm:1
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Next ->"
+msgstr "Järgmine ->"
+
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Individual package selection"
+msgstr "Valik paketthaaval"
+
+#: ../../install_steps_gtk.pm:1 ../../ugtk2.pm:1
+#: ../../Xconfig/resolution_and_depth.pm:1 ../../diskdrake/hd_gtk.pm:1
+#: ../../interactive/gtk.pm:1 ../../standalone/drakTermServ:1
+#: ../../standalone/drakbackup:1 ../../standalone/drakbug:1
+#, c-format
+msgid "Help"
+msgstr "Abi"
+
+#: ../../install_steps_gtk.pm:1 ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Package Group Selection"
+msgstr "Paketigruppide valik"
 
-#: ../../install_steps_interactive.pm_.c:505
+#: ../../install_steps_gtk.pm:1
 #, c-format
 msgid ""
-"Your system does not have enough space left for installation or upgrade (%d "
-"> %d)"
+"Your system is low on resources. You may have some problem installing\n"
+"Mandrake Linux. If that occurs, you can try a text install instead. For "
+"this,\n"
+"press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
-"Teie kõvakettal ei ole piisavalt vaba ruumi paigalduseks või uuenduseks (%d "
-"> %d)"
+"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'"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Save packages selection"
+msgstr "Salvesta paketivalik"
 
-#: ../../install_steps_interactive.pm_.c:541
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Automated"
+msgstr "Automaatne"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Replay"
+msgstr "Kordamine"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
 msgid ""
-"Please choose load or save package selection on floppy.\n"
-"The format is the same as auto_install generated floppies."
+"The auto install can be fully automated if wanted,\n"
+"in that case it will take over the hard drive!!\n"
+"(this is meant for installing on another box).\n"
+"\n"
+"You may prefer to replay the installation.\n"
 msgstr ""
-"Valige palun paketivaliku laadimine või salvestamine flopil(t).\n"
-"Vorming on sama, mis automaatpaigaldusega loodud flopide puhul."
+"Automaatne paigaldus võib olla ka sedavõrd tegija,\n"
+"et kasutab ära kogu kõvaketta !!\n"
+"\n"
+"Võite valida ka lihtsalt paigalduse kordamise.\n"
 
-#: ../../install_steps_interactive.pm_.c:543
-msgid "Load from floppy"
-msgstr "Laadi flopilt"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Generate auto install floppy"
+msgstr "Loo kiirpaigaldusflopi"
 
-#: ../../install_steps_interactive.pm_.c:543
-msgid "Save on floppy"
-msgstr "Salvesta flopile"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Reboot"
+msgstr "Taaskäivitus"
 
-#: ../../install_steps_interactive.pm_.c:547
-msgid "Loading from floppy"
-msgstr "Laadimine flopilt"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid ""
+"Some steps are not completed.\n"
+"\n"
+"Do you really want to quit now?"
+msgstr ""
+"Mõned sammud ei ole lõpule viidud.\n"
+"\n"
+"Kas soovite tõesti praegu lõpetada ja väljuda?"
 
-#: ../../install_steps_interactive.pm_.c:547
-msgid "Package selection"
-msgstr "Pakettide valik"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Creating auto install floppy..."
+msgstr "Kiirpaigaldusflopi loomine..."
 
-#: ../../install_steps_interactive.pm_.c:552
-msgid "Insert a floppy containing package selection"
-msgstr "Sisestage palun paketivalikut sisaldav flopi"
+#: ../../install_steps_interactive.pm:1 ../../standalone/drakautoinst:1
+#, c-format
+msgid "Insert a blank floppy in drive %s"
+msgstr "Pange palun tühi flopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:634
-msgid "Selected size is larger than available space"
-msgstr "Valiku suurus ületab saadaolevat kettaruumi"
+#: ../../install_steps_interactive.pm:1
+#, 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"
+" reboot, hold down Command-Option-O-F at reboot and enter:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Then type: shut-down\n"
+"At your next boot you should see the bootloader prompt."
+msgstr ""
+"Alglaaduri võimaldamiseks tuleb Teil muuta oma Open Firmware\n"
+" alglaadimisseadet.  Hoidke taaskäivituse ajal all klahve\n"
+" Command-Option-O-F ja kirjutage:\n"
+" setenv boot-device %s,\\\\:tbxi\n"
+" Seejärel kirjutage: shut-down\n"
+"Järgmisel käivitusel peaksite nägema alglaaduri käsurida."
 
-#: ../../install_steps_interactive.pm_.c:649
-msgid "Type of install"
-msgstr "Paigalduse tüüp"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Installation of bootloader failed. The following error occured:"
+msgstr "Alglaaduri paigaldamine ebaõnnestus. Tekkis järgmine viga:"
 
-#: ../../install_steps_interactive.pm_.c:650
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Installing bootloader"
+msgstr "Alglaaduri paigaldamine"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
 msgid ""
-"You haven't selected any group of packages.\n"
-"Please choose the minimal installation you want:"
+"Error installing aboot, \n"
+"try to force installation even if that destroys the first partition?"
 msgstr ""
-"Te ei valinud ühtegi paketigruppi.\n"
-"Palun valige meelepärane minimaalne paigaldus:"
+"Viga aboot-i paigaldamisel, \n"
+"kas sundida peale, riskides esimese partitsiooni hävinguga?"
 
-#: ../../install_steps_interactive.pm_.c:653
-msgid "With X"
-msgstr "X-iga"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Do you want to use aboot?"
+msgstr "Kas soovite kasutada aboot-i?"
 
-#: ../../install_steps_interactive.pm_.c:655
-msgid "With basic documentation (recommended!)"
-msgstr "Baasdokumentatsiooniga (soovitatav!)"
+#: ../../install_steps_interactive.pm:1
+#, 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"
+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"
 
-#: ../../install_steps_interactive.pm_.c:656
-msgid "Truly minimal install (especially no urpmi)"
-msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Preparing bootloader..."
+msgstr "Alglaaduri ettevalmistamine..."
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Domain Admin Password"
+msgstr "Domeeni administraatori parool"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Domain Admin User Name"
+msgstr "Domeeni administraatori kasutajatunnus"
 
-#: ../../install_steps_interactive.pm_.c:741
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Windows Domain"
+msgstr "Windowsi domeen"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Authentication Windows Domain"
+msgstr "Windowsi domeeni autentimine"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
 msgid ""
-"If you have all the CDs in the list below, click Ok.\n"
-"If you have none of those CDs, click Cancel.\n"
-"If only some CDs are missing, unselect them, then click Ok."
+"For this to work for a W2K PDC, you will probably need to have the admin "
+"run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
+"add and reboot the server.\n"
+"You will also need the username/password of a Domain Admin to join the "
+"machine to the Windows(TM) domain.\n"
+"If networking is not yet enabled, Drakx will attempt to join the domain "
+"after the network setup step.\n"
+"Should this setup fail for some reason and domain authentication is not "
+"working, run 'smbpasswd -j DOMAIN -U USER%%PASSWORD' using your Windows(tm) "
+"Domain, and Admin Username/Password, after system boot.\n"
+"The command 'wbinfo -t' will test whether your authentication secrets are "
+"good."
 msgstr ""
-"Kui Teil on olemas kõik alltoodud CD-d, klõpsake <Olgu>.\n"
-"Kui Teil ei ole ühtki neist, klõpsake <Katkesta>.\n"
-"Kui puuduvad mõned CD-d, märkige vaid olemasolevad ja siis <Olgu>."
+"Et see töötaks W2K primaarse domeenikontrolleri (PDC) puhul, on Teil vaja "
+"administraatori privileege, et käivitada serveril 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 "
+"administraator parooliga.\n"
+"Käsk 'wbinfo -t' võimaldab kontrollida, kas domeeni autentimisfraasid on "
+"õiged."
 
-#: ../../install_steps_interactive.pm_.c:746
+#: ../../install_steps_interactive.pm:1
 #, c-format
-msgid "Cd-Rom labeled \"%s\""
-msgstr "CD pealdisega \"%s\""
+msgid "NIS Server"
+msgstr "NIS server"
 
-#: ../../install_steps_interactive.pm_.c:767
-msgid "Preparing installation"
-msgstr "Valmistun paigalduseks"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "NIS Domain"
+msgstr "NIS domeen"
 
-#: ../../install_steps_interactive.pm_.c:776
+#: ../../install_steps_interactive.pm:1
 #, c-format
-msgid ""
-"Installing package %s\n"
-"%d%%"
+msgid "Authentication NIS"
+msgstr "NIS autentimine"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "NIS"
+msgstr "NIS"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "LDAP Server"
+msgstr "LDAP server"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "LDAP Base dn"
+msgstr "LDAPi alus dn"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Authentication LDAP"
+msgstr "LDAP autentimine"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Local files"
+msgstr "Kohalikud failid"
+
+#: ../../install_steps_interactive.pm:1 ../../network/modem.pm:1
+#: ../../standalone/drakconnect:1 ../../standalone/logdrake:1
+#, c-format
+msgid "Authentication"
+msgstr "Autentimisviis"
+
+#: ../../install_steps_interactive.pm:1
+#, 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:1
+#, c-format
+msgid "No password"
+msgstr "Salasõna puudub"
+
+#: ../../install_steps_interactive.pm:1 ../../steps.pm:1
+#, c-format
+msgid "Set root password"
+msgstr "Juurkasutaja salasõna"
+
+#: ../../install_steps_interactive.pm:1
+#, 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:1 ../../services.pm:1
+#, c-format
+msgid "Services: %d activated for %d registered"
+msgstr "Teenused: %d aktiveeritud, kokku %d"
+
+#: ../../install_steps_interactive.pm:1 ../../services.pm:1
+#, c-format
+msgid "Services"
+msgstr "Teenused"
+
+#: ../../install_steps_interactive.pm:1 ../../services.pm:1
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "System"
+msgstr "Süsteem"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Bootloader"
+msgstr "Alglaadur"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Boot"
+msgstr "Alglaadimine"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "disabled"
+msgstr "keelatud"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "activated"
+msgstr "aktiveeritud"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Firewall"
+msgstr "Tulemüür"
+
+#: ../../install_steps_interactive.pm:1 ../../steps.pm:1
+#, c-format
+msgid "Security"
+msgstr "Turvalisus"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Security Level"
+msgstr "Turvatase"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "not configured"
+msgstr "seadistamata"
+
+#: ../../install_steps_interactive.pm:1 ../../standalone/drakbackup:1
+#, c-format
+msgid "Network"
+msgstr "Võrk"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Network & Internet"
+msgstr "Kohtvõrk ja Internet"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Graphical interface"
+msgstr "Graafiline kasutajaliides"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Hardware"
+msgstr "Riistvara"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "TV card"
+msgstr "TV kaart"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
-"Paketi %s paigaldamine\n"
-"%d%%"
+"Helikaarti ei leitud. Proovige see leida pärast paigaldust \"harddrake\" abil"
 
-#: ../../install_steps_interactive.pm_.c:822
-msgid "Post-install configuration"
-msgstr "Paigaldusjärgsed sätted"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Run \"sndconfig\" after installation to configure your sound card"
+msgstr "Helikaardi seadistamiseks käivitage pärast paigaldust \"sndconfig\""
 
-#: ../../install_steps_interactive.pm_.c:828
+#: ../../install_steps_interactive.pm:1
 #, c-format
-msgid "Please insert the Boot floppy used in drive %s"
-msgstr "Pange palun alglaadimisflopi seadmesse %s"
+msgid "Do you have an ISA sound card?"
+msgstr "Kas Teil on ISA helikaart?"
 
-#: ../../install_steps_interactive.pm_.c:834
+#: ../../install_steps_interactive.pm:1
 #, c-format
-msgid "Please insert the Update Modules floppy in drive %s"
-msgstr "Pange palun moodulite uuendamise flopi seadmesse %s"
+msgid "Sound card"
+msgstr "Helikaart"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Remote CUPS server"
+msgstr "CUPS printserver"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "No printer"
+msgstr "Printer puudub"
+
+#: ../../install_steps_interactive.pm:1 ../../harddrake/data.pm:1
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer"
+msgstr "Printer"
+
+#: ../../install_steps_interactive.pm:1 ../../harddrake/data.pm:1
+#, c-format
+msgid "Mouse"
+msgstr "Hiir"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Timezone"
+msgstr "Ajavöönd"
+
+#: ../../install_steps_interactive.pm:1 ../../standalone/keyboarddrake:1
+#, c-format
+msgid "Keyboard"
+msgstr "Klaviatuur"
 
-#: ../../install_steps_interactive.pm_.c:861
+#: ../../install_steps_interactive.pm:1 ../../steps.pm:1
+#, c-format
+msgid "Summary"
+msgstr "Kokkuvõte"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "NTP Server"
+msgstr "NTP server"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Automatic time synchronization (using NTP)"
+msgstr "Aja automaatne sünkroniseerimine (NTP abil)"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Hardware clock set to GMT"
+msgstr "Arvuti sisekell on seatud GMT ajale"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Which is your timezone?"
+msgstr "Millises ajavöötmes asute?"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Contacting the mirror to get the list of available packages..."
+msgstr "Proovin lugeda peeglilt pakettide nimekirja..."
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Choose a mirror from which to get the packages"
+msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid ""
+"Contacting Mandrake Linux web site to get the list of available mirrors..."
+msgstr ""
+"Proovin hankida Mandrake Linuxi veebisaidilt saadaolevate peeglite "
+"nimekirja..."
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
-"have been released after the distribution was released. They may\n"
+"have been updated after the distribution was released. They may\n"
 "contain security or bug fixes.\n"
 "\n"
 "To download these packages, you will need to have a working Internet \n"
@@ -5666,3161 +4763,7110 @@ msgstr ""
 "\n"
 "Kas soovite uuendusi paigaldada?"
 
-#: ../../install_steps_interactive.pm_.c:876
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Please insert the Update Modules floppy in drive %s"
+msgstr "Pange palun moodulite uuendamise flopi seadmesse %s"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Please insert the Boot floppy used in drive %s"
+msgstr "Pange palun alglaadimisflopi seadmesse %s"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Post-install configuration"
+msgstr "Paigaldusjärgsed sätted"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
 msgid ""
-"Contacting Mandrake Linux web site to get the list of available mirrors..."
+"Installing package %s\n"
+"%d%%"
 msgstr ""
-"Proovin hankida Mandrake Linuxi veebisaidilt saadaolevate peeglite "
-"nimekirja..."
+"Paketi %s paigaldamine\n"
+"%d%%"
 
-#: ../../install_steps_interactive.pm_.c:881
-msgid "Choose a mirror from which to get the packages"
-msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Preparing installation"
+msgstr "Valmistun paigalduseks"
 
-#: ../../install_steps_interactive.pm_.c:890
-msgid "Contacting the mirror to get the list of available packages..."
-msgstr "Proovin lugeda peeglilt pakettide nimekirja..."
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Cd-Rom labeled \"%s\""
+msgstr "CD pealdisega \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:918
-msgid "Which is your timezone?"
-msgstr "Millises ajavöötmes asute?"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid ""
+"If you have all the CDs in the list below, click Ok.\n"
+"If you have none of those CDs, click Cancel.\n"
+"If only some CDs are missing, unselect them, then click Ok."
+msgstr ""
+"Kui Teil on olemas kõik alltoodud CD-d, klõpsake <Olgu>.\n"
+"Kui Teil ei ole ühtki neist, klõpsake <Katkesta>.\n"
+"Kui puuduvad mõned CD-d, märkige vaid olemasolevad ja siis <Olgu>."
 
-#: ../../install_steps_interactive.pm_.c:923
-msgid "Hardware clock set to GMT"
-msgstr "Arvuti sisekell on seatud GMT ajale"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Truly minimal install (especially no urpmi)"
+msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
 
-#: ../../install_steps_interactive.pm_.c:924
-msgid "Automatic time synchronization (using NTP)"
-msgstr "Aja automaatne sünkroniseerimine (NTP abil)"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "With basic documentation (recommended!)"
+msgstr "Baasdokumentatsiooniga (soovitatav!)"
 
-#: ../../install_steps_interactive.pm_.c:931
-msgid "NTP Server"
-msgstr "NTP server"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "With X"
+msgstr "X-iga"
 
-#: ../../install_steps_interactive.pm_.c:965
-#: ../../install_steps_interactive.pm_.c:972
-msgid "Remote CUPS server"
-msgstr "CUPS printserver"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid ""
+"You haven't selected any group of packages.\n"
+"Please choose the minimal installation you want:"
+msgstr ""
+"Te ei valinud ühtegi paketigruppi.\n"
+"Palun valige meelepärane minimaalne paigaldus:"
 
-#: ../../install_steps_interactive.pm_.c:966
-msgid "No printer"
-msgstr "Printer puudub"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Type of install"
+msgstr "Paigalduse tüüp"
 
-#: ../../install_steps_interactive.pm_.c:982
-msgid "Do you have an ISA sound card?"
-msgstr "Kas Teil on ISA helikaart?"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Selected size is larger than available space"
+msgstr "Valiku suurus ületab saadaolevat kettaruumi"
 
-#: ../../install_steps_interactive.pm_.c:984
-msgid "Run \"sndconfig\" after installation to configure your sound card"
-msgstr "Helikaardi seadistamiseks käivitage pärast paigaldust \"sndconfig\""
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Insert a floppy containing package selection"
+msgstr "Sisestage palun paketivalikut sisaldav flopi"
 
-#: ../../install_steps_interactive.pm_.c:986
-msgid "No sound card detected. Try \"harddrake\" after installation"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Loading from floppy"
+msgstr "Laadimine flopilt"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Package selection"
+msgstr "Pakettide valik"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Save on floppy"
+msgstr "Salvesta flopile"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Load from floppy"
+msgstr "Laadi flopilt"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid ""
+"Please choose load or save package selection on floppy.\n"
+"The format is the same as auto_install generated floppies."
 msgstr ""
-"Helikaarti ei leitud. Proovige see leida pärast paigaldust \"harddrake\" abil"
+"Valige palun paketivaliku laadimine või salvestamine flopil(t).\n"
+"Vorming on sama, mis automaatpaigaldusega loodud flopide puhul."
 
-#: ../../install_steps_interactive.pm_.c:991 ../../steps.pm_.c:27
-msgid "Summary"
-msgstr "Kokkuvõte"
+#: ../../install_steps_interactive.pm:1
+#, 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)"
 
-#: ../../install_steps_interactive.pm_.c:994
-msgid "Mouse"
-msgstr "Hiir"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Finding packages to upgrade..."
+msgstr "Otsin uuendatavaid pakette..."
 
-#: ../../install_steps_interactive.pm_.c:996
-msgid "Timezone"
-msgstr "Ajavöönd"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Looking at packages already installed..."
+msgstr "Tuvastan juba paigaldatud pakette..."
 
-#: ../../install_steps_interactive.pm_.c:997
-#: ../../printer/printerdrake.pm_.c:2759 ../../printer/printerdrake.pm_.c:2844
-msgid "Printer"
-msgstr "Printer"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Looking for available packages..."
+msgstr "Otsin saadaolevaid pakette..."
 
-#: ../../install_steps_interactive.pm_.c:999
-msgid "ISDN card"
-msgstr "ISDN kaart"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Looking for available packages and rebuilding rpm database..."
+msgstr "Otsin saadaolevaid pakette ja loon uuesti rpm andmebaasi..."
 
-#: ../../install_steps_interactive.pm_.c:1003
-#: ../../install_steps_interactive.pm_.c:1009
-msgid "Sound card"
-msgstr "Helikaart"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Not enough swap space to fulfill installation, please add some"
+msgstr "Saaleala on paigalduseks liiga väike, palun suurendage seda"
 
-#: ../../install_steps_interactive.pm_.c:1012
-msgid "TV card"
-msgstr "TV kaart"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid ""
+"Failed to check filesystem %s. Do you want to repair the errors? (beware, "
+"you can loose data)"
+msgstr ""
+"Failisüsteemi %s kontroll ebaõnnestus. Kas soovite vigu parandada? "
+"(Ettevaatust, võite kaotada andmed!)"
 
-#: ../../install_steps_interactive.pm_.c:1055
-#: ../../install_steps_interactive.pm_.c:1080
-#: ../../install_steps_interactive.pm_.c:1084
-msgid "LDAP"
-msgstr "LDAP"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Check bad blocks?"
+msgstr "Blokkide kontroll?"
 
-#: ../../install_steps_interactive.pm_.c:1056
-#: ../../install_steps_interactive.pm_.c:1080
-#: ../../install_steps_interactive.pm_.c:1093
-msgid "NIS"
-msgstr "NIS"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Choose the partitions you want to format"
+msgstr "Valige partitsioonid, mida soovite vormindada"
 
-#: ../../install_steps_interactive.pm_.c:1057
-#: ../../install_steps_interactive.pm_.c:1080
-#: ../../install_steps_interactive.pm_.c:1101
-#: ../../install_steps_interactive.pm_.c:1107
-msgid "Windows Domain"
-msgstr "Windowsi domeen"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "You need to reboot for the partition table modifications to take place"
+msgstr "Partitsioonitabeli säilitamiseks vajate alglaadimist"
 
-#: ../../install_steps_interactive.pm_.c:1058
-#: ../../install_steps_interactive.pm_.c:1080
-msgid "Local files"
-msgstr "Kohalikud failid"
+#: ../../install_steps_interactive.pm:1
+#, 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"
 
-#: ../../install_steps_interactive.pm_.c:1067
-#: ../../install_steps_interactive.pm_.c:1068 ../../steps.pm_.c:24
-msgid "Set root password"
-msgstr "Juurkasutaja salasõna"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Choose the mount points"
+msgstr "Valige haakepunktid"
 
-#: ../../install_steps_interactive.pm_.c:1069
-msgid "No password"
-msgstr "Salasõna puudub"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Scanning partitions to find mount points"
+msgstr "Partitsioonidelt haakepunktide otsimine"
 
-#: ../../install_steps_interactive.pm_.c:1074
+#: ../../install_steps_interactive.pm:1
 #, 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)"
+msgid "No partition available"
+msgstr "Ei leia partitsioone"
 
-#: ../../install_steps_interactive.pm_.c:1080 ../../network/modem.pm_.c:72
-#: ../../standalone/drakconnect_.c:623 ../../standalone/logdrake_.c:144
-msgid "Authentication"
-msgstr "Autentimisviis"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Configuring IDE"
+msgstr "IDE seadistamine"
 
-#: ../../install_steps_interactive.pm_.c:1088
-msgid "Authentication LDAP"
-msgstr "LDAP autentimine"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "IDE"
+msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:1089
-msgid "LDAP Base dn"
-msgstr "LDAPi alus dn"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Configuring PCMCIA cards..."
+msgstr "PCMCIA kaartide seadmine..."
 
-#: ../../install_steps_interactive.pm_.c:1090
-msgid "LDAP Server"
-msgstr "LDAP server"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "PCMCIA"
+msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:1096
-msgid "Authentication NIS"
-msgstr "NIS autentimine"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Button 3 Emulation"
+msgstr "Emuleeri 3. hiirenuppu"
 
-#: ../../install_steps_interactive.pm_.c:1097
-msgid "NIS Domain"
-msgstr "NIS domeen"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Button 2 Emulation"
+msgstr "Emuleeri 2. hiirenuppu"
 
-#: ../../install_steps_interactive.pm_.c:1098
-msgid "NIS Server"
-msgstr "NIS server"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Buttons emulation"
+msgstr "Nuppude emuleerimine"
 
-#: ../../install_steps_interactive.pm_.c:1104
-msgid ""
-"For this to work for a W2K PDC, you will probably need to have the admin "
-"run: C:\\>net localgroup \"Pre-Windows 2000 Compatible Access\" everyone /"
-"add and reboot the server.\n"
-"You will also need the username/password of a Domain Admin to join the "
-"machine to the Windows(TM) domain.\n"
-"If networking is not yet enabled, Drakx will attempt to join the domain "
-"after the network setup step.\n"
-"Should this setup fail for some reason and domain authentication is not "
-"working, run 'smbpasswd -j DOMAIN -U USER%PASSWORD' using your Windows(tm) "
-"Domain, and Admin Username/Password, after system boot.\n"
-"The command 'wbinfo -t' will test whether your authentication secrets are "
-"good."
-msgstr ""
-"Et see töötaks W2K primaarse domeenikontrolleri puhul, on Teil vaja "
-"administraatori privileege, et käivitada serveril 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 "
-"administraator parooliga.\n"
-"Käsk 'wbinfo -t' võimaldab kontrollida, kas domeeni autentimisfraasid on "
-"õiged."
+#: ../../install_steps_interactive.pm:1 ../../standalone/mousedrake:1
+#, c-format
+msgid "Please choose which serial port your mouse is connected to."
+msgstr "Millisesse jadaporti on Teie hiir ühendatud?"
 
-#: ../../install_steps_interactive.pm_.c:1106
-msgid "Authentication Windows Domain"
-msgstr "Windows domeeni autentimine"
+#: ../../install_steps_interactive.pm:1 ../../standalone/mousedrake:1
+#, c-format
+msgid "Mouse Port"
+msgstr "Hiire port"
 
-#: ../../install_steps_interactive.pm_.c:1108
-msgid "Domain Admin User Name"
-msgstr "Domeeni administraatori kasutajatunnus"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Please choose your type of mouse."
+msgstr "Palun valige hiire tüüp."
 
-#: ../../install_steps_interactive.pm_.c:1109
-msgid "Domain Admin Password"
-msgstr "Domeeni administraatori parool"
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Upgrade"
+msgstr "Uuendus"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Upgrade %s"
+msgstr "%s uuendus"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Is this an install or an upgrade?"
+msgstr "Kas see on paigaldus või uuendamine?"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Install/Upgrade"
+msgstr "Paigaldus/Uuendamine"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Here is the full list of keyboards available"
+msgstr "Võimalike klaviatuuride täielik nimekiri"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "Please choose your keyboard layout."
+msgstr "Palun valige klaviatuuriasetus."
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "License agreement"
+msgstr "Lõppkasutaja litsentsileping"
 
-#: ../../install_steps_interactive.pm_.c:1144
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "default:LTR"
+msgstr "vaikimisi:LTR"
+
+#: ../../install_steps_interactive.pm:1
+#, c-format
+msgid "An error occurred"
+msgstr "Tekkis mingi viga"
+
+#: ../../install_steps_newt.pm:1
+#, c-format
 msgid ""
-"A custom bootdisk provides a way of booting into your Linux system without\n"
-"depending on the normal bootloader. This is useful if you don't want to "
-"install\n"
-"SILO on your system, or another operating system removes SILO, or SILO "
-"doesn't\n"
-"work with your hardware configuration. A custom bootdisk can also be used "
-"with\n"
-"the Mandrake rescue image, making it much easier to recover from severe "
-"system\n"
-"failures.\n"
-"\n"
-"If you want to create a bootdisk for your system, insert a floppy in the "
-"first\n"
-"drive and press \"Ok\"."
+"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
-"Isetehtud alglaadimisketas annab Teile võimaluse laadida Linux flopilt\n"
-"sõltumata tavalisest alglaadijast. See võib abiks olla, kui Te ei soovi\n"
-"SILO-t kõvakettale kirjutada või mõni muu operatsioonisüsteem SILO\n"
-"ära kustutab või ei õnnestu SILO-t Teie riistvara peal kasutada.\n"
-"Alglaadmisflopi on kasutatav ka hädaabikettana, kui kõvakettal oleva\n"
-"failisüsteemiga peaks mingi õnnetus juhtuma. Hoidke end ja Teid hoiab\n"
-"ka Jumal!\n"
-"\n"
-"Alglaadimisketta loomiseks asetage flopi esimesse seadmesse ning vajutage\n"
-"\"Olgu\"."
+"  <Tab>/<Alt-Tab> väljade vahel  | <Space> valib | <F12> järgmine samm "
 
-#: ../../install_steps_interactive.pm_.c:1160
-msgid "First floppy drive"
-msgstr "Esimene flopiseade"
+#: ../../install_steps_newt.pm:1
+#, c-format
+msgid "Mandrake Linux Installation %s"
+msgstr "Mandrake Linuxi paigaldamine %s"
 
-#: ../../install_steps_interactive.pm_.c:1161
-msgid "Second floppy drive"
-msgstr "Teine flopiseade"
+#: ../../install_steps.pm:1
+#, c-format
+msgid "No floppy drive available"
+msgstr "Flopiseade ei ole kättesaadav"
 
-#: ../../install_steps_interactive.pm_.c:1162
-#: ../../printer/printerdrake.pm_.c:2397
-msgid "Skip"
-msgstr "Jäta vahele"
+#: ../../install_steps.pm:1
+#, c-format
+msgid "Welcome to %s"
+msgstr "See ongi %s"
 
-#: ../../install_steps_interactive.pm_.c:1167
+#: ../../install_steps.pm:1
 #, c-format
 msgid ""
-"A custom bootdisk provides a way of booting into your Linux system without\n"
-"depending on the normal bootloader. This is useful if you don't want to "
-"install\n"
-"LILO (or grub) on your system, or another operating system removes LILO, or "
-"LILO doesn't\n"
-"work with your hardware configuration. A custom bootdisk can also be used "
-"with\n"
-"the Mandrake rescue image, making it much easier to recover from severe "
-"system\n"
-"failures. Would you like to create a bootdisk for your system?\n"
-"%s"
+"Some important packages didn't get installed properly.\n"
+"Either your cdrom drive or your cdrom is defective.\n"
+"Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
+"\"\n"
 msgstr ""
-"Isetehtud alglaadimisketas annab Teile võimaluse laadida Linux flopilt\n"
-"sõltumata tavalisest alglaadijast. See võib abiks olla, kui Te ei soovi\n"
-"LILO-t (grubi) kõvakettale kirjutada või mõni muu operatsioonisüsteem LILO\n"
-"ära kustutab või ei õnnestu LILO-t Teie riistvara peal kasutada.\n"
-"Alglaadmisflopi on kasutatav ka hädaabikettana, kui kõvakettal oleva\n"
-"failisüsteemiga peaks mingi õnnetus juhtuma. Hoidke end ja Teid hoiab\n"
-"ka Jumal!\n"
-"%s"
+"Mõned tähtsad paketid ei saanud korralikult paika.\n"
+"Teie CD-lugeja või CD on ilmselt vigane.\n"
+"Paketifaile CD-l saate kontrollida käsuga \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps_interactive.pm_.c:1173
+#: ../../install_steps.pm:1
+#, c-format
+msgid "Duplicate mount point %s"
+msgstr "Haakepunkt %s on määratud topelt"
+
+#: ../../install_steps.pm:1
+#, c-format
 msgid ""
-"\n"
-"\n"
-"(WARNING! You're using XFS for your root partition,\n"
-"creating a bootdisk on a 1.44 Mb floppy will probably fail,\n"
-"because XFS needs a very large driver)."
+"An error occurred, but I don't know how to handle it nicely.\n"
+"Continue at your own risk."
 msgstr ""
-"\n"
-"\n"
-"(HOIATUS! Te kasutate juurpartitsioonil XFS-i, mistõttu\n"
-"alglaadimisketta loomine 1,44MB-sele flopile tõenäoliselt\n"
-"ei õnnestu, sest XFS vajab väga suurt draiverit)."
+"Tekkis mingi viga, aga seda ei suuda programm ise klaarida.\n"
+"Jätkake omal vastutusel."
 
-#: ../../install_steps_interactive.pm_.c:1181
-msgid "Sorry, no floppy drive available"
-msgstr "Flopiseade ei ole kättesaadav"
+#: ../../interactive.pm:1 ../../harddrake/sound.pm:1
+#: ../../standalone/drakxtv:1 ../../standalone/harddrake2:1
+#: ../../standalone/service_harddrake:1
+#, c-format
+msgid "Please wait"
+msgstr "Palun oodake"
 
-#: ../../install_steps_interactive.pm_.c:1185
-msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr "Valige flopiseade, mida kasutada alglaadimisketta tegemiseks"
+#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1
+#: ../../Xconfig/resolution_and_depth.pm:1 ../../interactive/http.pm:1
+#: ../../interactive/newt.pm:1 ../../interactive/stdio.pm:1
+#: ../../standalone/drakbackup:1 ../../standalone/draksec:1
+#, c-format
+msgid "Ok"
+msgstr "Olgu"
 
-#: ../../install_steps_interactive.pm_.c:1189
+#: ../../interactive.pm:1 ../../my_gtk.pm:1 ../../ugtk2.pm:1
+#: ../../interactive/newt.pm:1
 #, c-format
-msgid "Insert a floppy in %s"
-msgstr "Pange flopi seadmesse %s"
+msgid "Finish"
+msgstr "Lõpeta"
 
-#: ../../install_steps_interactive.pm_.c:1192
-msgid "Creating bootdisk..."
-msgstr "Alglaadimisketta loomine..."
+#: ../../interactive.pm:1 ../../standalone/draksec:1
+#, c-format
+msgid "Basic"
+msgstr "Põhiline"
 
-#: ../../install_steps_interactive.pm_.c:1199
-msgid "Preparing bootloader..."
-msgstr "Alglaaduri ettevalmistamine..."
+#: ../../interactive.pm:1
+#, c-format
+msgid "Advanced"
+msgstr "Edasijõudnud"
 
-#: ../../install_steps_interactive.pm_.c:1210
-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 to boot your machine"
-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"
+#: ../../interactive.pm:1 ../../interactive/gtk.pm:1
+#, c-format
+msgid "Remove"
+msgstr "Eemalda"
 
-#: ../../install_steps_interactive.pm_.c:1216
-msgid "Do you want to use aboot?"
-msgstr "Kas soovite kasutada aboot-i?"
+#: ../../interactive.pm:1 ../../interactive/gtk.pm:1
+#, c-format
+msgid "Modify"
+msgstr "Muuda"
 
-#: ../../install_steps_interactive.pm_.c:1219
+#: ../../interactive.pm:1 ../../interactive/gtk.pm:1
+#: ../../standalone/drakbackup:1 ../../standalone/drakfont:1
+#, c-format
+msgid "Add"
+msgstr "Lisa"
+
+#: ../../interactive.pm:1
+#, c-format
+msgid "Choose a file"
+msgstr "Valige fail"
+
+#: ../../keyboard.pm:1
+#, c-format
 msgid ""
-"Error installing aboot, \n"
-"try to force installation even if that destroys the first partition?"
+"Here you can choose the key or key combination that will \n"
+"allow switching between the different keyboard layouts\n"
+"(eg: latin and non latin)"
 msgstr ""
-"Viga aboot-i installimisel, \n"
-"kas sundida peale, riskides esimese partitsiooni hävinguga?"
+"Siin saab valida klahvi või klahvikombinatsiooni, mis laseb\n"
+"vahetada klaviatuuri (nt ladina ja mitte-ladina tähestikuga)"
 
-#: ../../install_steps_interactive.pm_.c:1226
-msgid "Installing bootloader"
-msgstr "Alglaaduri paigaldamine"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Right \"Windows\" key"
+msgstr "Parempoolne \"Windows\"-klahv"
 
-#: ../../install_steps_interactive.pm_.c:1232
-msgid "Installation of bootloader failed. The following error occured:"
-msgstr "Alglaaduri paigaldamine ebaõnnestus. Tekkis järgnev viga:"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Left \"Windows\" key"
+msgstr "Vasakpoolne \"Windows\"-klahv"
 
-#: ../../install_steps_interactive.pm_.c:1240
+#: ../../keyboard.pm:1
 #, 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"
-" reboot, hold down Command-Option-O-F at reboot and enter:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
-msgstr ""
-"Alglaaduri võimaldamiseks tuleb Teil muuta oma Open Firmware\n"
-" alglaadimisseadet.  Hoidke taaskäivituse ajal all klahve\n"
-" Command-Option-O-F ja kirjutage:\n"
-" setenv boot-device %s,\\\\:tbxi\n"
-" Seejärel kirjutage: shut-down\n"
-"Järgmisel käivitusel peaksite nägema alglaaduri käsurida."
+msgid "\"Menu\" key"
+msgstr "\"Menüü\"-klahv"
 
-#: ../../install_steps_interactive.pm_.c:1274
-#: ../../standalone/drakautoinst_.c:76
+#: ../../keyboard.pm:1
 #, c-format
-msgid "Insert a blank floppy in drive %s"
-msgstr "Pange palun tühi flopi seadmesse %s"
+msgid "Alt and Shift keys simultaneously"
+msgstr "Alt- ja Shift-klahvid korraga"
 
-#: ../../install_steps_interactive.pm_.c:1278
-msgid "Creating auto install floppy..."
-msgstr "Kiirpaigaldusflopi loomine..."
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Ctrl and Alt keys simultaneously"
+msgstr "Ctrl- ja Alt-klahvid korraga"
 
-#: ../../install_steps_interactive.pm_.c:1289
-msgid ""
-"Some steps are not completed.\n"
-"\n"
-"Do you really want to quit now?"
-msgstr ""
-"Mõned sammud ei ole lõpule viidud.\n"
-"\n"
-"Kas soovite tõesti praegu lõpetada ja väljuda?"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "CapsLock key"
+msgstr "CapsLock-klahv"
 
-#: ../../install_steps_interactive.pm_.c:1300
+#: ../../keyboard.pm:1
 #, c-format
-msgid ""
-"Congratulations, installation is complete.\n"
-"Remove the boot media and press return to reboot.\n"
-"\n"
-"\n"
-"For information on fixes which are available for this release of Mandrake "
-"Linux,\n"
-"consult the Errata available from:\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrake Linux User's Guide."
-msgstr ""
-"Õnnitlen, paigaldamine on edukalt lõpetatud.\n"
-"Võtke palun välja flopi ja/või CD ja vajutage Enter alglaadimiseks.\n"
-"\n"
-"\n"
-"Informatsiooni selle distributsiooni paranduste kohta (Errata) saab\n"
-"Mandrake Linuxi koduleheküljelt:\n"
-"\n"
-"\n"
-"%s\n"
-"\n"
-"\n"
-"Abi süsteemi edasiseks seadistamiseks saab eelkõige dokumendist\n"
-"\"Official Mandrake Linux User's Guide\"."
+msgid "Control and Shift keys simultaneously"
+msgstr "Ctrl- ja Shift-klahvid korraga"
 
-#: ../../install_steps_interactive.pm_.c:1313
-msgid "http://www.mandrakelinux.com/en/90errata.php3"
-msgstr "http://www.mandrakelinux.com/en/90errata.php3"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Both Shift keys simultaneously"
+msgstr "Mõlemad Shift-klahvid korraga"
 
-#: ../../install_steps_interactive.pm_.c:1318
-msgid "Generate auto install floppy"
-msgstr "Loo kiirpaigaldusflopi"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Right Alt key"
+msgstr "Parempoolne Alt-klahv"
 
-#: ../../install_steps_interactive.pm_.c:1320
-msgid ""
-"The auto install can be fully automated if wanted,\n"
-"in that case it will take over the hard drive!!\n"
-"(this is meant for installing on another box).\n"
-"\n"
-"You may prefer to replay the installation.\n"
-msgstr ""
-"Automaatne paigaldus võib olla ka sedavõrd tegija,\n"
-"et kasutab ära kogu kõvaketta !!\n"
-"\n"
-"Võite valida ka lihtsalt paigalduse kordamise.\n"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Yugoslavian (latin)"
+msgstr "Jugoslaavia (ladina)"
 
-#: ../../install_steps_interactive.pm_.c:1325
-msgid "Automated"
-msgstr "Automaatne"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Vietnamese \"numeric row\" QWERTY"
+msgstr "Vietnami \"numbrireaga\" QWERTY"
 
-#: ../../install_steps_interactive.pm_.c:1325
-msgid "Replay"
-msgstr "Kordamine"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "US keyboard (international)"
+msgstr "USA (rahvusvaheline)"
 
-#: ../../install_steps_interactive.pm_.c:1328
-msgid "Save packages selection"
-msgstr "Salvesta paketivalik"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "US keyboard"
+msgstr "USA"
 
-#: ../../install_steps_newt.pm_.c:20
+#: ../../keyboard.pm:1
 #, c-format
-msgid "Mandrake Linux Installation %s"
-msgstr "Mandrake Linuxi paigaldamine %s"
+msgid "UK keyboard"
+msgstr "Briti"
 
-#. -PO This string must fit in a 80-char wide text screen
-#: ../../install_steps_newt.pm_.c:33
-msgid ""
-"  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
-msgstr ""
-"  <Tab>/<Alt-Tab> väljade vahel  | <Space> valib | <F12> järgmine samm "
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Ukrainian"
+msgstr "Ukraina"
 
-#: ../../interactive.pm_.c:87
-msgid "kdesu missing"
-msgstr "kdesu puudub"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Turkish (modern \"Q\" model)"
+msgstr "Türgi (modernne \"Q\" mudel)"
 
-#: ../../interactive.pm_.c:89 ../../interactive.pm_.c:100
-msgid "consolehelper missing"
-msgstr "consolehelper puudub"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Turkish (traditional \"F\" model)"
+msgstr "Türgi (traditsiooniline \"F\" mudel)"
 
-#: ../../interactive.pm_.c:152
-msgid "Choose a file"
-msgstr "Valige fail"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Tajik keyboard"
+msgstr "Tadžiki"
 
-#: ../../interactive.pm_.c:318
-msgid "Advanced"
-msgstr "Edasijõudnud"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Thai keyboard"
+msgstr "Tai"
 
-#: ../../interactive.pm_.c:319 ../../security/main.pm_.c:117
-msgid "Basic"
-msgstr "Põhiline"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Tamil (Typewriter-layout)"
+msgstr "Tamili (kirjutusmasin)"
 
-#: ../../interactive/newt.pm_.c:194 ../../my_gtk.pm_.c:158
-#: ../../printer/printerdrake.pm_.c:2055 ../../ugtk2.pm_.c:434
-msgid "<- Previous"
-msgstr "<- Eelmine"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Tamil (ISCII-layout)"
+msgstr "Tamili (ISCII)"
 
-#: ../../interactive/newt.pm_.c:194 ../../interactive/newt.pm_.c:196
-#: ../../standalone/drakbackup_.c:4060 ../../standalone/drakbackup_.c:4087
-#: ../../standalone/drakbackup_.c:4117 ../../standalone/drakbackup_.c:4143
-msgid "Next"
-msgstr "Järgmine"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Serbian (cyrillic)"
+msgstr "Serbia (kirillitsa)"
 
-#: ../../interactive/stdio.pm_.c:29 ../../interactive/stdio.pm_.c:149
-msgid "Bad choice, try again\n"
-msgstr "Halb valik, proovige palun uuesti\n"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Slovakian (QWERTY)"
+msgstr "Slovaki (QWERTY)"
 
-#: ../../interactive/stdio.pm_.c:30 ../../interactive/stdio.pm_.c:150
+#: ../../keyboard.pm:1
 #, c-format
-msgid "Your choice? (default %s) "
-msgstr "Teie valik? (vaikimisi %s)"
+msgid "Slovakian (QWERTZ)"
+msgstr "Slovaki (QWERTZ)"
 
-#: ../../interactive/stdio.pm_.c:54
+#: ../../keyboard.pm:1
 #, c-format
-msgid ""
-"Entries you'll have to fill:\n"
-"%s"
-msgstr ""
-"Teil tuleb täita kirjed:\n"
-"%s"
+msgid "Slovenian"
+msgstr "Sloveenia"
 
-#: ../../interactive/stdio.pm_.c:70
+#: ../../keyboard.pm:1
 #, c-format
-msgid "Your choice? (0/1, default `%s') "
-msgstr "Teie valik? (0/1, vaikimisi '%s')"
+msgid "Swedish"
+msgstr "Rootsi"
 
-#: ../../interactive/stdio.pm_.c:95
+#: ../../keyboard.pm:1
 #, c-format
-msgid "Button `%s': %s"
-msgstr "Nupp '%s': %s"
+msgid "Russian (Yawerty)"
+msgstr "Vene (Yawerty)"
 
-#: ../../interactive/stdio.pm_.c:96
-msgid "Do you want to click on this button?"
-msgstr "Kas soovite sellel nupul klõpsata?"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Russian"
+msgstr "Vene"
 
-#: ../../interactive/stdio.pm_.c:105
-msgid " enter `void' for void entry"
-msgstr " kirjutage tühja kirje puhul 'void'"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Romanian (qwerty)"
+msgstr "Rumeenia (QWERTY)"
 
-#: ../../interactive/stdio.pm_.c:105
+#: ../../keyboard.pm:1
 #, c-format
-msgid "Your choice? (default `%s'%s) "
-msgstr "Teie valik? (vaikimisi '%s'%s)"
+msgid "Romanian (qwertz)"
+msgstr "Rumeenia (QWERTZ)"
 
-#: ../../interactive/stdio.pm_.c:123
+#: ../../keyboard.pm:1
 #, c-format
-msgid "=> There are many things to choose from (%s).\n"
-msgstr "=> Nüüd on Teil mitmeid valikuid (%s).\n"
+msgid "Canadian (Quebec)"
+msgstr "Kanada (Quebec)"
 
-#: ../../interactive/stdio.pm_.c:126
-msgid ""
-"Please choose the first number of the 10-range you wish to edit,\n"
-"or just hit Enter to proceed.\n"
-"Your choice? "
-msgstr ""
-"Valige palun esimene number kümnesest vahemikust, mida soovite\n"
-"muuta, või vajutage Enter jätkamiseks.\n"
-"Ja Teie valik on? "
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Portuguese"
+msgstr "Portugali"
 
-#: ../../interactive/stdio.pm_.c:139
+#: ../../keyboard.pm:1
 #, c-format
-msgid ""
-"=> Notice, a label changed:\n"
-"%s"
-msgstr ""
-"=> Pange tähele, et pealdis on muutunud:\n"
-"%s"
+msgid "Polish (qwertz layout)"
+msgstr "Poola (QWERTZ)"
 
-#: ../../interactive/stdio.pm_.c:146
-msgid "Re-submit"
-msgstr "Uuestisaatmine"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Polish (qwerty layout)"
+msgstr "Poola (QWERTY)"
 
-#: ../../keyboard.pm_.c:153 ../../keyboard.pm_.c:188
-msgid "Czech (QWERTZ)"
-msgstr "Tšehhi (QWERTZ)"
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Norwegian"
+msgstr "Norra"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Dutch"
+msgstr "Hollandi"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Maltese (US)"
+msgstr "Malta (USA)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Maltese (UK)"
+msgstr "Malta (briti)"
 
-#: ../../keyboard.pm_.c:154 ../../keyboard.pm_.c:190
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Mongolian (cyrillic)"
+msgstr "Mongoli (kirillitsa)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Myanmar (Burmese)"
+msgstr "Myanmari (Birma)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Macedonian"
+msgstr "Makedoonia"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Malayalam"
+msgstr "Malajalami"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Latvian"
+msgstr "Läti"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Lithuanian \"phonetic\" QWERTY"
+msgstr "Leedu \"foneetiline\" QWERTY"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Lithuanian \"number row\" QWERTY"
+msgstr "Leedu \"numbrireaga\" QWERTY"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Lithuanian AZERTY (new)"
+msgstr "Leedu AZERTY (uuem)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Lithuanian AZERTY (old)"
+msgstr "Leedu AZERTY (vanem)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Laotian"
+msgstr "Laose"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Latin American"
+msgstr "Ladina-Ameerika"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Korean keyboard"
+msgstr "Korea"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Japanese 106 keys"
+msgstr "Jaapani 106 klahviga"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Inuktitut"
+msgstr "Inuktituti"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Italian"
+msgstr "Itaalia"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Icelandic"
+msgstr "Islandi"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Iranian"
+msgstr "Iraani"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Israeli (Phonetic)"
+msgstr "Iisraeli (foneetiline)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Israeli"
+msgstr "Iisraeli"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Croatian"
+msgstr "Horvaadi"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Hungarian"
+msgstr "Ungari"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Gurmukhi"
+msgstr "Gurmukhi"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Gujarati"
+msgstr "Gudžarati"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Greek"
+msgstr "Kreeka"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Georgian (\"Latin\" layout)"
+msgstr "Gruusia (\"ladina\" asetus)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Georgian (\"Russian\" layout)"
+msgstr "Gruusia (\"vene\" asetus)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "French"
+msgstr "Prantsuse"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Finnish"
+msgstr "Soome"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Spanish"
+msgstr "Hispaania"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Estonian"
+msgstr "Eesti"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Dvorak (Swedish)"
+msgstr "Dvorak (Rootsi)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Dvorak (Norwegian)"
+msgstr "Dvorak (Norra)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Dvorak (US)"
+msgstr "Dvorak (US)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Danish"
+msgstr "Taani"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Devanagari"
+msgstr "Devanaagari"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "German (no dead keys)"
+msgstr "Saksa (ilma sammuta)"
+
+#: ../../keyboard.pm:1
+#, c-format
 msgid "German"
 msgstr "Saksa"
 
-#: ../../keyboard.pm_.c:155
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Czech (QWERTY)"
+msgstr "Tšehhi (QWERTY)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Czech (QWERTZ)"
+msgstr "Tšehhi (QWERTZ)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Swiss (French layout)"
+msgstr "Šveitsi (Prantsuse asetus)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Swiss (German layout)"
+msgstr "Šveitsi (Saksa asetus)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Belarusian"
+msgstr "Valgevene"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Bosnian"
+msgstr "Bosnia"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Brazilian (ABNT-2)"
+msgstr "Brasiilia (ABNT-2)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Bulgarian (BDS)"
+msgstr "Bulgaaria (BDS)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Bulgarian (phonetic)"
+msgstr "Bulgaaria (foneetiline)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Belgian"
+msgstr "Belgia"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Azerbaidjani (latin)"
+msgstr "Aserbaidžaani (ladina)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Armenian (phonetic)"
+msgstr "Armeenia (foneetiline)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Armenian (typewriter)"
+msgstr "Armeenia (trükimasin)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Armenian (old)"
+msgstr "Armeenia (vanem)"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Albanian"
+msgstr "Albaania"
+
+#: ../../keyboard.pm:1
+#, c-format
+msgid "Polish"
+msgstr "Poola"
+
+#: ../../keyboard.pm:1
+#, c-format
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:198
-msgid "Spanish"
-msgstr "Hispaania"
+#: ../../lang.pm:1
+#, c-format
+msgid "Zimbabwe"
+msgstr "Zimbabwe"
 
-#: ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:199
-msgid "Finnish"
-msgstr "Soome"
+#: ../../lang.pm:1
+#, c-format
+msgid "Zambia"
+msgstr "Sambia"
 
-#: ../../keyboard.pm_.c:158 ../../keyboard.pm_.c:200
-msgid "French"
-msgstr "Prantsuse"
+#: ../../lang.pm:1 ../../standalone/drakxtv:1
+#, c-format
+msgid "South Africa"
+msgstr "Lõuna-Aafrika"
 
-#: ../../keyboard.pm_.c:159 ../../keyboard.pm_.c:233
-msgid "Norwegian"
-msgstr "Norra"
+#: ../../lang.pm:1
+#, c-format
+msgid "Serbia"
+msgstr "Serbia"
 
-#: ../../keyboard.pm_.c:160
-msgid "Polish"
+#: ../../lang.pm:1
+#, c-format
+msgid "Mayotte"
+msgstr "Mayotte"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Yemen"
+msgstr "Jeemen"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Samoa"
+msgstr "Samoa"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Wallis and Futuna"
+msgstr "Wallis ja Futuna"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Vanuatu"
+msgstr "Vanuatu"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Vietnam"
+msgstr "Vietnam"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Virgin Islands (U.S.)"
+msgstr "Neitsisaared (USA)"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Virgin Islands (British)"
+msgstr "Neitsisaared (Briti)"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Venezuela"
+msgstr "Venezuela"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Saint Vincent and the Grenadines"
+msgstr "Saint Vincent ja Grenadiinid"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Vatican"
+msgstr "Vatikan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Uzbekistan"
+msgstr "Usbekistan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Uruguay"
+msgstr "Uruguay"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "United States Minor Outlying Islands"
+msgstr "Ühendriikide hajasaared"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Uganda"
+msgstr "Uganda"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Ukraine"
+msgstr "Ukraina"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Tanzania"
+msgstr "Tansaania"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "Taiwan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Tuvalu"
+msgstr "Tuvalu"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Trinidad and Tobago"
+msgstr "Trinidad ja Tobago"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Turkey"
+msgstr "Türgi"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Tonga"
+msgstr "Tonga"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Tunisia"
+msgstr "Tuneesia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Turkmenistan"
+msgstr "Türkmenistan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "East Timor"
+msgstr "Ida-Timor"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Tokelau"
+msgstr "Tokelau"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Tajikistan"
+msgstr "Tadžikistan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Thailand"
+msgstr "Tai"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Togo"
+msgstr "Togo"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "French Southern Territories"
+msgstr "Prantsuse Lõunaalad"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Chad"
+msgstr "Tšaad"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Turks and Caicos Islands"
+msgstr "Turks ja Caicos"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Swaziland"
+msgstr "Svaasimaa"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Syria"
+msgstr "Süüria"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "El Salvador"
+msgstr "El Salvador"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Sao Tome and Principe"
+msgstr "Sao Tomé ja Principe"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Suriname"
+msgstr "Suriname"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Somalia"
+msgstr "Somaalia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Senegal"
+msgstr "Senegal"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "San Marino"
+msgstr "San Marino"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Sierra Leone"
+msgstr "Sierra Leone"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Slovakia"
+msgstr "Slovakkia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Svalbard and Jan Mayen Islands"
+msgstr "Svalbard ja Jan Mayen"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Slovenia"
+msgstr "Sloveenia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Saint Helena"
+msgstr "Saint Helena"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Singapore"
+msgstr "Singapur"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Sudan"
+msgstr "Sudaan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Seychelles"
+msgstr "Seišellid"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Solomon Islands"
+msgstr "Saalomoni saared"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Saudi Arabia"
+msgstr "Saudi Araabia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Rwanda"
+msgstr "Rwanda"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Russia"
+msgstr "Venemaa"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Romania"
+msgstr "Rumeenia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Reunion"
+msgstr "Réunion"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Qatar"
+msgstr "Katar"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Palau"
+msgstr "Belau"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Paraguay"
+msgstr "Paraguay"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Portugal"
+msgstr "Portugal"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Palestine"
+msgstr "Palestiina"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Puerto Rico"
+msgstr "Puerto Rico"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Pitcairn"
+msgstr "Pitcairn"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Saint Pierre and Miquelon"
+msgstr "Saint Pierre ja Miquelon"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Poland"
 msgstr "Poola"
 
-#: ../../keyboard.pm_.c:161 ../../keyboard.pm_.c:241
-msgid "Russian"
-msgstr "Vene"
+#: ../../lang.pm:1
+#, c-format
+msgid "Pakistan"
+msgstr "Pakistan"
 
-#: ../../keyboard.pm_.c:163 ../../keyboard.pm_.c:243
-msgid "Swedish"
-msgstr "Rootsi"
+#: ../../lang.pm:1
+#, c-format
+msgid "Philippines"
+msgstr "Filipiinid"
 
-#: ../../keyboard.pm_.c:164 ../../keyboard.pm_.c:259
-msgid "UK keyboard"
-msgstr "Briti"
+#: ../../lang.pm:1
+#, c-format
+msgid "Papua New Guinea"
+msgstr "Paapua Uus-Guinea"
 
-#: ../../keyboard.pm_.c:165 ../../keyboard.pm_.c:260
-msgid "US keyboard"
-msgstr "USA"
+#: ../../lang.pm:1
+#, c-format
+msgid "French Polynesia"
+msgstr "Prantsuse Polüneesia"
 
-#: ../../keyboard.pm_.c:167
-msgid "Albanian"
-msgstr "Albaania"
+#: ../../lang.pm:1
+#, c-format
+msgid "Peru"
+msgstr "Peruu"
 
-#: ../../keyboard.pm_.c:168
-msgid "Armenian (old)"
-msgstr "Armeenia (vanem)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Panama"
+msgstr "Panama"
 
-#: ../../keyboard.pm_.c:169
-msgid "Armenian (typewriter)"
-msgstr "Armeenia (trükimasin)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Oman"
+msgstr "Omaan"
 
-#: ../../keyboard.pm_.c:170
-msgid "Armenian (phonetic)"
-msgstr "Armeenia (foneetiline)"
+#: ../../lang.pm:1
+#, c-format
+msgid "New Zealand"
+msgstr "Uus-Meremaa"
 
-#: ../../keyboard.pm_.c:175
-msgid "Azerbaidjani (latin)"
-msgstr "Aserbaidžaani (ladina)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Niue"
+msgstr "Niue"
 
-#: ../../keyboard.pm_.c:177
-msgid "Belgian"
-msgstr "Belgia"
+#: ../../lang.pm:1
+#, c-format
+msgid "Nauru"
+msgstr "Nauru"
 
-#: ../../keyboard.pm_.c:178
-msgid "Bengali"
-msgstr "Bengali"
+#: ../../lang.pm:1
+#, c-format
+msgid "Nepal"
+msgstr "Nepal"
 
-#: ../../keyboard.pm_.c:179
-msgid "Bulgarian (phonetic)"
-msgstr "Bulgaaria (foneetiline)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Nicaragua"
+msgstr "Nicaragua"
 
-#: ../../keyboard.pm_.c:180
-msgid "Bulgarian (BDS)"
-msgstr "Bulgaaria (BDS)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Nigeria"
+msgstr "Nigeeria"
 
-#: ../../keyboard.pm_.c:181
-msgid "Brazilian (ABNT-2)"
-msgstr "Brasiilia (ABNT-2)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Norfolk Island"
+msgstr "Norfolki saar"
 
-#: ../../keyboard.pm_.c:184
-msgid "Bosnian"
-msgstr "Bosnia"
+#: ../../lang.pm:1
+#, c-format
+msgid "Niger"
+msgstr "Niger"
 
-#: ../../keyboard.pm_.c:185
-msgid "Belarusian"
-msgstr "Valgevene"
+#: ../../lang.pm:1
+#, c-format
+msgid "New Caledonia"
+msgstr "Uus-Kaledoonia"
 
-#: ../../keyboard.pm_.c:186
-msgid "Swiss (German layout)"
-msgstr "Šveitsi (Saksa asetus)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Namibia"
+msgstr "Namiibia"
 
-#: ../../keyboard.pm_.c:187
-msgid "Swiss (French layout)"
-msgstr "Šveitsi (Prantsuse asetus)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Mozambique"
+msgstr "Mosambiik"
 
-#: ../../keyboard.pm_.c:189
-msgid "Czech (QWERTY)"
-msgstr "Tšehhi (QWERTY)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Malaysia"
+msgstr "Malaisia"
 
-#: ../../keyboard.pm_.c:191
-msgid "German (no dead keys)"
-msgstr "Saksa (ilma sammuta)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Mexico"
+msgstr "Mehhiko"
 
-#: ../../keyboard.pm_.c:192
-msgid "Devanagari"
-msgstr "Devanaagari"
+#: ../../lang.pm:1
+#, c-format
+msgid "Malawi"
+msgstr "Malawi"
 
-#: ../../keyboard.pm_.c:193
-msgid "Danish"
-msgstr "Taani"
+#: ../../lang.pm:1
+#, c-format
+msgid "Maldives"
+msgstr "Maldiivid"
 
-#: ../../keyboard.pm_.c:194
-msgid "Dvorak (US)"
-msgstr "Dvorak (US)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Mauritius"
+msgstr "Mauritius"
 
-#: ../../keyboard.pm_.c:195
-msgid "Dvorak (Norwegian)"
-msgstr "Dvorak (Norra)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Malta"
+msgstr "Malta"
 
-#: ../../keyboard.pm_.c:196
-msgid "Dvorak (Swedish)"
-msgstr "Dvorak (Rootsi)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Montserrat"
+msgstr "Montserrat"
 
-#: ../../keyboard.pm_.c:197
-msgid "Estonian"
-msgstr "Eesti"
+#: ../../lang.pm:1
+#, c-format
+msgid "Mauritania"
+msgstr "Mauritaania"
 
-#: ../../keyboard.pm_.c:201
-msgid "Georgian (\"Russian\" layout)"
-msgstr "Gruusia (\"vene\" asetus)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Martinique"
+msgstr "Martinique"
 
-#: ../../keyboard.pm_.c:202
-msgid "Georgian (\"Latin\" layout)"
-msgstr "Gruusia (\"ladina\" asetus)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Northern Mariana Islands"
+msgstr "Põhja-Mariaani saared"
 
-#: ../../keyboard.pm_.c:203
-msgid "Greek"
-msgstr "Kreeka"
+#: ../../lang.pm:1
+#, c-format
+msgid "Mongolia"
+msgstr "Mongoolia"
 
-#: ../../keyboard.pm_.c:204
-msgid "Gujarati"
-msgstr "Gudžarati"
+#: ../../lang.pm:1
+#, c-format
+msgid "Myanmar"
+msgstr "Myanmar"
 
-#: ../../keyboard.pm_.c:205
-msgid "Gurmukhi"
-msgstr "Gurmukhi"
+#: ../../lang.pm:1
+#, c-format
+msgid "Mali"
+msgstr "Mali"
 
-#: ../../keyboard.pm_.c:206
-msgid "Hungarian"
-msgstr "Ungari"
+#: ../../lang.pm:1
+#, c-format
+msgid "Macedonia"
+msgstr "Makedoonia"
 
-#: ../../keyboard.pm_.c:207
-msgid "Croatian"
-msgstr "Horvaadi"
+#: ../../lang.pm:1
+#, c-format
+msgid "Marshall Islands"
+msgstr "Marshalli saared"
 
-#: ../../keyboard.pm_.c:208
-msgid "Israeli"
-msgstr "Iisraeli"
+#: ../../lang.pm:1
+#, c-format
+msgid "Madagascar"
+msgstr "Madagaskar"
 
-#: ../../keyboard.pm_.c:209
-msgid "Israeli (Phonetic)"
-msgstr "Iisraeli (foneetiline)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Moldova"
+msgstr "Moldova"
 
-#: ../../keyboard.pm_.c:210
-msgid "Iranian"
-msgstr "Iraani"
+#: ../../lang.pm:1
+#, c-format
+msgid "Monaco"
+msgstr "Monaco"
 
-#: ../../keyboard.pm_.c:211
-msgid "Icelandic"
-msgstr "Islandi"
+#: ../../lang.pm:1
+#, c-format
+msgid "Morocco"
+msgstr "Maroko"
 
-#: ../../keyboard.pm_.c:212
-msgid "Italian"
-msgstr "Itaalia"
+#: ../../lang.pm:1
+#, c-format
+msgid "Libya"
+msgstr "Liibüa"
 
-#: ../../keyboard.pm_.c:213
-msgid "Inuktitut"
-msgstr "Inuktitut"
+#: ../../lang.pm:1
+#, c-format
+msgid "Latvia"
+msgstr "Läti"
 
-#: ../../keyboard.pm_.c:214
-msgid "Japanese 106 keys"
-msgstr "Jaapani 106 klahviga"
+#: ../../lang.pm:1
+#, c-format
+msgid "Luxembourg"
+msgstr "Luksemburg"
 
-#: ../../keyboard.pm_.c:217
-msgid "Korean keyboard"
+#: ../../lang.pm:1
+#, c-format
+msgid "Lithuania"
+msgstr "Leedu"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Lesotho"
+msgstr "Lesotho"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Liberia"
+msgstr "Libeeria"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Sri Lanka"
+msgstr "Sri Lanka"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Liechtenstein"
+msgstr "Liechtenstein"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Saint Lucia"
+msgstr "Saint Lucia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Lebanon"
+msgstr "Liibanon"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Laos"
+msgstr "Laos"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Kazakhstan"
+msgstr "Kasahstan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Cayman Islands"
+msgstr "Kaimanisaared"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Kuwait"
+msgstr "Kuveit"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Korea"
 msgstr "Korea"
 
-#: ../../keyboard.pm_.c:218
-msgid "Latin American"
-msgstr "Ladina-Ameerika"
+#: ../../lang.pm:1
+#, c-format
+msgid "Korea (North)"
+msgstr "Põhja-Korea"
 
-#: ../../keyboard.pm_.c:219
-msgid "Laotian"
-msgstr "Laose"
+#: ../../lang.pm:1
+#, c-format
+msgid "Saint Kitts and Nevis"
+msgstr "Saint Kitts ja Nevis"
 
-#: ../../keyboard.pm_.c:220
-msgid "Lithuanian AZERTY (old)"
-msgstr "Leedu AZERTY (vanem)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Comoros"
+msgstr "Komoorid"
 
-#: ../../keyboard.pm_.c:222
-msgid "Lithuanian AZERTY (new)"
-msgstr "Leedu AZERTY (uuem)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Kiribati"
+msgstr "Kiribati"
 
-#: ../../keyboard.pm_.c:223
-msgid "Lithuanian \"number row\" QWERTY"
-msgstr "Leedu \"numbrireaga\" QWERTY"
+#: ../../lang.pm:1
+#, c-format
+msgid "Cambodia"
+msgstr "Kambodža"
 
-#: ../../keyboard.pm_.c:224
-msgid "Lithuanian \"phonetic\" QWERTY"
-msgstr "Leedu \"foneetiline\" QWERTY"
+#: ../../lang.pm:1
+#, c-format
+msgid "Kyrgyzstan"
+msgstr "Kõrgõzstan"
 
-#: ../../keyboard.pm_.c:225
-msgid "Latvian"
-msgstr "Läti"
+#: ../../lang.pm:1
+#, c-format
+msgid "Kenya"
+msgstr "Keenia"
 
-#: ../../keyboard.pm_.c:226
-msgid "Malayalam"
-msgstr "Malajalami"
+#: ../../lang.pm:1
+#, c-format
+msgid "Japan"
+msgstr "Jaapan"
 
-#: ../../keyboard.pm_.c:227
-msgid "Macedonian"
-msgstr "Makedoonia"
+#: ../../lang.pm:1
+#, c-format
+msgid "Jordan"
+msgstr "Jordaania"
 
-#: ../../keyboard.pm_.c:228
-msgid "Myanmar (Burmese)"
-msgstr "Myanmari (Birma)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Jamaica"
+msgstr "Jamaica"
 
-#: ../../keyboard.pm_.c:229
-msgid "Mongolian (cyrillic)"
-msgstr "Mongoli (kirillitsa)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Iceland"
+msgstr "Island"
 
-#: ../../keyboard.pm_.c:230
-msgid "Maltese (UK)"
-msgstr "Malta (briti)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Iran"
+msgstr "Iraan"
 
-#: ../../keyboard.pm_.c:231
-msgid "Maltese (US)"
-msgstr "Malta (USA)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Iraq"
+msgstr "Iraak"
 
-#: ../../keyboard.pm_.c:232
-msgid "Dutch"
-msgstr "Hollandi"
+#: ../../lang.pm:1
+#, c-format
+msgid "British Indian Ocean Territory"
+msgstr "Briti India ookeani ala"
 
-#: ../../keyboard.pm_.c:234
-msgid "Polish (qwerty layout)"
-msgstr "Poola (QWERTY)"
+#: ../../lang.pm:1
+#, c-format
+msgid "India"
+msgstr "India"
 
-#: ../../keyboard.pm_.c:235
-msgid "Polish (qwertz layout)"
-msgstr "Poola (QWERTZ)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Israel"
+msgstr "Iisrael"
 
-#: ../../keyboard.pm_.c:236
-msgid "Portuguese"
-msgstr "Portugali"
+#: ../../lang.pm:1 ../../standalone/drakxtv:1
+#, c-format
+msgid "Ireland"
+msgstr "Iirimaa"
 
-#: ../../keyboard.pm_.c:237
-msgid "Canadian (Quebec)"
-msgstr "Kanada (Quebec)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Indonesia"
+msgstr "Indoneesia"
 
-#: ../../keyboard.pm_.c:239
-msgid "Romanian (qwertz)"
-msgstr "Rumeenia (QWERTZ)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Hungary"
+msgstr "Ungari"
 
-#: ../../keyboard.pm_.c:240
-msgid "Romanian (qwerty)"
-msgstr "Rumeenia (QWERTY)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Haiti"
+msgstr "Haiti"
 
-#: ../../keyboard.pm_.c:242
-msgid "Russian (Yawerty)"
-msgstr "Vene (Yawerty)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Croatia"
+msgstr "Horvaatia"
 
-#: ../../keyboard.pm_.c:244
-msgid "Slovenian"
-msgstr "Sloveenia"
+#: ../../lang.pm:1
+#, c-format
+msgid "Honduras"
+msgstr "Honduras"
 
-#: ../../keyboard.pm_.c:245
-msgid "Slovakian (QWERTZ)"
-msgstr "Slovaki (QWERTZ)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Heard and McDonald Islands"
+msgstr "Heard ja McDonald"
 
-#: ../../keyboard.pm_.c:246
-msgid "Slovakian (QWERTY)"
-msgstr "Slovaki (QWERTY)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Hong Kong"
+msgstr "Hongkong"
 
-#: ../../keyboard.pm_.c:248
-msgid "Serbian (cyrillic)"
-msgstr "Serbia (kirillitsa)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Guyana"
+msgstr "Guyana"
 
-#: ../../keyboard.pm_.c:250
-msgid "Tamil (Unicode)"
-msgstr "Tamili (Unicode)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Guinea-Bissau"
+msgstr "Guinea-Bissau"
 
-#: ../../keyboard.pm_.c:251
-msgid "Tamil (TSCII)"
-msgstr "Tamili (TSCII)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Guam"
+msgstr "Guam"
 
-#: ../../keyboard.pm_.c:252
-msgid "Thai keyboard"
-msgstr "Tai"
+#: ../../lang.pm:1
+#, c-format
+msgid "Guatemala"
+msgstr "Guatemala"
 
-#: ../../keyboard.pm_.c:254
-msgid "Tajik keyboard"
-msgstr "Tadžiki"
+#: ../../lang.pm:1
+#, c-format
+msgid "South Georgia and the South Sandwich Islands"
+msgstr "Lõuna-Georgia ja Lõuna-Sandwichi saared"
 
-#: ../../keyboard.pm_.c:255
-msgid "Turkish (traditional \"F\" model)"
-msgstr "Türgi (traditsiooniline \"F\" mudel)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Equatorial Guinea"
+msgstr "Ekvatoriaal-Guinea"
 
-#: ../../keyboard.pm_.c:256
-msgid "Turkish (modern \"Q\" model)"
-msgstr "Türgi (modernne \"Q\" mudel)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Guadeloupe"
+msgstr "Guadeloupe"
 
-#: ../../keyboard.pm_.c:258
-msgid "Ukrainian"
-msgstr "Ukraina"
+#: ../../lang.pm:1
+#, c-format
+msgid "Guinea"
+msgstr "Guinea"
 
-#: ../../keyboard.pm_.c:261
-msgid "US keyboard (international)"
-msgstr "USA (rahvusvaheline)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Gambia"
+msgstr "Gambia"
 
-#: ../../keyboard.pm_.c:262
-msgid "Vietnamese \"numeric row\" QWERTY"
-msgstr "Vietnami \"numbrireaga\" QWERTY"
+#: ../../lang.pm:1
+#, c-format
+msgid "Greenland"
+msgstr "Gröönimaa"
 
-#: ../../keyboard.pm_.c:263
-msgid "Yugoslavian (latin)"
-msgstr "Jugoslaavia (ladina)"
+#: ../../lang.pm:1
+#, c-format
+msgid "Gibraltar"
+msgstr "Gibraltar"
 
-#: ../../keyboard.pm_.c:270
-msgid "Right Alt key"
-msgstr "Parempoolne Alt-klahv"
+#: ../../lang.pm:1
+#, c-format
+msgid "Ghana"
+msgstr "Ghana"
 
-#: ../../keyboard.pm_.c:271
-msgid "Both Shift keys simultaneously"
-msgstr "Mõlemad Shift-klahvid korraga"
+#: ../../lang.pm:1
+#, c-format
+msgid "French Guiana"
+msgstr "Prantsuse Guajaana"
 
-#: ../../keyboard.pm_.c:272
-msgid "Control and Shift keys simultaneously"
-msgstr "Ctrl- ja Shift-klahvid korraga"
+#: ../../lang.pm:1
+#, c-format
+msgid "Georgia"
+msgstr "Gruusia"
 
-#: ../../keyboard.pm_.c:273
-msgid "CapsLock key"
-msgstr "CapsLock-klahv"
+#: ../../lang.pm:1
+#, c-format
+msgid "Grenada"
+msgstr "Grenada"
 
-#: ../../keyboard.pm_.c:274
-msgid "Ctrl and Alt keys simultaneously"
-msgstr "Ctrl- ja Alt-klahvid korraga"
+#: ../../lang.pm:1 ../../network/tools.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "Suurbritannia"
 
-#: ../../keyboard.pm_.c:275
-msgid "Alt and Shift keys simultaneously"
-msgstr "Alt- ja Shift-klahvid korraga"
+#: ../../lang.pm:1
+#, c-format
+msgid "Gabon"
+msgstr "Gabon"
 
-#: ../../keyboard.pm_.c:276
-msgid "\"Menu\" key"
-msgstr "\"Menüü\"-klahv"
+#: ../../lang.pm:1
+#, c-format
+msgid "Faroe Islands"
+msgstr "Fääri saared"
 
-#: ../../keyboard.pm_.c:277
-msgid "Left \"Windows\" key"
-msgstr "Vasakpoolne \"Windows\"-klahv"
+#: ../../lang.pm:1
+#, c-format
+msgid "Micronesia"
+msgstr "Mikroneesia"
 
-#: ../../keyboard.pm_.c:278
-msgid "Right \"Windows\" key"
-msgstr "Parempoolne \"Windows\"-klahv"
+#: ../../lang.pm:1
+#, c-format
+msgid "Falkland Islands (Malvinas)"
+msgstr "Falklandi saared (Malviinid)"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Fiji"
+msgstr "Fidži"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Finland"
+msgstr "Soome"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Ethiopia"
+msgstr "Etioopia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Spain"
+msgstr "Hispaania"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Eritrea"
+msgstr "Eritrea"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Western Sahara"
+msgstr "Lääne-Sahara"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Egypt"
+msgstr "Egiptus"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Estonia"
+msgstr "Eesti"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Ecuador"
+msgstr "Ecuador"
 
-#: ../../loopback.pm_.c:32
+#: ../../lang.pm:1
+#, c-format
+msgid "Algeria"
+msgstr "Alžeeria"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Dominican Republic"
+msgstr "Dominikaani Vabariik"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Dominica"
+msgstr "Dominica"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Denmark"
+msgstr "Taani"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Djibouti"
+msgstr "Djibouti"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Cyprus"
+msgstr "Küpros"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Christmas Island"
+msgstr "Jõulusaar"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Cape Verde"
+msgstr "Cabo Verde"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Cuba"
+msgstr "Kuuba"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Colombia"
+msgstr "Colombia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "China"
+msgstr "Hiina"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Cameroon"
+msgstr "Kamerun"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Chile"
+msgstr "Tšiili"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Cook Islands"
+msgstr "Cooki saared"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Cote d'Ivoire"
+msgstr "Cote d'Ivoire"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Switzerland"
+msgstr "Šveits"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Congo (Brazzaville)"
+msgstr "Kongo (Brazzaville)"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Central African Republic"
+msgstr "Kesk-Aafrika Vabariik"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Congo (Kinshasa)"
+msgstr "Kongo (Kinshasa)"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Cocos (Keeling) Islands"
+msgstr "Kookosesaared"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Canada"
+msgstr "Kanada"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Belize"
+msgstr "Belize"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Belarus"
+msgstr "Valgevene"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Botswana"
+msgstr "Botswana"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bouvet Island"
+msgstr "Bouvet' saar"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bhutan"
+msgstr "Bhutan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bahamas"
+msgstr "Bahama saared"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "Brasiilia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bolivia"
+msgstr "Boliivia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Brunei Darussalam"
+msgstr "Brunei"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bermuda"
+msgstr "Bermuda"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Benin"
+msgstr "Benin"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Burundi"
+msgstr "Burundi"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bahrain"
+msgstr "Bahrein"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bulgaria"
+msgstr "Bulgaaria"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Burkina Faso"
+msgstr "Burkina Faso"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bangladesh"
+msgstr "Bangladesh"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Barbados"
+msgstr "Barbados"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Bosnia and Herzegovina"
+msgstr "Bosnia ja Hertsegoviina"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Azerbaijan"
+msgstr "Aserbaidžaan"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Aruba"
+msgstr "Aruba"
+
+#: ../../lang.pm:1 ../../standalone/drakxtv:1
+#, c-format
+msgid "Australia"
+msgstr "Austraalia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "American Samoa"
+msgstr "Ameerika Samoa"
+
+#: ../../lang.pm:1 ../../standalone/drakxtv:1
+#, c-format
+msgid "Argentina"
+msgstr "Argentina"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Antarctica"
+msgstr "Antarktika"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Angola"
+msgstr "Angola"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Netherlands Antilles"
+msgstr "Hollandi Antillid"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Armenia"
+msgstr "Armeenia"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Albania"
+msgstr "Albaania"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Anguilla"
+msgstr "Anguilla"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Antigua and Barbuda"
+msgstr "Antigua ja Barbuda"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "United Arab Emirates"
+msgstr "Araabia Ühendemiraadid"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Andorra"
+msgstr "Andorra"
+
+#: ../../lang.pm:1
+#, c-format
+msgid "Afghanistan"
+msgstr "Afganistan"
+
+#: ../../loopback.pm:1
 #, c-format
 msgid "Circular mounts %s\n"
 msgstr "Ringühendus %s\n"
 
-#: ../../lvm.pm_.c:103
+#: ../../lvm.pm:1
+#, c-format
 msgid "Remove the logical volumes first\n"
 msgstr "Eemalda enne kettarühmad (logical volumes)\n"
 
-#: ../../modules.pm_.c:290
+#: ../../modules.pm:1
+#, c-format
 msgid ""
 "PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
 msgstr "2.2 kernelitel pole enam PCMCIA tuge. Kasutage palun 2.4 kernelit."
 
-#: ../../modules/interactive.pm_.c:16
-msgid "You can configure each parameter of the module here."
-msgstr "Siin saab seadistada mooduli kõiki parameetreid."
-
-#: ../../modules/parameters.pm_.c:18
-msgid "modinfo is not available"
-msgstr "'modinfo' ei ole kättesaadav"
-
-#: ../../modules/parameters.pm_.c:50
-msgid "a number"
-msgstr "number"
+#: ../../mouse.pm:1
+#, c-format
+msgid "MOVE YOUR WHEEL!"
+msgstr "KEERUTAGE RATTAKEST!"
 
-#: ../../modules/parameters.pm_.c:52
+#: ../../mouse.pm:1
 #, c-format
-msgid "%d comma separated numbers"
-msgstr "%d komaga eraldatud numbrit"
+msgid "To activate the mouse,"
+msgstr "Hiire aktiveerimiseks"
 
-#: ../../modules/parameters.pm_.c:52
+#: ../../mouse.pm:1
 #, c-format
-msgid "%d comma separated strings"
-msgstr "%d komaga eraldatud stringi"
+msgid "Please test the mouse"
+msgstr "Palun testige hiirt"
 
-#: ../../modules/parameters.pm_.c:54
-msgid "comma separated numbers"
-msgstr "komaga eradatud numbrit"
+#: ../../mouse.pm:1
+#, c-format
+msgid "No mouse"
+msgstr "Hiir puudub"
 
-#: ../../modules/parameters.pm_.c:54
-msgid "comma separated strings"
-msgstr "komaga eraldatud stringi"
+#: ../../mouse.pm:1
+#, c-format
+msgid "none"
+msgstr "ei soovi"
 
-#: ../../mouse.pm_.c:25
-msgid "Sun - Mouse"
-msgstr "Suni hiir"
+#: ../../mouse.pm:1
+#, c-format
+msgid "3 buttons"
+msgstr "3 nupuga"
 
-#: ../../mouse.pm_.c:32
-msgid "Logitech MouseMan+"
-msgstr "Logitech MouseMan+"
+#: ../../mouse.pm:1
+#, c-format
+msgid "2 buttons"
+msgstr "2 nupuga"
 
-#: ../../mouse.pm_.c:33
-msgid "Generic PS2 Wheel Mouse"
-msgstr "Tavaline PS2 rattaga hiir"
+#: ../../mouse.pm:1
+#, c-format
+msgid "1 button"
+msgstr "1 nupuga"
 
-#: ../../mouse.pm_.c:34
-msgid "GlidePoint"
-msgstr "GlidePoint"
+#: ../../mouse.pm:1
+#, c-format
+msgid "busmouse"
+msgstr "siinihiir"
 
-#: ../../mouse.pm_.c:36 ../../mouse.pm_.c:65
+#: ../../mouse.pm:1
+#, c-format
 msgid "Kensington Thinking Mouse"
 msgstr "Kensington Thinking Mouse"
 
-#: ../../mouse.pm_.c:37 ../../mouse.pm_.c:61
+#: ../../mouse.pm:1
+#, c-format
+msgid "Logitech Mouse (serial, old C7 type)"
+msgstr "Logitech (jadaport, vana C7 tüüpi)"
+
+#: ../../mouse.pm:1
+#, c-format
+msgid "MM HitTablet"
+msgstr "MM HitTablet"
+
+#: ../../mouse.pm:1
+#, c-format
+msgid "MM Series"
+msgstr "MM seeria"
+
+#: ../../mouse.pm:1
+#, c-format
 msgid "Genius NetMouse"
 msgstr "Genius NetMouse"
 
-#: ../../mouse.pm_.c:38
-msgid "Genius NetScroll"
-msgstr "Genius NetScroll"
+#: ../../mouse.pm:1
+#, c-format
+msgid "Logitech MouseMan+/FirstMouse+"
+msgstr "Logitech MouseMan+/FirstMouse+"
 
-#: ../../mouse.pm_.c:39 ../../mouse.pm_.c:48
-msgid "Microsoft Explorer"
-msgstr "Microsoft Explorer"
+#: ../../mouse.pm:1
+#, c-format
+msgid "Logitech CC Series"
+msgstr "Logitech CC seeria"
 
-#: ../../mouse.pm_.c:44 ../../mouse.pm_.c:70
-msgid "1 button"
-msgstr "1 nupuga"
+#: ../../mouse.pm:1
+#, c-format
+msgid "Mouse Systems"
+msgstr "Mouse Systems"
 
-#: ../../mouse.pm_.c:45 ../../mouse.pm_.c:53
+#: ../../mouse.pm:1
+#, c-format
+msgid "Logitech MouseMan"
+msgstr "Logitech MouseMan"
+
+#: ../../mouse.pm:1
+#, c-format
+msgid "Microsoft IntelliMouse"
+msgstr "Microsoft IntelliMouse"
+
+#: ../../mouse.pm:1
+#, c-format
+msgid "Generic 3 Button Mouse"
+msgstr "Tavaline 3 nupuga hiir"
+
+#: ../../mouse.pm:1
+#, c-format
 msgid "Generic 2 Button Mouse"
 msgstr "Tavaline 2 nupuga hiir"
 
-#: ../../mouse.pm_.c:47
+#: ../../mouse.pm:1
+#, c-format
+msgid "serial"
+msgstr "jadapordi"
+
+#: ../../mouse.pm:1
+#, c-format
+msgid "Microsoft Explorer"
+msgstr "Microsoft Explorer"
+
+#: ../../mouse.pm:1
+#, c-format
 msgid "Wheel"
 msgstr "Rattaga"
 
-#: ../../mouse.pm_.c:51
-msgid "serial"
-msgstr "jadapordi"
+#: ../../mouse.pm:1 ../../Xconfig/monitor.pm:1
+#, c-format
+msgid "Generic"
+msgstr "Tavaline"
 
-#: ../../mouse.pm_.c:54
-msgid "Generic 3 Button Mouse"
-msgstr "Tavaline 3 nupuga hiir"
+#: ../../mouse.pm:1
+#, c-format
+msgid "Genius NetScroll"
+msgstr "Genius NetScroll"
 
-#: ../../mouse.pm_.c:55
-msgid "Microsoft IntelliMouse"
-msgstr "Microsoft IntelliMouse"
+#: ../../mouse.pm:1
+#, c-format
+msgid "GlidePoint"
+msgstr "GlidePoint"
 
-#: ../../mouse.pm_.c:56
-msgid "Logitech MouseMan"
-msgstr "Logitech MouseMan"
+#: ../../mouse.pm:1
+#, c-format
+msgid "Generic PS2 Wheel Mouse"
+msgstr "Tavaline PS2 rattaga hiir"
 
-#: ../../mouse.pm_.c:57
-msgid "Mouse Systems"
-msgstr "Mouse Systems"
+#: ../../mouse.pm:1
+#, c-format
+msgid "Logitech MouseMan+"
+msgstr "Logitech MouseMan+"
 
-#: ../../mouse.pm_.c:59
-msgid "Logitech CC Series"
-msgstr "Logitech CC seeria"
+#: ../../mouse.pm:1 ../../security/level.pm:1
+#, c-format
+msgid "Standard"
+msgstr "Standardne"
 
-#: ../../mouse.pm_.c:60
-msgid "Logitech MouseMan+/FirstMouse+"
-msgstr "Logitech MouseMan+/FirstMouse+"
+#: ../../mouse.pm:1
+#, c-format
+msgid "Sun - Mouse"
+msgstr "Suni hiir"
 
-#: ../../mouse.pm_.c:62
-msgid "MM Series"
-msgstr "MM seeria"
+#: ../../my_gtk.pm:1 ../../ugtk2.pm:1
+#, c-format
+msgid "Toggle between flat and group sorted"
+msgstr "Sorteeritud või sorteerimata"
 
-#: ../../mouse.pm_.c:63
-msgid "MM HitTablet"
-msgstr "MM HitTablet"
+#: ../../my_gtk.pm:1 ../../ugtk2.pm:1
+#, c-format
+msgid "Collapse Tree"
+msgstr "Sulge puu"
 
-#: ../../mouse.pm_.c:64
-msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech (jadaport, vana C7 tüüpi)"
+#: ../../my_gtk.pm:1 ../../ugtk2.pm:1
+#, c-format
+msgid "Expand Tree"
+msgstr "Ava puu"
 
-#: ../../mouse.pm_.c:68
-msgid "busmouse"
-msgstr "siinihiir"
+#: ../../my_gtk.pm:1 ../../services.pm:1 ../../ugtk2.pm:1
+#, c-format
+msgid "Info"
+msgstr "Info"
 
-#: ../../mouse.pm_.c:71
-msgid "2 buttons"
-msgstr "2 nupuga"
+#: ../../my_gtk.pm:1 ../../ugtk2.pm:1
+#, c-format
+msgid "Is this correct?"
+msgstr "Kas see on sobiv?"
 
-#: ../../mouse.pm_.c:72
-msgid "3 buttons"
-msgstr "3 nupuga"
+#: ../../my_gtk.pm:1
+#, c-format
+msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*.*-r-*"
 
-#: ../../mouse.pm_.c:75
-msgid "none"
-msgstr "ei soovi"
+#: ../../partition_table.pm:1
+#, c-format
+msgid "Error writing to file %s"
+msgstr "Viga faili %s kirjutamisel"
 
-#: ../../mouse.pm_.c:77
-msgid "No mouse"
-msgstr "Hiir puudub"
+#: ../../partition_table.pm:1
+#, c-format
+msgid "Bad backup file"
+msgstr "Kõlbmatu varukoopia"
 
-#: ../../mouse.pm_.c:490
-msgid "Please test the mouse"
-msgstr "Palun testige hiirt"
+#: ../../partition_table.pm:1
+#, c-format
+msgid "Restoring from file %s failed: %s"
+msgstr "Taastamine failist %s ebaõnnestus: %s"
 
-#: ../../mouse.pm_.c:491
-msgid "To activate the mouse,"
-msgstr "Hiire aktiveerimiseks"
+#: ../../partition_table.pm:1
+#, c-format
+msgid ""
+"You have a hole in your partition table but I can't use it.\n"
+"The only solution is to move your primary partitions to have the hole next "
+"to the extended partitions."
+msgstr ""
+"Partitsioonitabelis on miskipärast tühi koht, aga see ei ole kasutatav.\n"
+"Ainuke lahendus on nihutada primaarset partitsiooni, et \"auk\" satuks "
+"laiendatud partitsioonide kõrvale."
 
-#: ../../mouse.pm_.c:492
-msgid "MOVE YOUR WHEEL!"
-msgstr "KEERUTAGE RATTAKEST!"
+#: ../../partition_table.pm:1
+#, c-format
+msgid "Extended partition not supported on this platform"
+msgstr "Sellel platvormil ei saa laiendatud partitsiooni luua"
 
-#: ../../my_gtk.pm_.c:65
-msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
-msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*.*-r-*"
+#: ../../partition_table.pm:1
+#, c-format
+msgid "mount failed: "
+msgstr "haakimine ebaõnnestus: "
 
-#: ../../my_gtk.pm_.c:159 ../../ugtk2.pm_.c:435
-msgid "Finish"
-msgstr "Lõpeta"
+#: ../../pkgs.pm:1
+#, c-format
+msgid "maybe"
+msgstr "võib olla"
 
-#: ../../my_gtk.pm_.c:159 ../../printer/printerdrake.pm_.c:2057
-#: ../../ugtk2.pm_.c:435
-msgid "Next ->"
-msgstr "Järgmine ->"
+#: ../../pkgs.pm:1
+#, c-format
+msgid "nice"
+msgstr "kena"
 
-#: ../../my_gtk.pm_.c:287 ../../ugtk2.pm_.c:926
-msgid "Is this correct?"
-msgstr "Kas see on sobiv?"
+#: ../../pkgs.pm:1
+#, c-format
+msgid "very nice"
+msgstr "väga kena"
 
-#: ../../my_gtk.pm_.c:359 ../../services.pm_.c:227 ../../ugtk2.pm_.c:1011
-msgid "Info"
-msgstr "Info"
+#: ../../pkgs.pm:1
+#, c-format
+msgid "important"
+msgstr "tähtis"
 
-#: ../../my_gtk.pm_.c:380 ../../ugtk2.pm_.c:1036
-msgid "Expand Tree"
-msgstr "Ava puu"
+#: ../../pkgs.pm:1
+#, c-format
+msgid "must have"
+msgstr "vajalik"
 
-#: ../../my_gtk.pm_.c:381 ../../ugtk2.pm_.c:1037
-msgid "Collapse Tree"
-msgstr "Sulge puu"
+#: ../../raid.pm:1
+#, c-format
+msgid "Not enough partitions for RAID level %d\n"
+msgstr "Ei ole piisavalt partitsioone RAID-%d jaoks\n"
 
-#: ../../my_gtk.pm_.c:382 ../../ugtk2.pm_.c:1038
-msgid "Toggle between flat and group sorted"
-msgstr "Sorteeritud või sorteerimata"
+#: ../../raid.pm:1
+#, c-format
+msgid "mkraid failed"
+msgstr "mkraid ebaõnnestus"
 
-#: ../../network/adsl.pm_.c:23
-msgid "use pppoe"
-msgstr "pppoe"
+#: ../../raid.pm:1
+#, c-format
+msgid "mkraid failed (maybe raidtools are missing?)"
+msgstr "mkraid ebaõnnestus (võib-olla puudub 'raidtools'?)"
 
-#: ../../network/adsl.pm_.c:24
-msgid "use pptp"
-msgstr "pptp"
+#: ../../raid.pm:1
+#, c-format
+msgid "Can't add a partition to _formatted_ RAID md%d"
+msgstr "Juba vormindatud RAID-ile (md%d) ei saa partitsiooni lisada"
 
-#: ../../network/adsl.pm_.c:25
-msgid "use dhcp"
-msgstr "dhcp"
+#: ../../services.pm:1
+#, c-format
+msgid "Stop"
+msgstr "Peata"
 
-#: ../../network/adsl.pm_.c:26
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch USB"
+#: ../../services.pm:1
+#, c-format
+msgid "Start"
+msgstr "Käivita"
 
-#: ../../network/adsl.pm_.c:27
-msgid "Sagem (using pppoe) usb"
-msgstr "Sagem (pppoe vahendusel) usb"
+#: ../../services.pm:1
+#, c-format
+msgid "On boot"
+msgstr "Alglaadimisel"
 
-#: ../../network/adsl.pm_.c:29 ../../network/ethernet.pm_.c:36
-msgid "Connect to the Internet"
-msgstr "Loo internetiühendus"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"No additional information\n"
+"about this service, sorry."
+msgstr ""
+"Selle teenuse kohta\n"
+"ei oska lisainfot anda."
+
+#: ../../services.pm:1
+#, c-format
+msgid "Services and deamons"
+msgstr "Teenused ja deemonid"
 
-#: ../../network/adsl.pm_.c:30
+#: ../../services.pm:1
+#, c-format
+msgid "stopped"
+msgstr "peatatud"
+
+#: ../../services.pm:1
+#, c-format
+msgid "running"
+msgstr "töötab"
+
+#: ../../services.pm:1
+#, c-format
+msgid "Choose which services should be automatically started at boot time"
+msgstr "Valige, millised teenused tuleks alglaadimisel käivitada"
+
+#: ../../services.pm:1
+#, c-format
+msgid "Database Server"
+msgstr "Andmebaasi server"
+
+#: ../../services.pm:1
+#, c-format
+msgid "Remote Administration"
+msgstr "Kaughaldus"
+
+#: ../../services.pm:1
+#, c-format
+msgid "File sharing"
+msgstr "Failide jagamine"
+
+#: ../../services.pm:1
+#, c-format
+msgid "Internet"
+msgstr "Internet"
+
+#: ../../services.pm:1
+#, c-format
+msgid "Printing"
+msgstr "Trükkimine"
+
+#: ../../services.pm:1
+#, c-format
+msgid "Starts the X Font Server (this is mandatory for XFree to run)."
+msgstr "Käivitab X fondiserveri, ilma milleta X lihtsalt ei lähe käima."
+
+#: ../../services.pm:1
+#, c-format
+msgid "Load the drivers for your usb devices."
+msgstr "Laeb draiverid USB-seadmete tarbeks."
+
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"The most common way to connect with adsl is pppoe.\n"
-"Some connections use pptp, a few ones use dhcp.\n"
-"If you don't know, choose 'use pppoe'"
+"Syslog is the facility by which many daemons use to log messages\n"
+"to various system log files.  It is a good idea to always run syslog."
+msgstr "Syslog-i kaudu toimub süsteemis toimiva logimine. Vajalik!"
+
+#: ../../services.pm:1
+#, c-format
+msgid "Launch the sound system on your machine"
+msgstr "Käivitab helisüsteemi"
+
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"The rwho protocol lets remote users get a list of all of the users\n"
+"logged into a machine running the rwho daemon (similiar to finger)."
 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"
+"Protokoll rwho laseb üle võrgu saada informatsiooni\n"
+"süsteemi kasutajate kohta. Ettevaatust!"
 
-#: ../../network/adsl.pm_.c:166
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"You need the alcatel microcode.\n"
-"Download it at\n"
-"http://www.speedtouchdsl.com/dvrreg_lx.htm\n"
-"and copy the mgmt.o in /usr/share/speedtouch"
+"The rusers protocol allows users on a network to identify who is\n"
+"logged in on other responding machines."
 msgstr ""
-"Selleks vajate Alcatel'i mikrokoodi.\n"
-"Seda saate alla laadida võrgust\n"
-"http://www.speedtouchdsl.com/dvrreg_lx.htm\n"
-"ja saadud 'mgmt.o' kopeerige kataloogi /usr/share/speedtouch"
+"Protokoll rusers laseb üle võrgu saada informatsiooni\n"
+"süsteemi kasutajate kohta. Ettevaatust!"
 
-#: ../../network/drakfirewall.pm_.c:12
-msgid "Web Server"
-msgstr "Veebiserver"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"The rstat protocol allows users on a network to retrieve\n"
+"performance metrics for any machine on that network."
+msgstr ""
+"Protokoll rstat laseb üle võrgu saada informatsiooni\n"
+"süsteemi töö kohta. Ettevaatust!"
 
-#: ../../network/drakfirewall.pm_.c:17
-msgid "Domain Name Server"
-msgstr "Nimeserver"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"The routed daemon allows for automatic IP router table updated via\n"
+"the RIP protocol. While RIP is widely used on small networks, more complex\n"
+"routing protocols are needed for complex networks."
+msgstr ""
+"routed on RIP deemon, mis vahetab selle protokolli alusel\n"
+"marsruutimisinfot. Kui Teil on RIP kasutusel, on vajalik ka routed."
 
-#: ../../network/drakfirewall.pm_.c:32
-msgid "Mail Server"
-msgstr "Meiliserver"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Assign raw devices to block devices (such as hard drive\n"
+"partitions), for the use of applications such as Oracle"
+msgstr ""
+"Toorseadmete seostamine blokkseadmetega\n"
+"(näiteks kõvaketta partitsioonid)\n"
+"selliste rakenduste, nagu Oracle tarbeks"
 
-#: ../../network/drakfirewall.pm_.c:37
-msgid "POP and IMAP Server"
-msgstr "POP ja IMAP server"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Saves and restores system entropy pool for higher quality random\n"
+"number generation."
+msgstr ""
+"Salvestab ja taastab juhuarvude genereerimiseks vajaliku\n"
+"süsteemse entroopiasalve."
 
-#: ../../network/drakfirewall.pm_.c:111
-msgid "No network card"
-msgstr "Võrgukaart puudub"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Postfix is a Mail Transport Agent, which is the program that moves mail from "
+"one machine to another."
+msgstr ""
+"Postfix on meili transpordiagent, see tähendab rakendus,\n"
+"mis toimetab meili ühest masinast teise."
 
-#: ../../network/drakfirewall.pm_.c:129
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"drakfirewall configurator\n"
-"\n"
-"This configures a personal firewall for this Mandrake Linux machine.\n"
-"For a powerful dedicated firewall solution, please look to the\n"
-"specialized MandrakeSecurity Firewall distribution."
+"The portmapper manages RPC connections, which are used by\n"
+"protocols such as NFS and NIS. The portmap server must be running on "
+"machines\n"
+"which act as servers for protocols which make use of the RPC mechanism."
 msgstr ""
-"drakfirewalli seadistaja\n"
-"\n"
-"Selle vahendiga saate luua lihtsa kaitse Interneti ohtude vastu.\n"
-"Kui vajate võimsat tulemüüri, vaadake palun\n"
-"spetsiaalset MandrakeSecurity Firewall distributsiooni."
+"portmapper haldab RPC ühendusi, mida kasutavad NFS ja NIS.\n"
+"Neil serveritel on see hädavajalik."
 
-#: ../../network/drakfirewall.pm_.c:135
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"drakfirewall configurator\n"
-"\n"
-"Make sure you have configured your Network/Internet access with\n"
-"drakconnect before going any further."
+"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."
 msgstr ""
-"drakfirewalli seadistaja\n"
-"\n"
-"Kontrollige enne jätkamist, et olete seadistanud pääsu võrku/Internetti\n"
-"drakconnecti abil."
+"PCMCIA tugi on tavaliselt vajalik sülearvutitele võrgu- ja\n"
+"modemiliideste lisamiseks."
 
-#: ../../network/drakfirewall.pm_.c:152
-msgid "Which services would you like to allow the Internet to connect to?"
-msgstr "Millistel teenustel soovite lubada kasutada internetiühendust?"
+#: ../../services.pm:1
+#, c-format
+msgid "Support the OKI 4w and compatible winprinters."
+msgstr "Toetab OKI 4w ja sellega ühilduvaid winprintereid."
 
-#: ../../network/drakfirewall.pm_.c:153
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"You can enter miscellaneous ports. \n"
-"Valid examples are: 139/tcp 139/udp.\n"
-"Have a look at /etc/services for information."
+"Automatically switch on numlock key locker under console\n"
+"and XFree at boot."
+msgstr "Lülitab automaatselt alglaadimise ajal sisse NumLock-i."
+
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"NFS is a popular protocol for file sharing across TCP/IP\n"
+"networks. This service provides NFS file locking functionality."
 msgstr ""
-"Sisestada võib mitmesuguseid porte. \n"
-"Sobivad näiteks: 139/tcp 139/udp.\n"
-"Vaadake lähemalt /etc/services."
+"NFS on UNIXi keskkonna standardne failijaotusprotokoll.\n"
+"See programm täidab NFS failide lukustamise funktsioone.\n"
+"Vajalik serveerimisel."
 
-#: ../../network/drakfirewall.pm_.c:159
+#: ../../services.pm:1
 #, c-format
 msgid ""
-"Invalid port given: %s.\n"
-"The proper format is \"port/tcp\" or \"port/udp\", \n"
-"where port is between 1 and 65535."
+"NFS is a popular protocol for file sharing across TCP/IP networks.\n"
+"This service provides NFS server functionality, which is configured via the\n"
+"/etc/exports file."
 msgstr ""
-"Määrati vale port: %s\n"
-"Õige määrang on \"port/tcp\" või \"port/udp\", \n"
-"kus port on number 1 ja 65535 vahel."
+"NFS on UNIXi keskkonna standardne failijaotusprotokoll.\n"
+"See täidab NFS serveri funktsioone ja seadistatakse failis /etc/exports."
 
-#
-#: ../../network/drakfirewall.pm_.c:167
-msgid "Everything (no firewall)"
-msgstr "Kõik (tulemüür puudub)"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Activates/Deactivates all network interfaces configured to start\n"
+"at boot time."
+msgstr "Aktiveerib süsteemi alglaadimisel kõik vajalikud võrguliidesed."
 
-#: ../../network/drakfirewall.pm_.c:169
-msgid "Other ports"
-msgstr "Muud pordid"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
+"Manager/Windows), and NCP (NetWare) mount points."
+msgstr ""
+"Haagib ja lahutab kõiki võrgufailisüsteeme\n"
+"(nii NFS, SMB kui ka NCP)."
 
-#: ../../network/ethernet.pm_.c:37
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"Which dhcp client do you want to use?\n"
-"Default is dhcp-client"
+"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
+"names to IP addresses."
 msgstr ""
-"Millist DHCP klienti soovite kasutada?\n"
-"Vaikimisi on selleks 'dhcp-client'"
+"named (BIND) on kasutusel nimeserverites, mis teenindavad DNS hierarhiat, "
+"tõlkimaks nimesid IP-aadressideks."
 
-#: ../../network/ethernet.pm_.c:88
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"No ethernet network adapter has been detected on your system.\n"
-"I cannot set up this connection type."
+"Linux Virtual Server, used to build a high-performance and highly\n"
+"available server."
 msgstr ""
-"Ühtki võrgukaarti ei õnnestunud tuvastada\n"
-"Seega ei saa ka sellist ühendust seadistada."
+"Linuxi virtuaalserver, mis on mõeldud veatult töötavaks ja igati\n"
+"kättesaadavaks serveriks."
 
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:234
-msgid "Choose the network interface"
-msgstr "Valige võrguliides"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"lpd is the print daemon required for lpr to work properly. It is\n"
+"basically a server that arbitrates print jobs to printer(s)."
+msgstr ""
+"Lpd on trükideemon, ilma selleta ei ole võimalik trükkida.\n"
+"Põhimõtteliselt on see server, mis saadab töö printeri(te)le."
 
-#: ../../network/ethernet.pm_.c:93
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"Please choose which network adapter you want to use to connect to Internet"
+"Linuxconf will sometimes arrange to perform various tasks\n"
+"at boot-time to maintain the system configuration."
 msgstr ""
-"Palun valige, millist võrguliidest soovite internetiühenduse jaoks kasutada"
+"Linuxconf sooritab mõnikord alglaadimise ajal mitmesuguseid\n"
+"asju süsteemi seadistuse säilitamiseks."
 
-#: ../../network/ethernet.pm_.c:176
-msgid "no network card found"
-msgstr "võrgukaarti ei leitud"
+#: ../../services.pm:1
+#, c-format
+msgid "Automatic detection and configuration of hardware at boot."
+msgstr "Riistvara automaatne tuvastamine ja seadistamine alglaadimisel."
 
-#: ../../network/ethernet.pm_.c:200 ../../network/network.pm_.c:349
-msgid "Configuring network"
-msgstr "Võrguseadistused"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Automatic regeneration of kernel header in /boot for\n"
+"/usr/include/linux/{autoconf,version}.h"
+msgstr ""
+"Kerneli päise automaatne regenereerimine partitsioonil /boot\n"
+"/usr/include/linux/{autoconf,version}.h jaoks"
 
-#: ../../network/ethernet.pm_.c:201
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"Please enter your host name if you know it.\n"
-"Some DHCP servers require the hostname to work.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''."
+"This package loads the selected keyboard map as set in\n"
+"/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
+"You should leave this enabled for most machines."
 msgstr ""
-"Palun sisestage oma masina nimi.\n"
-"Seda nõuavad ka mõned DHCP serverid.\n"
-"Masina nimi peab olema esitatud täiskujul,\n"
-"nagu ``minumasin.minufirma.ee''."
+"See pakett laeb süsteemi käivitumisel klaviatuuripaigutuse vastavalt\n"
+"failis /etc/sysconfig/keyboard kirjeldatule. Vähe on juhtumeid, kus\n"
+"seda teenust vaja ei läheks."
 
-#: ../../network/ethernet.pm_.c:205 ../../network/network.pm_.c:354
-msgid "Host name"
-msgstr "Masinanimi"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Launch packet filtering for Linux kernel 2.2 series, to set\n"
+"up a firewall to protect your machine from network attacks."
+msgstr ""
+"Käivitab paketifiltri Linuxi kerneliseeriale 2.2 ning loob\n"
+"tulemüüri, mis kaitseb Teie masinat rünnakute eest Internetist."
 
-#: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:89 ../../network/netconnect.pm_.c:103
-#: ../../network/netconnect.pm_.c:156 ../../network/netconnect.pm_.c:171
-#: ../../network/netconnect.pm_.c:222 ../../network/netconnect.pm_.c:245
-#: ../../network/netconnect.pm_.c:253
-msgid "Network Configuration Wizard"
-msgstr "Võrguseadistuste nõustaja"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"The internet superserver daemon (commonly called inetd) starts a\n"
+"variety of other internet services as needed. It is responsible for "
+"starting\n"
+"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd "
+"disables\n"
+"all of the services it is responsible for."
+msgstr ""
+"Interneti \"superserver\" nimega inetd laseb käivituda mitmetel võrgu-\n"
+"teenustel, nagu telnet, ftp, rsh, rlogin jne. Inetdi keelamine keelab\n"
+"ka kõik teenused, mida see haldab."
 
-#: ../../network/isdn.pm_.c:22
-msgid "External ISDN modem"
-msgstr "Väline ISDN modem"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+msgstr ""
+"Apache on maailma juhtiv veebiserveri programm. Tõenäoliselt\n"
+"ka võimsaim."
 
-#: ../../network/isdn.pm_.c:22
-msgid "Internal ISDN card"
-msgstr "Sisemine ISDN kaart"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"HardDrake runs a hardware probe, and optionally configures\n"
+"new/changed hardware."
+msgstr ""
+"HardDrake kontrollib riistvara ja lisavõimalusena ka seadistab\n"
+"uue või muudetud riistvara."
 
-#: ../../network/isdn.pm_.c:22
-msgid "What kind is your ISDN connection?"
-msgstr "Millist ISDN ühendust kasutate?"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"GPM adds mouse support to text-based Linux applications such the\n"
+"Midnight Commander. It also allows mouse-based console cut-and-paste "
+"operations,\n"
+"and includes support for pop-up menus on the console."
+msgstr ""
+"GPM annab võimaluse kasutada hiirt ka tekstikonsoolil. Lisaks tavalisele\n"
+"lõikamisele/kleepimisele saab kasutada ka menüüsüsteeme."
 
-#: ../../network/isdn.pm_.c:45
+#: ../../services.pm:1
+#, c-format
 msgid ""
-"Which ISDN configuration do you prefer?\n"
-"\n"
-"* The Old configuration uses isdn4net. It contains powerful\n"
-"  tools, but is tricky to configure, and not standard.\n"
-"\n"
-"* The New configuration is easier to understand, more\n"
-"  standard, but with less tools.\n"
-"\n"
-"We recommand the light configuration.\n"
+"cron is a standard UNIX program that runs user-specified programs\n"
+"at periodic scheduled times. vixie cron adds a number of features to the "
+"basic\n"
+"UNIX cron, including better security and more powerful configuration options."
 msgstr ""
-"Millist ISDN seadistust eelistate?\n"
-"\n"
-"* Vana seadistus kasutab isdn4net-i. Sellel on võimsaid\n"
-"  vahendeid, kuid seadistamine on keerukas ja mittestandardne.\n"
-"\n"
-"* Uus seadistus on hõlpsamini mõistetav, vastab paremini\n"
-"  standarditele, kuid pakub vähem tööriistu.\n"
-"\n"
-"Meie soovitus on kasutada light-seadistust.\n"
+"Cron on UNIXi süsteemide standardvahend kasutaja programmide perioodiliseks\n"
+"käivitamiseks. Vixie cron sisaldab lisaks veel turvalisust ja kasutus-\n"
+"mugavust tõstvaid omadusi. Soovitatav süsteemile, mis töötab 24h."
 
-#
-#: ../../network/isdn.pm_.c:54
-msgid "New configuration (isdn-light)"
-msgstr "Uus seadistus (isdn-light)"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"Runs commands scheduled by the at command at the time specified when\n"
+"at was run, and runs batch commands when the load average is low enough."
+msgstr ""
+"Laseb käivitada ühekordseid käske etteantud ajal või ootab süsteemi\n"
+"koormuse laskumist käsu käivitamiseks piisavale tasemele."
 
-#
-#: ../../network/isdn.pm_.c:54
-msgid "Old configuration (isdn4net)"
-msgstr "Vana seadistus (isdn4net)"
+#: ../../services.pm:1
+#, c-format
+msgid ""
+"apmd is used for monitoring battery status and logging it via syslog.\n"
+"It can also be used for shutting down the machine when the battery is low."
+msgstr ""
+"Apmd on kasutusel põhiliselt sülearvutites akude täituvuse jälgimiseks.\n"
+"Samuti suudab see aku tühjenemisel süsteemi viisakalt seisata."
 
-#: ../../network/isdn.pm_.c:166 ../../network/isdn.pm_.c:184
-#: ../../network/isdn.pm_.c:196 ../../network/isdn.pm_.c:202
-#: ../../network/isdn.pm_.c:209 ../../network/isdn.pm_.c:219
-msgid "ISDN Configuration"
-msgstr "ISDN sätted"
+#: ../../services.pm:1
+#, c-format
+msgid "Anacron is a periodic command scheduler."
+msgstr ""
+"Anacron käivitab programme perioodiliselt analoogiliselt cron-ile.\n"
+"Kasutage seda juhul, kui Teie arvuti ei tööta 24h."
 
-#: ../../network/isdn.pm_.c:166
+#: ../../services.pm:1
+#, c-format
+msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
+msgstr "Helisüsteemi ALSA (Advanced Linux Sound Architecture) käivitamine"
+
+#: ../../standalone.pm:1
+#, c-format
+msgid "Installing packages..."
+msgstr "Pakettide paigaldamine..."
+
+#: ../../standalone.pm:1
+#, c-format
 msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
+"\n"
+"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
 msgstr ""
-"Valige oma teenusepakkuja.\n"
-"Kui see ei ole nimekirjas, valige Tundmatu."
+"\n"
+"Kasutamine: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version]"
 
-#: ../../network/isdn.pm_.c:179
-msgid "Europe protocol"
-msgstr "Euroopa protokoll"
+#: ../../standalone.pm:1
+#, c-format
+msgid ""
+" [everything]\n"
+"       XFdrake [--noauto] monitor\n"
+"       XFdrake resolution"
+msgstr ""
+" [kõik]\n"
+"       XFDrake [--noauto] monitor\n"
+"       XFDrake kuvatihedus"
 
-#: ../../network/isdn.pm_.c:179
-msgid "Europe protocol (EDSS1)"
-msgstr "Euroopa protokoll (EDSS1)"
+#: ../../standalone.pm:1
+#, c-format
+msgid ""
+"[--manual] [--device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] "
+"[--dynamic=dev]"
+msgstr ""
+"[--manual] [device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] [--"
+"dynamic=dev]"
 
-#: ../../network/isdn.pm_.c:181
-msgid "Protocol for the rest of the world"
-msgstr "Protokoll ülejäänud maailma tarbeks"
+#: ../../standalone.pm:1
+#, c-format
+msgid ""
+"[OPTION]...\n"
+"  --no-confirmation      don't ask first confirmation question in "
+"MandrakeUpdate mode\n"
+"  --no-verify-rpm        don't 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"
+"  -no-verify-rpm        pakettide signatuure ei kontrollita\n"
+"  --changelog-first      näitab kirjelduse aknas enne faililoendit "
+"muudatuste logi\n"
+"  -merge-all-rpmnew     proovib liita kõik leitud failid .rpmnew/.rpmsave"
+
+#: ../../standalone.pm:1
+#, c-format
+msgid " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
 
-#: ../../network/isdn.pm_.c:181
+#: ../../standalone.pm:1
+#, c-format
 msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
+"[OPTIONS]\n"
+"Network & Internet connection and monitoring application\n"
+"\n"
+"--defaultintf interface : show this interface by default\n"
+"--connect : connect to internet if not already connected\n"
+"--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."
 msgstr ""
-"Protokoll ülejäänud maailma tarbeks\n"
-"Ilma D-kanalita (liisitud liinid)"
+"[VÕTMED]\n"
+"Kohtvõrgu ja Interneti ühenduse ja jälgimise rakendus\n"
+"\n"
+"--defaultintf liides : näidab vaikimis antud liidest\n"
+"--connect : ühendab Internetiga, kui ei ole veel ühendust\n"
+"--disconnect : lahutab Internetist, kui on juba ühendus\n"
+"--force : koos võtmega (dis)connect : sunni ühendama/lahutama\n"
+"--status : vastuseks 1, kui on ühendatud, muul juhul 0 ja väljumine.\n"
+"--quiet : lülitab välja interaktiivsuse. Koos võtmega (dis)connect."
 
-#: ../../network/isdn.pm_.c:185
-msgid "Which protocol do you want to use?"
-msgstr "Millist protokolli soovite kasutada?"
+#: ../../standalone.pm:1
+#, c-format
+msgid "[--file=myfile] [--word=myword] [--explain=regexp] [--alert]"
+msgstr ""
+"[--file=minufail] [--word=minusõna] [--explain=regulaaravaldis] [--alert]"
 
-#: ../../network/isdn.pm_.c:196
+#: ../../standalone.pm:1
 #, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "Leiti \"%s\" liides, kas soovite seda kasutada?"
+msgid "[keyboard]"
+msgstr "[klaviatuur]"
 
-#: ../../network/isdn.pm_.c:203
-msgid "What kind of card do you have?"
-msgstr "Millist tüüpi kaart Teil on?"
+#: ../../standalone.pm:1
+#, c-format
+msgid ""
+"[OPTIONS]...\n"
+"Mandrake Terminal Server Configurator\n"
+"--enable         : enable MTS\n"
+"--disable        : disable MTS\n"
+"--start          : start MTS\n"
+"--stop           : stop MTS\n"
+"--adduser        : add an existing system user to MTS (requires username)\n"
+"--deluser        : delete an existing system user from MTS (requires "
+"username)\n"
+"--addclient      : add a client machine to MTS (requires MAC address, IP, "
+"nbi image name)\n"
+"--delclient      : delete a client machine from MTS (requires MAC address, "
+"IP, nbi image name)"
+msgstr ""
+"[VÕTMED]...\n"
+"Mandrake terminaliserveri seadistaja\n"
+"--enable         : lubab MTSi\n"
+"--disable        : keelab MTSi\n"
+"--start          : käivitab MTSi\n"
+"--stop           : peatab MTSi\n"
+"--adduser        : lisab olemasoleva kasutaja MTSile (nõutav on "
+"kasutajanimi)\n"
+"--deluser        : kustutab olemasoleva kasutaja MTSist (nõutav on "
+"kasutajanimi)\n"
+"--addclient      : lisab kliendimasina MTSile (nõutav on MAC-aadress, IP, "
+"nbi laadepildi nimi)\n"
+"--delclient      : kustutab kliendimasina MTSist (nõutav on MAC-aadress, IP, "
+"nbi laadepildi nimi)"
 
-#: ../../network/isdn.pm_.c:204
-msgid "I don't know"
-msgstr "Ei tea"
+#: ../../standalone.pm:1
+#, c-format
+msgid ""
+"Font Importation and monitoring "
+"application                                     \n"
+"--windows_import : import from all available windows partitions.\n"
+"--xls_fonts      : show all fonts that already exist from xls\n"
+"--strong         : strong verification of font.\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 ""
+"Fontide importimise ja jälgimise "
+"rakendus                                       \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        : paigaldada iga fondifail ja kataloog.\n"
+"--uninstall      : eemaldada iga font või fondikataloog.\n"
+"--replace        : asendada 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."
 
-#: ../../network/isdn.pm_.c:204
-msgid "ISA / PCMCIA"
-msgstr "ISA / PCMCIA"
+#: ../../standalone.pm:1
+#, c-format
+msgid ""
+"[OPTIONS] [PROGRAM_NAME]\n"
+"\n"
+"OPTIONS:\n"
+"  --help            - print this help message.\n"
+"  --report          - program should be one of mandrake tools\n"
+"  --incident        - program should be one of mandrake tools"
+msgstr ""
+"[VÕTMED] [RAKENDUSE_NIMI]\n"
+"\n"
+"VÕTMED:\n"
+"  --help            - näitab käesolevat abiteadet.\n"
+"  -report           - rakendus peab olema üks Mandrake tööriistadest\n"
+"  -incident         - rakendus peab olema üks Mandrake tööriistadest"
 
-#: ../../network/isdn.pm_.c:204
-msgid "PCI"
-msgstr "PCI"
+#: ../../standalone.pm:1
+#, c-format
+msgid ""
+"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
+"Backup and Restore application\n"
+"\n"
+"--default             : save default directories.\n"
+"--debug               : show all debug messages.\n"
+"--show-conf           : list of files or directories to backup.\n"
+"--config-info         : explain configuration file options (for non-X "
+"users).\n"
+"--daemon              : use daemon configuration. \n"
+"--help                : show this message.\n"
+"--version             : show version number.\n"
+msgstr ""
+"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
+"Varundamis- ja taastamisrakendus\n"
+"\n"
+"--default             : salvestab vaikekataloogid.\n"
+"--debug               : näitab kõiki silumisteateid.\n"
+"--show-conf           : varundatavate failide või kataloogide loend.\n"
+"--config-info         : selgitab seadetefaili võtmeid (X-i "
+"mittekasutajaile).\n"
+"--daemon              : kasutab deemoni sätteid.\n"
+"--help                : näitab käesolevat abiteadet.\n"
+"--version             : näitab versiooni nime.\n"
 
-#: ../../network/isdn.pm_.c:210
+#: ../../standalone.pm:1
+#, c-format
 msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2, or (at your option)\n"
+"any later version.\n"
 "\n"
-"If you have an ISA card, the values on the next screen should be right.\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"GNU General Public License for more details.\n"
 "\n"
-"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
-"card.\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
 msgstr ""
+"Käesolev rakendus on vaba tarkvara. Te võite seda edasi levitada\n"
+"ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu\n"
+"need on avaldanud Vaba Tarkvara Fond; kas Litsentsi versioon number 2\n"
+"või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
 "\n"
-"Kui Teil on ISA kaart, siis peaks järgmised väärtused olema õiged.\n"
+"Seda rakendust levitatakse lootuses, et see on kasulik, kuid\n"
+"ILMA IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE\n"
+"KVALITEEDI GARANTIITA või SOBIVUSELE TEATUD KINDLAKS\n"
+"EESMÄRGIKS. Üksikasjade suhtes vaadake GNU Üldist Avalikku Litsentsi.\n"
 "\n"
-"Kui Teil on PCMCIA kaart, peaksite Te ise teadma selle IRQ ning IO "
-"väärtusi.\n"
+"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos selle\n"
+"rakendusega; kui ei, siis võtke ühendust Vaba Tarkvara Fondiga aadressil:\n"
+"Free Software Foundation, 59 Temple Place - Suite 330, Boston,\n"
+"MA 02111-1307, USA.\n"
 
-#: ../../network/isdn.pm_.c:214
-msgid "Abort"
-msgstr "Loobu"
+#: ../../steps.pm:1
+#, c-format
+msgid "Exit install"
+msgstr "Välju programmist"
 
-#: ../../network/isdn.pm_.c:214
-msgid "Continue"
-msgstr "Jätka"
+#: ../../steps.pm:1
+#, c-format
+msgid "Install system updates"
+msgstr "Uuenduste paigaldus"
 
-#: ../../network/isdn.pm_.c:220
-msgid "Which is your ISDN card?"
-msgstr "Milline on Teie ISDN kaart?"
+#: ../../steps.pm:1
+#, c-format
+msgid "Configure services"
+msgstr "Teenuste sätted"
 
-#: ../../network/isdn.pm_.c:239
-msgid ""
-"I have detected an ISDN PCI card, but I don't know its type. Please select a "
-"PCI card on the next screen."
-msgstr ""
-"Leiti küll PCI ISDN kaart, kuid selle tüüp on tundmatu. Palun valige PCI "
-"kaart järgmisel sammul."
+#: ../../steps.pm:1
+#, c-format
+msgid "Configure X"
+msgstr "X-i seadistamine"
 
-#: ../../network/isdn.pm_.c:248
-msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "PCI ISDN kaarti ei leitud. Palun valige see järgmisel sammul."
+#: ../../steps.pm:1
+#, c-format
+msgid "Install bootloader"
+msgstr "Alglaaduri sätted"
 
-#: ../../network/modem.pm_.c:57
-msgid "Please choose which serial port your modem is connected to."
-msgstr "Millisesse jadaporti on Teie modem ühendatud?"
+#: ../../steps.pm:1
+#, c-format
+msgid "Configure networking"
+msgstr "Võrgusätted"
 
-#: ../../network/modem.pm_.c:67
-msgid "Dialup options"
-msgstr "DialUp parameetrid"
+#: ../../steps.pm:1
+#, c-format
+msgid "Add a user"
+msgstr "Tavakasutaja"
 
-#: ../../network/modem.pm_.c:68 ../../standalone/drakconnect_.c:619
-msgid "Connection name"
-msgstr "Ühenduse nimi"
+#: ../../steps.pm:1
+#, c-format
+msgid "Install system"
+msgstr "Süsteemi paigaldus"
 
-#: ../../network/modem.pm_.c:69 ../../standalone/drakconnect_.c:620
-msgid "Phone number"
-msgstr "Sissehelistamiskeskuse number"
+#: ../../steps.pm:1
+#, c-format
+msgid "Choose packages to install"
+msgstr "Pakettide valik"
 
-#: ../../network/modem.pm_.c:70 ../../standalone/drakconnect_.c:621
-msgid "Login ID"
-msgstr "Kasutajakonto"
+#: ../../steps.pm:1
+#, c-format
+msgid "Format partitions"
+msgstr "Vormindamine"
 
-#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
-msgid "CHAP"
-msgstr "CHAP"
+#: ../../steps.pm:1
+#, c-format
+msgid "Partitioning"
+msgstr "Kõvaketta jagamine"
 
-#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
-msgid "PAP"
-msgstr "PAP"
+#: ../../steps.pm:1
+#, c-format
+msgid "Choose your keyboard"
+msgstr "Klaviatuuri valik"
 
-#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
-msgid "Script-based"
-msgstr "Skriptipõhine"
+#: ../../steps.pm:1
+#, c-format
+msgid "Select installation class"
+msgstr "Valige paigaldusmeetod"
 
-#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
-msgid "Terminal-based"
-msgstr "Terminalipõhine"
+#: ../../steps.pm:1
+#, c-format
+msgid "Hard drive detection"
+msgstr "Kõvaketta leidmine"
 
-#: ../../network/modem.pm_.c:73 ../../standalone/drakconnect_.c:624
-msgid "Domain name"
-msgstr "Domeeninimi"
+#: ../../steps.pm:1
+#, c-format
+msgid "Configure mouse"
+msgstr "Hiire seadmine"
 
-#: ../../network/modem.pm_.c:74 ../../standalone/drakconnect_.c:625
-msgid "First DNS Server (optional)"
-msgstr "Esimene nimeserver (soovituslik)"
+#: ../../steps.pm:1
+#, c-format
+msgid "License"
+msgstr "Litsents"
 
-#: ../../network/modem.pm_.c:75 ../../standalone/drakconnect_.c:626
-msgid "Second DNS Server (optional)"
-msgstr "Teine nimeserver (soovituslik)"
+#: ../../steps.pm:1
+#, c-format
+msgid "Choose your language"
+msgstr "Valige sobiv keel"
+
+#: ../../ugtk2.pm:1
+#, c-format
+msgid "utopia 25"
+msgstr "utopia 25"
+
+#: ../../ugtk2.pm:1 ../../ugtk.pm:1 ../../standalone/logdrake:1
+#, c-format
+msgid "logdrake"
+msgstr "logdrake"
+
+#: ../../ugtk.pm:1
+#, c-format
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Xpmac (installation display driver)"
+msgstr "Xpmac (paigalduse kuvadraiver)"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid ""
+"Your card can have 3D hardware acceleration support with XFree %s,\n"
+"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER."
+msgstr ""
+"Teie videokaardi 3D graafikakiirendit saab kasutada koos XFree %s-ga.\n"
+"SEE ON AGA EKSPERIMENTAALNE JA VÕIB OLLA EBASTABIILNE."
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
+msgstr "XFree %s koos EKSPERIMENTAALSE 3D kiirendi toega"
 
-#: ../../network/modem.pm_.c:95
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Your card can have 3D hardware acceleration support with XFree %s."
+msgstr "Teie kaardi 3D graafikakiirendit toetab XFree %s."
+
+#: ../../Xconfig/card.pm:1 ../../Xconfig/various.pm:1
+#, c-format
+msgid "XFree %s with 3D hardware acceleration"
+msgstr "XFree %s koos 3D graafikakiirendi toega"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
 msgid ""
-"Your modem isn't supported by the system.\n"
-"Take a look at http://www.linmodems.org"
+"Your card can have 3D hardware acceleration support but only with XFree %s,\n"
+"NOTE THIS IS EXPERIMENTAL SUPPORT AND MAY FREEZE YOUR COMPUTER.\n"
+"Your card is supported by XFree %s which may have a better support in 2D."
 msgstr ""
-"Teie modem ei ole toetatud.\n"
-"Ehk saate abi aadressilt http://www.linmodems.org"
+"Teie videokaardi 3D graafikakiirendit saab kasutada vaid koos XFree %s-ga.\n"
+"SEE ON AGA EKSPERIMENTAALNE JA VÕIB OLLA EBASTABIILNE.\n"
+"Teie kaarti toetab ka XFree %s, millel on ehk parem 2D tugi."
 
-#: ../../network/modem.pm_.c:97
+#: ../../Xconfig/card.pm:1
 #, c-format
 msgid ""
-"\"%s\" based winmodem detected, do you want to install needed software ?"
+"Your card can have 3D hardware acceleration support but only with XFree %s.\n"
+"Your card is supported by XFree %s which may have a better support in 2D."
 msgstr ""
-"Leiti \"%s\" kiibil põhinev \"winmodem\". Kas paigaldada vajalik tarkvara?"
+"Teie videokaardi 3D graafikakiirendit saab kasutada vaid koos XFree %s-ga.\n"
+"XFree %s toetab Teie videokaarti ja võib omada paremat 2D tuge."
 
-#: ../../network/modem.pm_.c:97
-msgid "Do nothing"
-msgstr "Ära tee midagi"
+#: ../../Xconfig/card.pm:1 ../../Xconfig/various.pm:1
+#, c-format
+msgid "XFree %s"
+msgstr "XFree %s"
 
-#: ../../network/modem.pm_.c:97
-msgid "Install rpm"
-msgstr "Paigalda RPM"
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Configure only card \"%s\"%s"
+msgstr "Seadista ainult kaart \"%s\"%s"
 
-#: ../../network/modem.pm_.c:97
-msgid "Title"
-msgstr "Tiitel"
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Use Xinerama extension"
+msgstr "Kasuta Xinerama laiendusi"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Configure all heads independently"
+msgstr "Seadista kõik monitorid sõltumatult"
 
-#: ../../network/netconnect.pm_.c:29
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Which configuration of XFree do you want to have?"
+msgstr "Millist XFree seadistust soovite kasutada?"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "XFree configuration"
+msgstr "XFree sätted"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Select the memory size of your graphics card"
+msgstr "Valige graafikamälu suurus"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
 msgid ""
-"\n"
-"You can disconnect or reconfigure your connection."
+"Your system supports multiple head configuration.\n"
+"What do you want to do?"
 msgstr ""
-"\n"
-"Saate ühenduse katkestada või uuesti seadistada."
+"Süsteemis on võimalik kasutada mitut monitori.\n"
+"Mida Te soovite teha?"
+
+#
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Multi-head configuration"
+msgstr "Mitme monitori seadistamine"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "Choose an X server"
+msgstr "Valige X server"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "X server"
+msgstr "X server"
 
-#: ../../network/netconnect.pm_.c:29 ../../network/netconnect.pm_.c:32
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "64 MB or more"
+msgstr "64 MB või rohkem"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "32 MB"
+msgstr "32 MB"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "16 MB"
+msgstr "16 MB"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "8 MB"
+msgstr "8 MB"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "4 MB"
+msgstr "4 MB"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "2 MB"
+msgstr "2 MB"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "1 MB"
+msgstr "1 MB"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "512 kB"
+msgstr "512 kB"
+
+#: ../../Xconfig/card.pm:1
+#, c-format
+msgid "256 kB"
+msgstr "256 kB"
+
+#: ../../Xconfig/main.pm:1
+#, c-format
 msgid ""
+"Keep the changes?\n"
+"The current configuration is:\n"
 "\n"
-"You can reconfigure your connection."
+"%s"
 msgstr ""
+"Kas säilitada muudatused?\n"
+"Olemasolevad sätted:\n"
 "\n"
-"Saate seadistada ühenduse uuesti."
+"%s"
+
+#: ../../Xconfig/main.pm:1 ../../diskdrake/dav.pm:1
+#: ../../diskdrake/interactive.pm:1 ../../diskdrake/removable.pm:1
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Options"
+msgstr "Eelistused"
+
+#: ../../Xconfig/main.pm:1
+#, c-format
+msgid "Test"
+msgstr "Test"
+
+#: ../../Xconfig/main.pm:1 ../../Xconfig/resolution_and_depth.pm:1
+#, c-format
+msgid "Resolution"
+msgstr "Kuvatihedus"
+
+#: ../../Xconfig/main.pm:1 ../../Xconfig/monitor.pm:1
+#, c-format
+msgid "Monitor"
+msgstr "Monitor"
 
-#: ../../network/netconnect.pm_.c:29
-msgid "You are currently connected to internet."
-msgstr "Hetkel olete Internetiga ühendatud."
+#: ../../Xconfig/main.pm:1
+#, c-format
+msgid "Graphic Card"
+msgstr "Graafikakaart"
 
-#: ../../network/netconnect.pm_.c:32
+#: ../../Xconfig/main.pm:1 ../../diskdrake/dav.pm:1
+#: ../../printer/printerdrake.pm:1 ../../standalone/drakperm:1
+#: ../../standalone/draksplash:1 ../../standalone/harddrake2:1
+#: ../../standalone/logdrake:1 ../../standalone/scannerdrake:1
+#, c-format
+msgid "Quit"
+msgstr "Välju"
+
+#: ../../Xconfig/monitor.pm:1
+#, c-format
+msgid "Vertical refresh rate"
+msgstr "Ekraaniuuendussagedus"
+
+#: ../../Xconfig/monitor.pm:1
+#, c-format
+msgid "Horizontal refresh rate"
+msgstr "Realaotussagedus"
+
+#: ../../Xconfig/monitor.pm:1
+#, c-format
 msgid ""
+"The two critical parameters are the vertical refresh rate, which is the "
+"rate\n"
+"at which the whole screen is refreshed, and most importantly the horizontal\n"
+"sync rate, which is the rate at which scanlines are displayed.\n"
 "\n"
-"You can connect to Internet or reconfigure your connection."
+"It is VERY IMPORTANT that you do not specify a monitor type with a sync "
+"range\n"
+"that is beyond the capabilities of your monitor: you may damage your "
+"monitor.\n"
+" If in doubt, choose a conservative setting."
 msgstr ""
+"Kaks kriitilist suurust on ekraanisagedus, mis määrab kogu kuva\n"
+"uuendamise aja, ja realaotussagedus\n"
 "\n"
-"Saate ühenduda Internetti või seadistada ühendus uuesti."
+"On VÄGA TÄHTIS, et Te ei määraks siinkohal monitori, mille realaotus on\n"
+"suurem, kui Teie monitor võimaldab. Vastasel juhul võib Teie monitor "
+"hävida.\n"
+"Kui kahtlete, valige pigem väiksem väärtus."
 
-#: ../../network/netconnect.pm_.c:32
-msgid "You are not currently connected to Internet."
-msgstr "Hetkel ei ole Te Internetti ühendatud."
+#: ../../Xconfig/monitor.pm:1
+#, 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"
 
-#: ../../network/netconnect.pm_.c:36
-msgid "Connect"
-msgstr "Ühenda"
+#: ../../Xconfig/monitor.pm:1 ../../standalone/harddrake2:1
+#, c-format
+msgid "Vendor"
+msgstr "Tootja"
 
-#: ../../network/netconnect.pm_.c:37
-msgid "Disconnect"
-msgstr "Katkesta ühendus"
+#: ../../Xconfig/monitor.pm:1
+#, c-format
+msgid "Plug'n Play"
+msgstr "Plug'n Play"
 
-#: ../../network/netconnect.pm_.c:38
-msgid "Configure the connection"
-msgstr "Ühenduse seadistamine"
+#: ../../Xconfig/monitor.pm:1
+#, c-format
+msgid "Choose a monitor"
+msgstr "Valige monitor"
 
-#: ../../network/netconnect.pm_.c:41
-msgid "Internet connection & configuration"
-msgstr "Internetiühenduse seadistamine"
+#: ../../Xconfig/resolution_and_depth.pm:1
+#, c-format
+msgid "Graphics card: %s"
+msgstr "Graafikakaart: %s"
 
-#: ../../network/netconnect.pm_.c:94
+#: ../../Xconfig/resolution_and_depth.pm:1
 #, c-format
-msgid "We are now going to configure the %s connection."
-msgstr "Nüüd on aeg seadistada %s ühendus."
+msgid "Choose the resolution and the color depth"
+msgstr "Valige kuvatihedus ja värvisügavus"
 
-#: ../../network/netconnect.pm_.c:103
+#: ../../Xconfig/resolution_and_depth.pm:1
+#, c-format
+msgid "Resolutions"
+msgstr "Kuvatihedused"
+
+#: ../../Xconfig/resolution_and_depth.pm:1
+#, c-format
+msgid "4 billion colors (32 bits)"
+msgstr "4 miljardit värvi (32 bitti)"
+
+#: ../../Xconfig/resolution_and_depth.pm:1
+#, c-format
+msgid "16 million colors (24 bits)"
+msgstr "16 miljonit värvi (24 bitti)"
+
+#: ../../Xconfig/resolution_and_depth.pm:1
+#, c-format
+msgid "65 thousand colors (16 bits)"
+msgstr "65 tuhat värvi (16 bitti)"
+
+#: ../../Xconfig/resolution_and_depth.pm:1
+#, c-format
+msgid "32 thousand colors (15 bits)"
+msgstr "32 tuhat värvi (15 bitti)"
+
+#: ../../Xconfig/resolution_and_depth.pm:1
+#, c-format
+msgid "256 colors (8 bits)"
+msgstr "256 värvi (8 bitti)"
+
+#: ../../Xconfig/test.pm:1
+#, c-format
+msgid "Is this the correct setting?"
+msgstr "Kas see on sobiv?"
+
+#: ../../Xconfig/test.pm:1
+#, c-format
+msgid "Leaving in %d seconds"
+msgstr "Lõpuni %d sekundit"
+
+#: ../../Xconfig/test.pm:1
 #, c-format
 msgid ""
-"\n"
-"\n"
-"\n"
-"We are now going to configure the %s connection.\n"
-"\n"
-"\n"
-"Press OK to continue."
+"An error occurred:\n"
+"%s\n"
+"Try to change some parameters"
 msgstr ""
+"Juhtus viga:\n"
+"%s\n"
+"Proovige mõnda parameetrit muuta"
+
+#: ../../Xconfig/test.pm:1
+#, c-format
+msgid "Warning: testing this graphic card may freeze your computer"
+msgstr "Hoiatus: selle graafikakaardi test võib Teie arvuti peatada"
+
+#: ../../Xconfig/test.pm:1
+#, c-format
+msgid "Do you want to test the configuration?"
+msgstr "Kas soovite seadistusi proovida?"
+
+#: ../../Xconfig/test.pm:1
+#, c-format
+msgid "Test of the configuration"
+msgstr "Proovime seadistusi"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "What norm is your TV using?"
+msgstr "Millist TV-standardit Te kasutate?"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid ""
+"Your graphic card seems to have a TV-OUT connector.\n"
+"It can be configured to work using frame-buffer.\n"
 "\n"
+"For this you have to plug your graphic card to your TV before booting your "
+"computer.\n"
+"Then choose the \"TVout\" entry in the bootloader\n"
 "\n"
+"Do you have this feature?"
+msgstr ""
+"Paistab, et Teie videokaardil on TV OUT väljund.\n"
+"Seda on võimalik kasutada järgnevalt:\n"
 "\n"
-"Nüüd on aeg seadistada %s ühendus.\n"
-"\n"
+"Ühendage arvuti televiisoriga enne alglaadimist ja valige laademenüüst\n"
+" \"TVout\" \n"
 "\n"
-"Vajutage jätkamiseks Olgu."
-
-#: ../../network/netconnect.pm_.c:132 ../../network/netconnect.pm_.c:272
-#: ../../network/netconnect.pm_.c:292 ../../network/tools.pm_.c:77
-msgid "Network Configuration"
-msgstr "Võrgu sätted"
+"Kas soovite seda kasutama hakata?"
 
-#: ../../network/netconnect.pm_.c:133
+#: ../../Xconfig/various.pm:1
+#, c-format
 msgid ""
-"Because you are doing a network installation, your network is already "
-"configured.\n"
-"Click on Ok to keep your configuration, or cancel to reconfigure your "
-"Internet & Network connection.\n"
+"I can setup your computer to automatically start the graphical interface "
+"(XFree) upon booting.\n"
+"Would you like XFree to start when you reboot?"
 msgstr ""
-"Võrguühendus on juba seadistatud, sest installitakse ju võrgust.\n"
-"Kui soovite neid seadistusi säilitada, valige Olgu, muidu katkestage ja "
-"saate seadistada uuesti.\n"
+"Teie arvutis on võimalik käivitada X juba alglaadimisel.\n"
+"Kas soovite nii teha?"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Graphical interface at startup"
+msgstr "X käivitub koos süsteemiga"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "XFree86 driver: %s\n"
+msgstr "XFree86 juhtprogramm: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "XFree86 server: %s\n"
+msgstr "XFree86 server: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Resolution: %s\n"
+msgstr "Kuvatihedus: %s\n"
 
-#: ../../network/netconnect.pm_.c:157
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Color depth: %s\n"
+msgstr "Värvisügavus: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Graphics memory: %s kB\n"
+msgstr "Videomälu: %s kB\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Graphics card: %s\n"
+msgstr "Graafikakaart: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Monitor VertRefresh: %s\n"
+msgstr "Ekraaniuuendussagedus: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Monitor HorizSync: %s\n"
+msgstr "Realaotussagedus: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Monitor: %s\n"
+msgstr "Monitor: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Mouse device: %s\n"
+msgstr "Hiire port: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Mouse type: %s\n"
+msgstr "Hiire tüüp: %s\n"
+
+#: ../../Xconfig/various.pm:1
+#, c-format
+msgid "Keyboard layout: %s\n"
+msgstr "Klaviatuuriasetus: %s\n"
+
+#: ../../diskdrake/dav.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Options: %s"
+msgstr "Eelistused: %s"
+
+#: ../../diskdrake/dav.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Mount point: "
+msgstr "Haakepunkt:"
+
+#: ../../diskdrake/dav.pm:1
+#, c-format
+msgid "Server: "
+msgstr "Server: "
+
+#: ../../diskdrake/dav.pm:1
+#, c-format
+msgid "The URL must begin with http:// or https://"
+msgstr "URL peab algama kas http:// või https://"
+
+#: ../../diskdrake/dav.pm:1
+#, c-format
+msgid "Please enter the WebDAV server URL"
+msgstr "Palun sisestage WebDAV-serveri URL"
+
+#: ../../diskdrake/dav.pm:1 ../../diskdrake/interactive.pm:1
+#: ../../diskdrake/removable.pm:1 ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Mount point"
+msgstr "Haakepunkt"
+
+#: ../../diskdrake/dav.pm:1
+#, c-format
+msgid "Server"
+msgstr "Server"
+
+#: ../../diskdrake/dav.pm:1 ../../diskdrake/interactive.pm:1
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Mount"
+msgstr "Haagi"
+
+#: ../../diskdrake/dav.pm:1 ../../diskdrake/interactive.pm:1
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Unmount"
+msgstr "Lahuta"
+
+#: ../../diskdrake/dav.pm:1
+#, c-format
+msgid "New"
+msgstr "Uus"
+
+#: ../../diskdrake/dav.pm:1
+#, c-format
 msgid ""
-"Welcome to The Network Configuration Wizard.\n"
-"\n"
-"We are about to configure your internet/network connection.\n"
-"If you don't want to use the auto detection, deselect the checkbox.\n"
+"WebDAV is a protocol that allows you to mount a web server's directory\n"
+"locally, and treat it like a local filesystem (provided the web server is\n"
+"configured as a WebDAV server). If you would like to add WebDAV mount\n"
+"points, select \"New\"."
 msgstr ""
-"Internetiühenduse Nõustaja\n"
-"\n"
-"Nüüd hakkame internetiühendust seadistama.\n"
-"Kui Te ei soovi automaatset tuvastamist, siis jätke see märkimata.\n"
+"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 WebDAVi serverina). Kui soovite lisada\n"
+"WebDAVi haakepunkte, vajutage nupule \"Uus\"."
 
-#: ../../network/netconnect.pm_.c:163
-msgid "Choose the profile to configure"
-msgstr "Valige profiil, mida seadistada"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Use ``%s'' instead"
+msgstr "Kasutage pigem ``%s''"
 
-#: ../../network/netconnect.pm_.c:164
-msgid "Use auto detection"
-msgstr "Kasuta automaattuvastust"
+#: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
+#: ../../diskdrake/removable.pm:1 ../../standalone/harddrake2:1
+#, c-format
+msgid "Type"
+msgstr "Tüüp"
 
-#: ../../network/netconnect.pm_.c:165 ../../printer/printerdrake.pm_.c:2966
-#: ../../standalone/drakconnect_.c:271 ../../standalone/drakconnect_.c:274
-#: ../../standalone/drakfloppy_.c:118
-msgid "Expert Mode"
-msgstr "Ekspertresiim"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Use ``Unmount'' first"
+msgstr "Kasutage enne \"Lahuta\""
 
-#: ../../network/netconnect.pm_.c:171 ../../printer/printerdrake.pm_.c:364
-msgid "Detecting devices..."
-msgstr "Otsin seadmeid..."
+#: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Delete"
+msgstr "Kustuta"
 
-#: ../../network/netconnect.pm_.c:214
-msgid "Normal modem connection"
-msgstr "Tavaline modemiühendus"
+#: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Create"
+msgstr "Tekita"
 
-#: ../../network/netconnect.pm_.c:214
+#: ../../diskdrake/hd_gtk.pm:1
 #, c-format
-msgid "detected on port %s"
-msgstr "leiti pordis %s"
+msgid "Filesystem types:"
+msgstr "Failisüsteemi tüübid: "
 
-#: ../../network/netconnect.pm_.c:215
-msgid "Winmodem connection"
-msgstr "Ühendus \"Winmodemiga\""
+#: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Empty"
+msgstr "Tühi"
 
-#: ../../network/netconnect.pm_.c:215 ../../network/netconnect.pm_.c:217
-msgid "detected"
-msgstr "tuvastati"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Windows"
+msgstr "Windows"
 
-#: ../../network/netconnect.pm_.c:216
-msgid "ISDN connection"
-msgstr "ISDN ühendus"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "HFS"
+msgstr "HFS"
 
-#: ../../network/netconnect.pm_.c:216
+#: ../../diskdrake/hd_gtk.pm:1
 #, c-format
-msgid "detected %s"
-msgstr "tuvastati %s"
+msgid "SunOS"
+msgstr "SunOS"
 
-#: ../../network/netconnect.pm_.c:217
-msgid "ADSL connection"
-msgstr "ADSL ühendus"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Swap"
+msgstr "Saaleala"
 
-#: ../../network/netconnect.pm_.c:218
-msgid "Cable connection"
-msgstr "Kaabliühendus"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Journalised FS"
+msgstr "Kirjendatud FS"
 
-#: ../../network/netconnect.pm_.c:218
-msgid "cable connection detected"
-msgstr "leiti kaabliühendus"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Ext2"
+msgstr "Ext2"
 
-#: ../../network/netconnect.pm_.c:219
-msgid "LAN connection"
-msgstr "LAN ühendus"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "No hard drives found"
+msgstr "Kõvakettaid ei leitud"
 
-#: ../../network/netconnect.pm_.c:219
-msgid "ethernet card(s) detected"
-msgstr "võrgukaart(i) leiti üles"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Please click on a partition"
+msgstr "Palun valige partitsioon"
 
-#: ../../network/netconnect.pm_.c:222
-msgid "Choose the connection you want to configure"
-msgstr "Valige ühendus, mida seadistada"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid ""
+"You have one big MicroSoft Windows partition.\n"
+"I suggest you first resize that partition\n"
+"(click on it, then click on \"Resize\")"
+msgstr ""
+"Teil on üks suur FAT partitsioon\n"
+"(tavaliselt kasutab sellist MS DOS/Windows)\n"
+"Soovitame Teil esmalt selle suurust muuta\n"
+"(klõpsake ja siis valige \"Muuda\")"
 
-#: ../../network/netconnect.pm_.c:246
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Choose action"
+msgstr "Valige tegevus"
+
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Wizard"
+msgstr "Nõustaja"
+
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
 msgid ""
-"You have configured multiple ways to connect to the Internet.\n"
-"Choose the one you want to use.\n"
-"\n"
+"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"enough)\n"
+"at the beginning of the disk"
 msgstr ""
-"Olete seadistanud mitu võimalust Internetiga ühendumiseks.\n"
-"Valige palun see, mida soovite kasutada.\n"
-"\n"
+"Kui soovite kasutada aboot-i, jätke palun ketta algusesse vähemalt 2048 \n"
+"sektorit vaba ruumi"
 
-#: ../../network/netconnect.pm_.c:247
-msgid "Internet connection"
-msgstr "Internetiühendus"
+#: ../../diskdrake/hd_gtk.pm:1
+#, c-format
+msgid "Please make a backup of your data first"
+msgstr "Palun tehke oma andmetest kõigepealt varukoopia"
 
-#: ../../network/netconnect.pm_.c:253
-msgid "Do you want to start the connection at boot?"
-msgstr "Kas soovite luua ühenduse juba alglaadimisel?"
+#: ../../diskdrake/hd_gtk.pm:1 ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Read carefully!"
+msgstr "Lugege hoolega!"
 
-#: ../../network/netconnect.pm_.c:267
-msgid "Network configuration"
-msgstr "Võrgusätted"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Encryption key (again)"
+msgstr "Krüptovõti (uuesti)"
 
-#: ../../network/netconnect.pm_.c:268
-msgid "The network needs to be restarted"
-msgstr "Võrk tuleb uuesti käivitada"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Encryption key"
+msgstr "Krüptovõti"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "The encryption keys do not match"
+msgstr "Krüptovõtmed ei klapi"
+
+#: ../../diskdrake/interactive.pm:1
+#, 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:1
+#, c-format
+msgid "Choose your filesystem encryption key"
+msgstr "Valige failisüsteemi krüptovõti"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Filesystem encryption key"
+msgstr "Failisüsteemi krüptovõti"
 
-#: ../../network/netconnect.pm_.c:272
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Type: "
+msgstr "Tüüp: "
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "on channel %d id %d\n"
+msgstr "kanalil %d id %d\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Partition table type: %s\n"
+msgstr "Partitsioonitabeli tüüp: %s\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "LVM-disks %s\n"
+msgstr "LVM-kettad %s\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Info: "
+msgstr "Info: "
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
+msgstr "Geomeetria: %s silindrit, %s pead, %s sektorit\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Size: %s\n"
+msgstr "Suurus: %s\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Read-only"
+msgstr "Ainult lugemisõigusega"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Device: "
+msgstr "Seade: "
+
+#: ../../diskdrake/interactive.pm:1
 #, c-format
 msgid ""
-"A problem occured while restarting the network: \n"
 "\n"
-"%s"
+"This special Bootstrap\n"
+"partition is for\n"
+"dual-booting your system.\n"
 msgstr ""
-"Võrgu taaskäivitusel juhtus viga: \n"
 "\n"
-"%s"
+"See on eriline, alglaadimisel\n"
+"kasutatav partitsioon, mis\n"
+"võimaldab mitme operatsioonisüsteemi\n"
+"laadimist.\n"
 
-#: ../../network/netconnect.pm_.c:282
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"The configuration will now be applied to your system.\n"
 "\n"
+"Chances are, this partition is\n"
+"a Driver partition. You should\n"
+"probably leave it alone.\n"
 msgstr ""
-"Õnnitleme, võrk ja internetiühendus on seadistatud.\n"
-"Sätted salvestatakse nüüd.\n"
 "\n"
+"Võimalik, et on tegemist\n"
+"juhtpartitsiooniga, parem oleks\n"
+"seda mitte puutuda.\n"
 
-#: ../../network/netconnect.pm_.c:286
-msgid ""
-"After this is done, we recommend that you restart your X environment to "
-"avoid any hostname-related problems."
-msgstr ""
-"Soovitame taaskäivitada ka X keskkonna, et vältida võimalikke\n"
-"masinanime muutmisest tingitud probleeme."
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Loopback file name: %s"
+msgstr "Loopback faili nimi: %s"
 
-#: ../../network/netconnect.pm_.c:287
-msgid ""
-"Problems occured during configuration.\n"
-"Test your connection via net_monitor or mcc. If your connection doesn't "
-"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."
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "RAID-disks %s\n"
+msgstr "RAID-kettad %s\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Chunk size %s\n"
+msgstr "Ühiku suurus %s\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Level %s\n"
+msgstr "Tase %s\n"
 
-#: ../../network/network.pm_.c:278
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"WARNING: this device has been previously configured to connect to the "
-"Internet.\n"
-"Simply accept to keep this device configured.\n"
-"Modifying the fields below will override this configuration."
+"Partition booted by default\n"
+"    (for MS-DOS boot, not for lilo)\n"
 msgstr ""
-"HOIATUS: See seade on juba seadistatud Interneti jaoks.\n"
-"Valige lihtsalt Olgu, et sätteid mitte muuta.\n"
-"All toodud väljade muutmine tühistab varasemad sätted."
+"Partitsioonilt toimub alglaadimine\n"
+"    (MS-DOS-i, mitte lilo jaoks)\n"
 
-#: ../../network/network.pm_.c:283
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"Please enter the IP configuration for this machine.\n"
-"Each item should be entered as an IP address in dotted-decimal\n"
-"notation (for example, 1.2.3.4)."
+"Loopback file(s):\n"
+"   %s\n"
 msgstr ""
-"Palun andke IP parameetrid selle masina jaoks.\n"
-"Kõik read tuleb sisestada IP-aadressi kujul\n"
-"(näiteks 12.34.56.78)"
+"Loopback fail(id):\n"
+"   %s\n"
 
-#: ../../network/network.pm_.c:293 ../../network/network.pm_.c:294
+#: ../../diskdrake/interactive.pm:1
 #, c-format
-msgid "Configuring network device %s"
-msgstr "Seadistame võrgukaardi %s"
+msgid "RAID md%s\n"
+msgstr "RAID md%s\n"
 
-#: ../../network/network.pm_.c:294
+#: ../../diskdrake/interactive.pm:1
 #, c-format
-msgid " (driver %s)"
-msgstr " (draiver %s)"
+msgid "Mounted\n"
+msgstr "Haagitud\n"
 
-#: ../../network/network.pm_.c:296 ../../standalone/drakconnect_.c:228
-#: ../../standalone/drakconnect_.c:464
-msgid "IP address"
-msgstr "IP aadress"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Not formatted\n"
+msgstr "Vormindamata\n"
 
-#: ../../network/network.pm_.c:297 ../../standalone/drakconnect_.c:465
-#: ../../standalone/drakgw_.c:291
-msgid "Netmask"
-msgstr "Võrgumask"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Formatted\n"
+msgstr "Vormindatud\n"
 
-#: ../../network/network.pm_.c:298
-msgid "(bootp/dhcp)"
-msgstr "(bootp/dhcp)"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Cylinder %d to %d\n"
+msgstr "Silindrid %d kuni %d\n"
 
-#: ../../network/network.pm_.c:298
-msgid "Automatic IP"
-msgstr "Automaatne IP"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid ", %s sectors"
+msgstr ", %s sektorit"
 
-#: ../../network/network.pm_.c:299
-msgid "Start at boot"
-msgstr "Käivitub alglaadimisel"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Size: %s"
+msgstr "Suurus: %s"
 
-#: ../../network/network.pm_.c:320 ../../printer/printerdrake.pm_.c:812
-msgid "IP address should be in format 1.2.3.4"
-msgstr "IP aadress peab olema kujul 1.2.3.4"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Start: sector %s\n"
+msgstr "Algus: sektor %s\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Name: "
+msgstr "Nimi: "
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "DOS drive letter: %s (just a guess)\n"
+msgstr "DOS kettatähis: %s (arvatavasti)\n"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "partition %s is now known as %s"
+msgstr "partitsioon %s kannab nüüd nime %s"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Removing %s"
+msgstr "%s eemaldamine"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Copying %s"
+msgstr "%s kopeerimine"
 
-#: ../../network/network.pm_.c:326
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Moving files to the new partition"
+msgstr "Failide liigutamine uuele partitsioonile"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
-"frequency), or add enough '0'."
+"Directory %s already contains data\n"
+"(%s)"
 msgstr ""
-"Sagedus peab sisaldama suffiksit k, M või G (näiteks \"2.46G\" - 2,46 GHz "
-"sagedusel), või lisage piisavalt nulle."
+"Kataloogis %s on juba andmed\n"
+"(%s)"
 
-#: ../../network/network.pm_.c:330
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Hide files"
+msgstr "Failide peitmine"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Move files to the new partition"
+msgstr "Liiguta failid uuele partitsioonile"
+
+#: ../../diskdrake/interactive.pm:1
+#, 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:1
+#, c-format
+msgid "You'll need to reboot before the modification can take place"
+msgstr "Muudatuste rakendamiseks vajate alglaadimist"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Partition table of drive %s is going to be written to disk!"
+msgstr "Ketta %s partitsioonitabel salvestatakse!"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
-"enough '0'."
+"You've selected a software RAID partition as root (/).\n"
+"No bootloader is able to handle this without a /boot partition.\n"
+"Please be sure to add a /boot partition"
 msgstr ""
-"Kiirus peab sisaldama suffiksit k, M või G (näiteks \"11M\"), või lisage "
-"piisavalt nulle."
+"Olete valinud juurpartitsiooniks (/) tarkvaralise RAID-i.\n"
+"Ilma /boot partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
+"Lisage kindlasti /boot partitsioon!"
 
-#: ../../network/network.pm_.c:350
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"Please enter your host name.\n"
-"Your host name should be a fully-qualified host name,\n"
-"such as ``mybox.mylab.myco.com''.\n"
-"You may also enter the IP address of the gateway if you have one"
+"The partition you've selected to add as root (/) is physically located "
+"beyond\n"
+"the 1024th cylinder of the hard drive, and you have no /boot partition.\n"
+"If you plan to use the LILO boot manager, be careful to add a /boot partition"
 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"
+"Partitsioon, mida soovite kasutada juurkataloogi (/) hoidmiseks, asub\n"
+"füüsiliselt tagapool silindrit 1024 ja Teil ei ole /boot partitsiooni.\n"
+"Kui plaanite kasutada LILO alglaadurit, lisage kindlasti /boot partitsioon"
 
-#: ../../network/network.pm_.c:355
-msgid "DNS server"
-msgstr "Nimeserver"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid ""
+"Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
+"1024).\n"
+"Either you use LILO and it won't work, or you don't use LILO and you don't "
+"need /boot"
+msgstr ""
+"Vabandust, aga ei saa nõustuda /boot kataloogi paigutamisega kaugemale "
+"silindrist 1024.\n"
+"Kui kasutate LiLo-t, ei tööta see sel moel, kui aga ei kasuta, ei ole Teile "
+"ka /boot vajalik"
 
-#: ../../network/network.pm_.c:356
+#: ../../diskdrake/interactive.pm:1
 #, c-format
-msgid "Gateway (e.g. %s)"
-msgstr "Vaikelüüs (nt %s)"
+msgid "The package %s is needed. Install it?"
+msgstr "Vajalik on pakett %s. Kas paigaldada see?"
 
-#: ../../network/network.pm_.c:358
-msgid "Gateway device"
-msgstr "Lüüsipoolne seade"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "What type of partitioning?"
+msgstr "Mis tüüpi partitsioonid teete?"
 
-#: ../../network/network.pm_.c:363
-msgid "DNS server address should be in format 1.2.3.4"
-msgstr "Nimeserveri aadress peab olema kujul 1.2.3.4"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Be careful: this operation is dangerous."
+msgstr "Vaadake ette: see võib olla ohtlik."
 
-#: ../../network/network.pm_.c:367
-msgid "Gateway address should be in format 1.2.3.4"
-msgstr "Lüüsi aadress peab olema kujul 1.2.3.4"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "chunk size"
+msgstr "ühiku suurus"
 
-#: ../../network/network.pm_.c:381
-msgid "Proxies configuration"
-msgstr "Vahendajate sätted"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "level"
+msgstr "tase"
 
-#: ../../network/network.pm_.c:382
-msgid "HTTP proxy"
-msgstr "HTTP vahendaja"
+#: ../../diskdrake/interactive.pm:1 ../../standalone/drakfloppy:1
+#, c-format
+msgid "device"
+msgstr "seade"
 
-#: ../../network/network.pm_.c:383
-msgid "FTP proxy"
-msgstr "FTP vahendaja"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Various"
+msgstr "Mitmesugust"
 
-#: ../../network/network.pm_.c:384
-msgid "Track network card id (useful for laptops)"
-msgstr "Võrgukaadi id tuvastus (kasulik sülearvutite puhul)"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Mount options"
+msgstr "Haakimise valikud"
 
-#: ../../network/network.pm_.c:387
-msgid "Proxy should be http://..."
-msgstr "Vahendaja peab olema kujul http://..."
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "File already exists. Use it?"
+msgstr "Fail on juba olemas. Kas kasutada seda?"
 
-#: ../../network/network.pm_.c:388
-msgid "Url should begin with 'ftp:' or 'http:'"
-msgstr "URLi alguses peab olema 'ftp:' või 'http:'"
+#: ../../diskdrake/interactive.pm:1
+#, 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"
 
-#
-#: ../../network/shorewall.pm_.c:26
-msgid "Firewalling configuration detected!"
-msgstr "Leitud tulemüüri sätted!"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Give a file name"
+msgstr "Failinimi"
 
-#: ../../network/shorewall.pm_.c:27
-msgid ""
-"Warning! An existing firewalling configuration has been detected. You may "
-"need some manual fix after installation."
-msgstr ""
-"Hoiatus! Leiti olemasolevad tulemüüri sätted. Tõenäoliselt peaksite need "
-"hiljem üle vaatama."
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Filesystem type: "
+msgstr "Failisüsteemi tüüp: "
 
-#: ../../network/tools.pm_.c:57
-msgid "Internet configuration"
-msgstr "Interneti sätted"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Size in MB: "
+msgstr "Suurus (MB): "
 
-#: ../../network/tools.pm_.c:58
-msgid "Do you want to try to connect to the Internet now?"
-msgstr "Kas soovite oma internetiühendust proovida?"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Loopback file name: "
+msgstr "Loopback faili nimi:"
 
-#: ../../network/tools.pm_.c:61 ../../standalone/drakconnect_.c:193
-msgid "Testing your connection..."
-msgstr "Testime Teie ühendust..."
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Loopback"
+msgstr "Loopback"
 
-#: ../../network/tools.pm_.c:70
-msgid "The system is now connected to Internet."
-msgstr "Süsteem on nüüd Internetti ühendatud."
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "This partition can't be used for loopback"
+msgstr "Seda partitsiooni ei saa loopback-ina kasutada"
 
-#: ../../network/tools.pm_.c:71
-msgid "For security reason, it will be disconnected now."
-msgstr "Turvakaalutlusel katkestan nüüd ühenduse."
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "LVM name?"
+msgstr "LVM nimi?"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "new"
+msgstr "uus"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Choose an existing LVM to add to"
+msgstr "Vali olemasolev LVM, millele lisada"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Choose an existing RAID to add to"
+msgstr "Vali olemasolev RAID, millele lisada"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Moving partition..."
+msgstr "Liigutan partitsiooni..."
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Moving"
+msgstr "Paigutan ümber"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Which sector do you want to move it to?"
+msgstr "Millisele sektorile soovite seda ümber paigutada?"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Sector"
+msgstr "Sektor"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Which disk do you want to move it to?"
+msgstr "Millisele kettale soovite seda ümber paigutada?"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Move"
+msgstr "Liiguta"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "New size in MB: "
+msgstr "Uus suurus (MB): "
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Choose the new size"
+msgstr "Valige uus suurus"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Resize"
+msgstr "Muuda suurust"
+
+#: ../../diskdrake/interactive.pm:1
+#, 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:1
+#, c-format
+msgid "All data on this partition should be backed-up"
+msgstr "Selle partitsiooni andmetest võiks olla varukoopia"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "This partition is not resizeable"
+msgstr "See partitsioon ei ole muudetav"
 
-#: ../../network/tools.pm_.c:72
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Computing FAT filesystem bounds"
+msgstr "Arvutan FAT failisüsteemi piire"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Where do you want to mount %s?"
+msgstr "Kuhu soovite haakida %s?"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"The system doesn't seem to be connected to internet.\n"
-"Try to reconfigure your connection."
+"Can't unset mount point as this partition is used for loop back.\n"
+"Remove the loopback first"
 msgstr ""
-"Paistab, et süsteem ei ole Internetti ühendatud.\n"
-"Palun seadistage ühendus uuesti."
+"Seda haakepunkti ei saa eemaldada, sest partitsioon on kasutusel\n"
+"loopback-ina. Eemaldage esmalt loopback"
 
-#: ../../network/tools.pm_.c:96
-msgid "Connection Configuration"
-msgstr "Internetiühenduse sätted"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Where do you want to mount device %s?"
+msgstr "Kuhu soovite haakida seadme %s?"
 
-#: ../../network/tools.pm_.c:97
-msgid "Please fill or check the field below"
-msgstr "Palun täitke allpool olev väli"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Where do you want to mount the loopback file %s?"
+msgstr "Kuhu soovite haakida loopback faili %s?"
 
-#: ../../network/tools.pm_.c:99 ../../standalone/drakconnect_.c:605
-msgid "Card IRQ"
-msgstr "Kaardi IRQ"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Switching from ext2 to ext3"
+msgstr "Ext2 vahetamine ext3 vastu"
 
-#: ../../network/tools.pm_.c:100 ../../standalone/drakconnect_.c:606
-msgid "Card mem (DMA)"
-msgstr "Kaardi mälu (DMA)"
+#: ../../diskdrake/interactive.pm:1 ../../diskdrake/removable.pm:1
+#, c-format
+msgid "Which filesystem do you want?"
+msgstr "Millist failisüsteemi soovite kasutada?"
 
-#: ../../network/tools.pm_.c:101 ../../standalone/drakconnect_.c:607
-msgid "Card IO"
-msgstr "Kaardi IO"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Change partition type"
+msgstr "Muuda partitsiooni tüüpi"
 
-#: ../../network/tools.pm_.c:102 ../../standalone/drakconnect_.c:608
-msgid "Card IO_0"
-msgstr "Kaardi IO_0"
+#: ../../diskdrake/interactive.pm:1
+#, 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"
 
-#: ../../network/tools.pm_.c:103 ../../standalone/drakconnect_.c:609
-msgid "Card IO_1"
-msgstr "Kaardi IO_1"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Remove the loopback file?"
+msgstr "Kas eemaldada loopback fail?"
 
-#: ../../network/tools.pm_.c:104 ../../standalone/drakconnect_.c:610
-msgid "Your personal phone number"
-msgstr "Teie telefoninumber"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid ""
+"You can't 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"
+"Eemaldage kõigepealt mõni primaarne partitsioon ja \n"
+"tekitage laiendatud partitsioon."
 
-#: ../../network/tools.pm_.c:105 ../../standalone/drakconnect_.c:611
-msgid "Provider name (ex provider.net)"
-msgstr "Teenusepakkuja tunnus (näiteks minuisp.ee)"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Preference: "
+msgstr "Eelistus: "
 
-#: ../../network/tools.pm_.c:106 ../../standalone/drakconnect_.c:612
-msgid "Provider phone number"
-msgstr "Sissehelistamiskeskuse number"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Start sector: "
+msgstr "Algsektor: "
 
-#: ../../network/tools.pm_.c:107 ../../standalone/drakconnect_.c:613
-msgid "Provider dns 1 (optional)"
-msgstr "DNS 1 (võib jätta tühjaks)"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Create a new partition"
+msgstr "Loo uus partitsioon"
 
-#: ../../network/tools.pm_.c:108 ../../standalone/drakconnect_.c:614
-msgid "Provider dns 2 (optional)"
-msgstr "DNS 2 (võib jätta tühjaks)"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Use for loopback"
+msgstr "Kasuta loopback-ina"
 
-#: ../../network/tools.pm_.c:109
-msgid "Choose your country"
-msgstr "Valige riik"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Modify RAID"
+msgstr "Modifitseeri RAIDi"
 
-#: ../../network/tools.pm_.c:110 ../../standalone/drakconnect_.c:617
-msgid "Dialing mode"
-msgstr "Valimisviis"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Remove from LVM"
+msgstr "Eemalda LVMist"
 
-#: ../../network/tools.pm_.c:111 ../../standalone/drakconnect_.c:629
-msgid "Connection speed"
-msgstr "Ühenduse kiirus"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Remove from RAID"
+msgstr "Eemalda RAIDist"
 
-#: ../../network/tools.pm_.c:112 ../../standalone/drakconnect_.c:630
-msgid "Connection timeout (in sec)"
-msgstr "Ühenduse aegumine (sekundites)"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Add to LVM"
+msgstr "Lisa LVMi"
 
-#: ../../network/tools.pm_.c:113 ../../standalone/drakconnect_.c:615
-msgid "Account Login (user name)"
-msgstr "Kasutajatunnus"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Add to RAID"
+msgstr "Lisa RAIDi"
 
-#: ../../network/tools.pm_.c:114 ../../standalone/drakconnect_.c:616
-#: ../../standalone/drakconnect_.c:647
-msgid "Account Password"
-msgstr "Salasõna"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Format"
+msgstr "Vorminda"
 
-#: ../../network/tools.pm_.c:118 ../../network/tools.pm_.c:132
-msgid "United Kingdom"
-msgstr "Suurbritannia"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Detailed information"
+msgstr "Üksikasjalik info"
 
-#: ../../partition_table.pm_.c:603
-msgid "mount failed: "
-msgstr "haakimine ebaõnnestus: "
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Trying to rescue partition table"
+msgstr "Proovin päästa partitsioonitabelit"
 
-#: ../../partition_table.pm_.c:667
-msgid "Extended partition not supported on this platform"
-msgstr "Sellel platvormil ei saa laiendatud partitsiooni luua"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid ""
+"Insert a floppy in drive\n"
+"All data on this floppy will be lost"
+msgstr ""
+"Pange tühi flopi masinasse\n"
+"Kõik andmed sellel hävivad"
+
+#: ../../diskdrake/interactive.pm:1 ../../harddrake/sound.pm:1
+#: ../../network/modem.pm:1
+#, c-format
+msgid "Warning"
+msgstr "Hoiatus"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Select file"
+msgstr "Valige fail"
 
-#: ../../partition_table.pm_.c:685
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"You have a hole in your partition table but I can't use it.\n"
-"The only solution is to move your primary partitions to have the hole next "
-"to the extended partitions."
+"The backup partition table has not the same size\n"
+"Still continue?"
 msgstr ""
-"Partitsioonitabelis on miskipärast tühi koht, aga see ei ole kasutatav.\n"
-"Ainuke lahendus on nihutada primaarset partitsiooni, et \"auk\" satuks "
-"laiendatud partitsioonide kõrvale."
+"Tabeli varukoopia ei ole sama suurusega\n"
+"Kas ikkagi jätkata?"
 
-#: ../../partition_table.pm_.c:774
+#: ../../diskdrake/interactive.pm:1
 #, c-format
-msgid "Restoring from file %s failed: %s"
-msgstr "Taastamine failist %s ebaõnnestus: %s"
+msgid "Removable media automounting"
+msgstr "Eemaldatava andmekandja automaatne haakimine"
 
-#: ../../partition_table.pm_.c:776
-msgid "Bad backup file"
-msgstr "Kõlbmatu varukoopia"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Reload partition table"
+msgstr "Laadi partitsioonitabel uuesti"
 
-#: ../../partition_table.pm_.c:796
+#: ../../diskdrake/interactive.pm:1
 #, c-format
-msgid "Error writing to file %s"
-msgstr "Viga faili %s kirjutamisel"
+msgid "Rescue partition table"
+msgstr "Päästa partitsioonitabel"
 
-#: ../../partition_table/raw.pm_.c:192
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Restore partition table"
+msgstr "Taasta partitsioonitabel"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Save partition table"
+msgstr "Kirjuta partitsioonitabel"
+
+#: ../../diskdrake/interactive.pm:1
+#, c-format
 msgid ""
-"Something bad is happening on your drive. \n"
-"A test to check the integrity of data has failed. \n"
-"It means writing anything on the disk will end up with random trash"
+"To have more partitions, please delete one to be able to create an extended "
+"partition"
 msgstr ""
-"Teie kõvakettal juhtub imelikke asju. \n"
-"Andmete pidevuse kontroll ebaõnnestus. \n"
-"See tähendab, et kettale kirjutamisel tekivad jamad"
+"Et saada rohkem partitsioone, kustutage palun üks, et luua laiendatud "
+"partitsioon"
 
-#: ../../pkgs.pm_.c:26
-msgid "must have"
-msgstr "vajalik"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "I can't add any more partition"
+msgstr "Partitsioone ei saa enam lisada"
 
-#: ../../pkgs.pm_.c:27
-msgid "important"
-msgstr "tähtis"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "All primary partitions are used"
+msgstr "Kõik primaarsed partitsioonid on kasutusel"
 
-#: ../../pkgs.pm_.c:28
-msgid "very nice"
-msgstr "väga kena"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Hard drive information"
+msgstr "Kõvaketta info"
 
-#: ../../pkgs.pm_.c:29
-msgid "nice"
-msgstr "kena"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Auto allocate"
+msgstr "Paiguta ise"
 
-#: ../../pkgs.pm_.c:30
-msgid "maybe"
-msgstr "võib olla"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Clear all"
+msgstr "Kustuta kõik"
 
-#: ../../printer/data.pm_.c:18
-msgid "PDQ - Print, Don't Queue"
-msgstr "PDQ - Trüki kohe"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Do you want to save /etc/fstab modifications"
+msgstr "Kas salvestada /etc/fstab muudatused"
 
-#: ../../printer/data.pm_.c:19
-msgid "PDQ"
-msgstr "PDQ"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Quit without writing the partition table?"
+msgstr "Kas väljuda partitsioonitabelit salvestamata?"
 
-#: ../../printer/data.pm_.c:30
-msgid "LPD - Line Printer Daemon"
-msgstr "LDP - Otsetrükkimisdeemon"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Quit without saving"
+msgstr "Välju ilma salvestamata"
 
-#: ../../printer/data.pm_.c:31
-msgid "LPD"
-msgstr "LPD"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Continue anyway?"
+msgstr "Kas ikkagi jätkata?"
 
-#: ../../printer/data.pm_.c:51
-msgid "LPRng - LPR New Generation"
-msgstr "LPRng - LPR, uus põlvkond"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Toggle to expert mode"
+msgstr "Tavakasutaja > Ekspert"
 
-#: ../../printer/data.pm_.c:52
-msgid "LPRng"
-msgstr "LPRng"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Toggle to normal mode"
+msgstr "Ekspert > Tavakasutaja"
 
-#: ../../printer/data.pm_.c:75
-msgid "CUPS - Common Unix Printing System"
-msgstr "CUPS - Tavaline UNIXi trükkimissüsteem"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Undo"
+msgstr "Tagasi"
 
-#: ../../printer/data.pm_.c:76 ../../printer/main.pm_.c:677
-msgid "CUPS"
-msgstr "CUPS"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Exit"
+msgstr "Välju"
 
-#: ../../printer/detect.pm_.c:80 ../../printer/detect.pm_.c:213
-#: ../../printer/detect.pm_.c:250
-msgid "Unknown Model"
-msgstr "Tundmatu mudel"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Choose a partition"
+msgstr "Valige partitsioon"
 
-#: ../../printer/main.pm_.c:26
-msgid "Local printer"
-msgstr "Kohalik printer"
+#: ../../diskdrake/interactive.pm:1
+#, c-format
+msgid "Choose another partition"
+msgstr "Valige muu partitsioon"
 
-#: ../../printer/main.pm_.c:27
-msgid "Remote printer"
-msgstr "Võrguprinter"
+#: ../../diskdrake/removable.pm:1
+#, c-format
+msgid "Change type"
+msgstr "Muuda tüüpi"
 
-#: ../../printer/main.pm_.c:28
-msgid "Printer on remote CUPS server"
-msgstr "CUPS printserver"
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Search servers"
+msgstr "Serverite otsing"
 
-#: ../../printer/main.pm_.c:29 ../../printer/printerdrake.pm_.c:835
-msgid "Printer on remote lpd server"
-msgstr "lpd printserver"
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Domain"
+msgstr "Domeen"
 
-#: ../../printer/main.pm_.c:30
-msgid "Network printer (TCP/Socket)"
-msgstr "Võrguprinter (TCP/Socket)"
+#: ../../diskdrake/smbnfs_gtk.pm:1 ../../standalone/drakbackup:1
+#, c-format
+msgid "Username"
+msgstr "Kasutajanimi"
 
-#: ../../printer/main.pm_.c:31
-msgid "Printer on SMB/Windows 95/98/NT server"
-msgstr "SMB/Windows 95/98/NT printserver"
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid ""
+"Please enter your username, password and domain name to access this host."
+msgstr ""
+"Palun sisestage sellele masinale ligipääsuks oma kasutajanimi, parool ja "
+"domeeni nimi."
 
-#: ../../printer/main.pm_.c:32
-msgid "Printer on NetWare server"
-msgstr "NetWare printserver"
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Domain Authentication Required"
+msgstr "Nõutav on domeeni autentimine"
 
-#: ../../printer/main.pm_.c:33 ../../printer/printerdrake.pm_.c:839
-msgid "Enter a printer device URI"
-msgstr "Printeri seadme URI"
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Another one"
+msgstr "Veel üks"
 
-#: ../../printer/main.pm_.c:34
-msgid "Pipe job into a command"
-msgstr "Töö toru kaudu käsuks"
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Which username"
+msgstr "Milline kasutajanimi"
 
-#: ../../printer/main.pm_.c:290 ../../printer/main.pm_.c:478
-#: ../../printer/main.pm_.c:794 ../../printer/printerdrake.pm_.c:3228
-msgid "Unknown model"
-msgstr "Tundmatu mudel"
+#: ../../diskdrake/smbnfs_gtk.pm:1
+#, c-format
+msgid "Can't login using username %s (bad password?)"
+msgstr "Sisselogimine kasutajanimega %s ebaõnnestus (vale parool?)"
 
-#: ../../printer/main.pm_.c:317
-msgid "Local Printers"
-msgstr "Kohalikud printerid"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "cpu # "
+msgstr "cpu # "
 
-#: ../../printer/main.pm_.c:319 ../../printer/main.pm_.c:678
-msgid "Remote Printers"
-msgstr "Võrguprinterid"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "SMBus controllers"
+msgstr "SMBus kontrollerid"
 
-#: ../../printer/main.pm_.c:326 ../../printer/printerdrake.pm_.c:381
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid " on parallel port \\/*%s"
-msgstr " paralleelpordis \\/*%s"
+msgid "USB controllers"
+msgstr "USB kontrollerid"
 
-#: ../../printer/main.pm_.c:329 ../../printer/printerdrake.pm_.c:383
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid ", USB printer \\/*%s"
-msgstr ", USB printer \\/*%s"
+msgid "SCSI controllers"
+msgstr "SCSI kontrolerid"
 
-#: ../../printer/main.pm_.c:334
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid ", multi-function device on parallel port \\/*%s"
-msgstr ", mitme funktsiooniga seade paralleelpordis \\/*%s"
+msgid "(E)IDE/ATA controllers"
+msgstr "(E)IDE/ATA kontrollerid"
 
-#: ../../printer/main.pm_.c:337
-msgid ", multi-function device on USB"
-msgstr ", mitme funktsiooniga seade USB-l"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Joystick"
+msgstr "Juhtkang"
 
-#: ../../printer/main.pm_.c:339
-msgid ", multi-function device on HP JetDirect"
-msgstr ", mitme funktsiooniga seade HP JetDirectil"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Scanner"
+msgstr "Skänner"
 
-#: ../../printer/main.pm_.c:341
-msgid ", multi-function device"
-msgstr ", mitme funktsiooniga seade"
+#: ../../harddrake/data.pm:1 ../../standalone/harddrake2:1
+#, c-format
+msgid "Unknown/Others"
+msgstr "Tundmatu/Muu"
 
-#: ../../printer/main.pm_.c:344
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid ", printing to %s"
-msgstr ", trükkimine masinal %s"
+msgid "Bridges and system controllers"
+msgstr "Sillad ja kontrollerid"
 
-#: ../../printer/main.pm_.c:346
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid " on LPD server \"%s\", printer \"%s\""
-msgstr " LPD serveril \"%s\", printer \"%s\""
+msgid "Modem"
+msgstr "Modem"
 
-#: ../../printer/main.pm_.c:348
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid ", TCP/IP host \"%s\", port %s"
-msgstr ", TCP/IP masinal \"%s\", port %s"
+msgid "Ethernetcard"
+msgstr "Võrgukaart"
 
-#: ../../printer/main.pm_.c:352
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid " on SMB/Windows server \"%s\", share \"%s\""
-msgstr " SMB/Windowsi serveril \"%s\", jagatud printer \"%s\""
+msgid "Processors"
+msgstr "Protsessorid"
 
-#: ../../printer/main.pm_.c:356
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid " on Novell server \"%s\", printer \"%s\""
-msgstr " Novelli serveril \"%s\", printer \"%s\""
+msgid "Webcam"
+msgstr "Veebikaamera"
 
-#: ../../printer/main.pm_.c:358
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid ", using command %s"
-msgstr ", kasutades käsku %s"
+msgid "Soundcard"
+msgstr "Helikaart"
 
-#: ../../printer/main.pm_.c:475 ../../printer/printerdrake.pm_.c:1603
-msgid "Raw printer (No driver)"
-msgstr "Toorprinter (draiverita)"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Other MultiMedia devices"
+msgstr "Muud multimeediaseadmed"
 
-#: ../../printer/main.pm_.c:647
+#: ../../harddrake/data.pm:1
 #, c-format
-msgid "(on %s)"
-msgstr "(masinal %s)"
+msgid "Tvcard"
+msgstr "TV-kaart"
 
-#: ../../printer/main.pm_.c:649
-msgid "(on this machine)"
-msgstr "(sellel masinal)"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Videocard"
+msgstr "Graafikakaart"
 
-#: ../../printer/main.pm_.c:674
+#: ../../harddrake/data.pm:1 ../../standalone/drakbackup:1
 #, c-format
-msgid "On CUPS server \"%s\""
-msgstr "CUPS serveril \"%s\""
+msgid "Tape"
+msgstr "Lint"
 
-#: ../../printer/main.pm_.c:680 ../../printer/printerdrake.pm_.c:2888
-#: ../../printer/printerdrake.pm_.c:2899 ../../printer/printerdrake.pm_.c:3120
-#: ../../printer/printerdrake.pm_.c:3171 ../../printer/printerdrake.pm_.c:3197
-#: ../../printer/printerdrake.pm_.c:3352 ../../printer/printerdrake.pm_.c:3354
-msgid " (Default)"
-msgstr " (Vaikimisi)"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "DVD-ROM"
+msgstr "DVD-ROM"
 
-#: ../../printer/printerdrake.pm_.c:27
-msgid "Select Printer Connection"
-msgstr "Valige printeri ühendusviis"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "CD/DVD burners"
+msgstr "CD/DVD kirjutajad"
 
-#: ../../printer/printerdrake.pm_.c:28
-msgid "How is the printer connected?"
-msgstr "Kuidas on see printer ühendatud?"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "CDROM"
+msgstr "CD-ROM"
 
-#: ../../printer/printerdrake.pm_.c:30
-msgid ""
-"\n"
-"Printers on remote CUPS servers you do not have to configure here; these "
-"printers will be automatically detected."
-msgstr ""
-"\n"
-"Kui võrgus on CUPS server, siis ei ole Teil vaja siin\n"
-"printereid seadistada, need leitakse automaatselt.\n"
-"Kui kahtlete, valige \"CUPS printserver\"."
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Disk"
+msgstr "Ketas"
 
-#: ../../printer/printerdrake.pm_.c:38
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
-msgstr "Printeri automaattuvastus (kohalikud, TCP/Socketi ja SMB printerid)"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Zip"
+msgstr "Zip"
 
-#: ../../printer/printerdrake.pm_.c:81 ../../printer/printerdrake.pm_.c:2950
-msgid "CUPS configuration"
-msgstr "CUPSi sätted"
+#: ../../harddrake/data.pm:1
+#, c-format
+msgid "Floppy"
+msgstr "Flopi"
 
-#: ../../printer/printerdrake.pm_.c:82 ../../printer/printerdrake.pm_.c:2951
-msgid "Specify CUPS server"
-msgstr "CUPS serveri määramine"
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "Let me pick any driver"
+msgstr "Suvalise juhtprogrammi valimine"
+
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "Driver:"
+msgstr "Juhtprogramm: "
 
-#: ../../printer/printerdrake.pm_.c:83
+#: ../../harddrake/sound.pm:1
+#, c-format
 msgid ""
-"To get access to printers on remote CUPS servers in your local network you "
-"do not have to configure anything; the CUPS servers inform your machine "
-"automatically about their printers. All printers currently known to your "
-"machine are listed in the \"Remote printers\" section in the main window of "
-"Printerdrake. When your CUPS server is not in your local network, you have "
-"to enter the CUPS server IP address and optionally the port number to get "
-"the printer information from the server, otherwise leave these fields blank."
+"If you really think that you know which driver is the right one for your "
+"card\n"
+"you can pick one in the above list.\n"
+"\n"
+"The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
-"Ligpääsuks CUPS printserveri printeritele kohalikus võrgus ei ole vaja üldse "
-"midagi seadistada, sest CUPS serverid annavad automaatselt Teie masinale "
-"teada oma printeritest. Kõik printerid, mida Teie masin parasjagu tunneb, on "
-"üles loetud Printerdrake põhiakna sektsioonis \"Võrguprinterid\". Kui CUPS "
-"server ei asu aga kohtvõrgus, tuleb sisestada selle IP aadress ja võimaluse "
-"korral ka pordi number, et saada serverilt infot printeri(te) kohta. "
-"Vastasel juhul jätke need väljad tühjaks."
+"Kui Te tõesti arvate, et teate, milline juhtprogramm Teie helikaardile\n"
+"tegelikult sobib, võite valida selle ülaltoodud nimekirjast.\n"
+"\n"
+"Teie praegune helikaart \"%s\" kasutab juhtprogrammi \"%s\" "
+
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "Choosing an arbitratry driver"
+msgstr "Suvalise juhtprogrammi valimine"
 
-#: ../../printer/printerdrake.pm_.c:84
+#: ../../harddrake/sound.pm:1
+#, c-format
 msgid ""
+"The classic bug sound tester is to run the following commands:\n"
+"\n"
+"\n"
+"- \"lspcidrake -v | fgrep AUDIO\" will tell you which driver your card use\n"
+"by default\n"
+"\n"
+"- \"grep snd-slot /etc/modules.conf\" will tell you what driver it\n"
+"currently uses\n"
 "\n"
-"Normally, CUPS is automatically configured according to your network "
-"environment, so that you can access the printers on the CUPS servers in your "
-"local network. If this does not work correctly, turn off \"Automatic CUPS "
-"configuration\" and edit your file /etc/cups/cupsd.conf manually. Do not "
-"forget to restart CUPS afterwards (command: \"service cups restart\")."
+"- \"/sbin/lsmod\" will enable you to check if its module (driver) is\n"
+"loaded or not\n"
+"\n"
+"- \"/sbin/chkconfig --list sound\" and \"/sbin/chkconfig --list alsa\" will\n"
+"tell you if sound and alsa services're configured to be run on\n"
+"initlevel 3\n"
+"\n"
+"- \"aumix -q\" will tell you if the sound volume is muted or not\n"
+"\n"
+"- \"/sbin/fuser -v /dev/dsp\" will tell which program uses the sound card.\n"
 msgstr ""
+"Klassikaline võimalus Teie arvuti heliprobleeme kindlaks teha on käivitada "
+"järgmised käsud:\n"
+"\n"
+"\n"
+"- \"lspcidrake -v | fgrep AUDIO\" näitab, millist draiverit Teie\n"
+"helikaart vaikimisi kasutab\n"
+"\n"
+"- \"grep snd-slot /etc/modules.conf\" näitab, millist draiverit\n"
+"praegu kasutatakse\n"
+"\n"
+"- \"/sbin/lsmod\" näitab, kas vastav moodul (draiver) on hetkel laetud\n"
+"\n"
+"- \"/sbin/chkconfig --list sound\" ja \"/sbin/chkconfig --list alsa\"\n"
+"näitavad, kas teenused \"sound\" ja \"alsa\" käivituvad.\n"
 "\n"
-"Tavaliselt seadistatakse CUPS automaatselt vastavalt Teie võrgukeskkonnale "
-"ja Te võite hõlpsasti pääseda ligi CUPS serveri printeritele oma kohtvõrgus. "
-"Kui see siiski ei toimi, lülitage välja \"CUPSi automaatne seadistamine\" ja "
-"redigeerige käsitsi faili /etc/cups/cupsd.conf. Kindlasti ärge unustage "
-"pärast seda CUPSi taaskäivitamast (käsk: \"service cups restart\")."
+"- \"aumix -q\" näitab, kas heli pole mitte summutatud (M - mute)\n"
+"\n"
+"- \"/sbin/fuser -v /dev/dsp\" näitab, milline programm hetkel\n"
+"helikaarti kasutab.\n"
 
-#: ../../printer/printerdrake.pm_.c:88
-msgid "The IP address should look like 192.168.1.20"
-msgstr "IP aadress peab välja nägema umbes nii: 192.168.1.20"
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "Sound trouble shooting"
+msgstr "Heliprobleemide lahendamine"
 
-#: ../../printer/printerdrake.pm_.c:92 ../../printer/printerdrake.pm_.c:1041
-msgid "The port number should be an integer!"
-msgstr "Pordi number peab olema täisarv!"
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "Error: The \"%s\" driver for your sound card is unlisted"
+msgstr "Viga: helikaardi juhtprogramm \"%s\" ei ole loendis"
 
-#: ../../printer/printerdrake.pm_.c:99
-msgid "CUPS server IP"
-msgstr "CUPS serveri IP"
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "Unkown driver"
+msgstr "Tundmatu juhtprogramm"
 
-#: ../../printer/printerdrake.pm_.c:100 ../../printer/printerdrake.pm_.c:1061
-#: ../../standalone/harddrake2_.c:63
-msgid "Port"
-msgstr "Port"
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "There's no known driver for your sound card (%s)"
+msgstr "Teie helikaardile (%s) ei õnnestunud tuvastada juhtprogrammi"
 
-#: ../../printer/printerdrake.pm_.c:102
-msgid "Automatic CUPS configuration"
-msgstr "CUPSi automaatne seadistamine"
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "No known driver"
+msgstr "Juhtprogrammi ei õnnestunud tuvastada"
 
-#: ../../printer/printerdrake.pm_.c:159
-msgid "Checking your system..."
-msgstr "Süsteemi kontrollimine..."
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid ""
+"There's no free driver for your sound card (%s), but there's a proprietary "
+"driver at \"%s\"."
+msgstr ""
+"Pole teada ühtegi vabavara-juhtprogrammi Teie helikaardile (%s), kuid on "
+"olemas tootja juhtprogramm, mille asukoht on \"%s\"."
 
-#: ../../printer/printerdrake.pm_.c:159 ../../printer/printerdrake.pm_.c:226
-#: ../../printer/printerdrake.pm_.c:1477 ../../printer/printerdrake.pm_.c:1481
-#: ../../printer/printerdrake.pm_.c:1598 ../../printer/printerdrake.pm_.c:2133
-#: ../../printer/printerdrake.pm_.c:2284 ../../printer/printerdrake.pm_.c:2343
-#: ../../printer/printerdrake.pm_.c:2415 ../../printer/printerdrake.pm_.c:2436
-#: ../../printer/printerdrake.pm_.c:2625 ../../printer/printerdrake.pm_.c:2630
-#: ../../printer/printerdrake.pm_.c:2636 ../../printer/printerdrake.pm_.c:2701
-#: ../../printer/printerdrake.pm_.c:2720 ../../printer/printerdrake.pm_.c:2731
-#: ../../printer/printerdrake.pm_.c:2764 ../../printer/printerdrake.pm_.c:2809
-#: ../../printer/printerdrake.pm_.c:2825 ../../printer/printerdrake.pm_.c:2911
-#: ../../printer/printerdrake.pm_.c:2989 ../../printer/printerdrake.pm_.c:3281
-#: ../../printer/printerdrake.pm_.c:3328 ../../printer/printerdrake.pm_.c:3369
-#: ../../standalone/printerdrake_.c:47
-msgid "Printerdrake"
-msgstr "Printerdrake"
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "No open source driver"
+msgstr "Vabavara-juhtprogramm puudub"
 
-#: ../../printer/printerdrake.pm_.c:167
-msgid ""
-"There are no printers found which are directly connected to your machine"
-msgstr "Ei leitud ühtegi printerit, mis oleks masinaga otse ühendatud"
+#: ../../harddrake/sound.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Please Wait... Applying the configuration"
+msgstr "Palun oodake... Rakendan seadistusi"
 
-#: ../../printer/printerdrake.pm_.c:179
+#: ../../harddrake/sound.pm:1
+#, c-format
 msgid ""
-"The following printers\n"
+"The old \"%s\" driver is blacklisted.\n"
+"\n"
+"It has been reported to oops the kernel on unloading.\n"
 "\n"
+"The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
-"Järgmised printerid\n"
+"Vana \"%s\" juhtprogramm on mustas nimekirjas.\n"
+"\n"
+"On teatatud, et see tekitab mahalaadimisel kernelile jama.\n"
 "\n"
+"Uut \"%s\" juhtprogrammi kasutatakse järgmisel alglaadimisel."
 
-#: ../../printer/printerdrake.pm_.c:180
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "Trouble shooting"
+msgstr "Probleemi otsimine"
+
+#: ../../harddrake/sound.pm:1
+#, c-format
 msgid ""
-"The following printer\n"
+"OSS (Open Sound System) was the first sound API. It's an OS independant "
+"sound API (it's available on most unices systems) but it's a very basic and "
+"limited API.\n"
+"What's more, OSS drivers all reinvent the wheel.\n"
 "\n"
+"ALSA (Advanced Linux Sound Architecture) is a modularized architecture "
+"which\n"
+"supports quite a large range of ISA, USB and PCI cards.\n"
+"\n"
+"It also provides a much higher API than OSS.\n"
+"\n"
+"To use alsa, one can either use:\n"
+"- the old compatibility OSS api\n"
+"- the new ALSA api that provides many enhanced features but requires using "
+"the ALSA library.\n"
 msgstr ""
-"Järgmine printer\n"
+"OSS (Open Sound System) oli esimene heli-API. See on op-süsteemist sõltumatu "
+"heli-API (saadaval enamiku unix-süsteemide tarbeks), kuid samas väga "
+"elementaarne ja piiratud.\n"
+"Ja pealegi kipuvad OSS-draiverid kogu aeg jalgratast uuesti leiutama.\n"
+"\n"
+"ALSA (Advandes Linux Sound Architecture) kujutab endast moodulistatud\n"
+"arhitektuuri, mis toetab päris suurt hulka ISA-, USB- ja PCI-kaarte.\n"
+"\n"
+"See pakub ka palju arenenumat API-t kui OSS.\n"
 "\n"
+"Alsa kasutamiseks võib tarvitada:\n"
+" -vana ühilduvat OSS API-t\n"
+"- uut ALSA API-t, mis pakub hulga täiustatud võimalusi, kuid\n"
+"nõuab ALSA teegi kasutamist.\n"
 
-#: ../../printer/printerdrake.pm_.c:182
+#: ../../harddrake/sound.pm:1
+#, c-format
 msgid ""
 "\n"
-"and one unknown printer are "
+"\n"
+"Your card currently use the %s\"%s\" driver (default driver for your card is "
+"\"%s\")"
 msgstr ""
 "\n"
-"ja üks tundmatu printer on "
+"\n"
+"Teie helikaart kasutab praegu %s\"%s\" juhtprogrammi (selle kaardi "
+"vaikedraiver on \"%s\")"
 
-#: ../../printer/printerdrake.pm_.c:184
+#: ../../harddrake/sound.pm:1
 #, c-format
 msgid ""
-"\n"
-"and %d unknown printers are "
+"Here you can select an alternative driver (either OSS or ALSA) for your "
+"sound card (%s)."
 msgstr ""
-"\n"
-"ja %d tundmatut printerit on "
+"Siin saate valida alternatiivse juhtprogrammi (OSS või ALSA) oma "
+"helikaardile (%s)."
+
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "Sound configuration"
+msgstr "Heliseadistused"
+
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid ""
+"There's no known OSS/ALSA alternative driver for your sound card (%s) which "
+"currently uses \"%s\""
+msgstr ""
+"Pole teada ühtegi alternatiivset OSS/ALSA juhtprogrammi Teie helikaardile (%"
+"s), millel praegu on kasutusel \"%s\""
+
+#: ../../harddrake/sound.pm:1
+#, c-format
+msgid "No alternative driver"
+msgstr "Alternatiivne juhtprogramm puudub"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "enable radio support"
+msgstr "raadiotoe lubamine"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "Radio support:"
+msgstr "Raadiotugi:"
 
-#: ../../printer/printerdrake.pm_.c:187
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "PLL setting:"
+msgstr "PLL:"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "number of capture buffers for mmap'ed capture"
+msgstr "hõivatavate puhvrite arv mmap-i jaoks"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "Number of capture buffers:"
+msgstr "Hõivepuhvrite arv:"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "Tuner type:"
+msgstr "Tuuneri tüüp:"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "Card model:"
+msgstr "Kaardi mudel:"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
 msgid ""
+"For most modern TV cards, the bttv module of the GNU/Linux kernel just auto-"
+"detect the rights parameters.\n"
+"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 "
+"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"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "Unknown|Generic"
+msgstr "Tundmatu|Tavaline"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "Unknown|CPH06X (bt878) [many vendors]"
+msgstr "Tundmatu|CPH06X (bt878) [paljud tootjad]"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "Unknown|CPH05X (bt878) [many vendors]"
+msgstr "Tundmatu|CPH05X (bt878) [paljud tootjad]"
+
+#: ../../harddrake/v4l.pm:1
+#, c-format
+msgid "Auto-detect"
+msgstr "Automaattuvastus"
+
+#: ../../interactive/newt.pm:1
+#, c-format
+msgid "Do"
+msgstr "Tee ära"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid "Your choice? (default %s) "
+msgstr "Teie valik? (vaikimisi %s)"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid "Bad choice, try again\n"
+msgstr "Halb valik, proovige palun uuesti\n"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid "Re-submit"
+msgstr "Uuestisaatmine"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid ""
+"=> Notice, a label changed:\n"
+"%s"
+msgstr ""
+"=> Pange tähele, et pealdis on muutunud:\n"
+"%s"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid ""
+"Please choose the first number of the 10-range you wish to edit,\n"
+"or just hit Enter to proceed.\n"
+"Your choice? "
+msgstr ""
+"Valige palun esimene number kümnesest vahemikust, mida soovite\n"
+"muuta, või vajutage Enter jätkamiseks.\n"
+"Ja Teie valik on? "
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid "=> There are many things to choose from (%s).\n"
+msgstr "=> Nüüd on Teil mitmeid valikuid (%s).\n"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid "Your choice? (default `%s'%s) "
+msgstr "Teie valik? (vaikimisi '%s'%s)"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid " enter `void' for void entry"
+msgstr " kirjutage tühja kirje puhul 'void'"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid "Do you want to click on this button?"
+msgstr "Kas soovite sellel nupul klõpsata?"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid "Button `%s': %s"
+msgstr "Nupp '%s': %s"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid "Your choice? (0/1, default `%s') "
+msgstr "Teie valik? (0/1, vaikimisi '%s')"
+
+#: ../../interactive/stdio.pm:1
+#, c-format
+msgid ""
+"Entries you'll have to fill:\n"
+"%s"
+msgstr ""
+"Teil tuleb täita kirjed:\n"
+"%s"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid ""
+"Loading module %s failed.\n"
+"Do you want to try again with other parameters?"
+msgstr ""
+"Mooduli %s laadimine ei õnnestunud.\n"
+"Kas soovite proovida parameetreid muuta?"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "Specify options"
+msgstr "Määrata parameetrid"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "Autoprobe"
+msgstr "Proovida niisama"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid ""
+"In some cases, the %s driver needs to have extra information to work\n"
+"properly, although it normally works fine without them. Would you like to "
+"specify\n"
+"extra options for it or allow the driver to probe your machine for the\n"
+"information it needs? Occasionally, probing will hang a computer, but it "
+"should\n"
+"not cause any damage."
+msgstr ""
+"Mõnel juhul vajab %s juhtprogramm tööks lisainformatsiooni,\n"
+"kuigi tavaliselt saab ka ilma hakkama. Kas soovite eraldi parameetreid\n"
+"määrata või lasta juhtprogrammil ise Teie arvutit kompida? Võib juhtuda,\n"
+"et see viib arvuti segadusse, kuid ei tohiks mingit jäävat kahju teha."
+
+#. -PO: the %s is the driver type (scsi, network, sound,...)
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "Which %s driver should I try?"
+msgstr "Millist %s juhtprogrammi peaksime proovima?"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "Module options:"
+msgstr "Mooduli parameetrid:"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+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\""
+
+#: ../../modules/interactive.pm:1
+#, 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'"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "(module %s)"
+msgstr "(moodul %s)"
+
+#. -PO: the first %s is the card type (scsi, network, sound,...)
+#. -PO: the second is the vendor+model name
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "Installing driver for %s card %s"
+msgstr "Paigaldame juhtprogrammi %s kaardile %s"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "See hardware info"
+msgstr "Info riistvara kohta"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "Do you have any %s interfaces?"
+msgstr "Kas Teil on ikka mõni %s liides?"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "Do you have another one?"
+msgstr "On Teil veel kaarte?"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "Found %s %s interfaces"
+msgstr "Leiti %s %s liidest"
+
+#: ../../modules/interactive.pm:1
+#, c-format
+msgid "You can configure each parameter of the module here."
+msgstr "Siin saab seadistada mooduli kõiki parameetreid."
+
+#: ../../modules/parameters.pm:1
+#, c-format
+msgid "comma separated strings"
+msgstr "komaga eraldatud stringi"
+
+#: ../../modules/parameters.pm:1
+#, c-format
+msgid "comma separated numbers"
+msgstr "komaga eraldatud numbrit"
+
+#: ../../modules/parameters.pm:1
+#, c-format
+msgid "%d comma separated strings"
+msgstr "%d komaga eraldatud stringi"
+
+#: ../../modules/parameters.pm:1
+#, c-format
+msgid "%d comma separated numbers"
+msgstr "%d komaga eraldatud numbrit"
+
+#: ../../modules/parameters.pm:1
+#, c-format
+msgid "a number"
+msgstr "number"
+
+#: ../../network/adsl.pm:1
+#, c-format
+msgid ""
+"You need the alcatel microcode.\n"
+"Download it at\n"
+"http://www.speedtouchdsl.com/dvrreg_lx.htm\n"
+"and copy the mgmt.o in /usr/share/speedtouch"
+msgstr ""
+"Selleks vajate Alcateli Microcode-i.\n"
+"Seda saate alla laadida võrgust\n"
+"http://www.speedtouchdsl.com/dvrreg_lx.htm\n"
+"ja saadud 'mgmt.o' kopeerige kataloogi /usr/share/speedtouch"
+
+#: ../../network/adsl.pm:1
+#, 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'"
+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:1 ../../network/ethernet.pm:1
+#, c-format
+msgid "Connect to the Internet"
+msgstr "Loo internetiühendus"
+
+#: ../../network/adsl.pm:1
+#, c-format
+msgid "Sagem (using pppoe) usb"
+msgstr "Sagem (pppoe vahendusel) usb"
+
+#: ../../network/adsl.pm:1
+#, c-format
+msgid "Alcatel speedtouch usb"
+msgstr "Alcatel speedtouch USB"
+
+#: ../../network/adsl.pm:1
+#, c-format
+msgid "use dhcp"
+msgstr "dhcp"
+
+#: ../../network/adsl.pm:1
+#, c-format
+msgid "use pptp"
+msgstr "pptp"
+
+#: ../../network/adsl.pm:1
+#, c-format
+msgid "use pppoe"
+msgstr "pppoe"
+
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid "Other ports"
+msgstr "Muud pordid"
+
+#
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid "Everything (no firewall)"
+msgstr "Kõik (tulemüür puudub)"
+
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid ""
+"Invalid port given: %s.\n"
+"The proper format is \"port/tcp\" or \"port/udp\", \n"
+"where port is between 1 and 65535."
+msgstr ""
+"Määrati vale port: %s\n"
+"Õige määrang on \"port/tcp\" või \"port/udp\", \n"
+"kus port on number 1 ja 65535 vahel."
+
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid ""
+"You can enter miscellaneous ports. \n"
+"Valid examples are: 139/tcp 139/udp.\n"
+"Have a look at /etc/services for information."
+msgstr ""
+"Sisestada võib mitmesuguseid porte. \n"
+"Sobivad näiteks: 139/tcp 139/udp.\n"
+"Vaadake lähemalt /etc/services."
+
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid "Which services would you like to allow the Internet to connect to?"
+msgstr "Millistel teenustel soovite lubada kasutada Internetiühendust?"
+
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid ""
+"drakfirewall configurator\n"
 "\n"
-"are "
+"Make sure you have configured your Network/Internet access with\n"
+"drakconnect before going any further."
 msgstr ""
+"drakfirewalli seadistaja\n"
 "\n"
-"on "
+"Kontrollige enne jätkamist, et olete seadistanud pääsu võrku/Internetti\n"
+"drakconnecti abil."
 
-#: ../../printer/printerdrake.pm_.c:187
+#: ../../network/drakfirewall.pm:1
+#, c-format
 msgid ""
+"drakfirewall configurator\n"
 "\n"
-"is "
+"This configures a personal firewall for this Mandrake Linux machine.\n"
+"For a powerful and dedicated firewall solution, please look to the\n"
+"specialized MandrakeSecurity Firewall distribution."
 msgstr ""
+"drakfirewalli seadistaja\n"
 "\n"
-"on "
+"Selle vahendiga saate luua lihtsa kaitse Interneti ohtude vastu.\n"
+"Kui vajate võimsat tulemüüri, vaadake palun\n"
+"spetsiaalset MandrakeSecurity Firewall distributsiooni."
+
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid "No network card"
+msgstr "Võrgukaart puudub"
+
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid "POP and IMAP Server"
+msgstr "POP ja IMAP server"
+
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid "Mail Server"
+msgstr "Meiliserver"
 
-#: ../../printer/printerdrake.pm_.c:189
-msgid "directly connected to your system"
-msgstr "Teie süsteemi otse ühendatud"
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid "Domain Name Server"
+msgstr "Nimeserver"
 
-#: ../../printer/printerdrake.pm_.c:192
+#: ../../network/drakfirewall.pm:1
+#, c-format
+msgid "Web Server"
+msgstr "Veebiserver"
+
+#: ../../network/ethernet.pm:1 ../../network/network.pm:1
+#, c-format
+msgid "Zeroconf host name must not contain a ."
+msgstr "Zeroconfi masina nimi ei tohi sisaldada punkti (.)"
+
+#: ../../network/ethernet.pm:1 ../../network/network.pm:1
+#, c-format
+msgid "Zeroconf Host name"
+msgstr "Zefoconf masina nimi"
+
+#: ../../network/ethernet.pm:1 ../../network/network.pm:1
+#, c-format
+msgid "Host name"
+msgstr "Masinanimi"
+
+#: ../../network/ethernet.pm:1 ../../network/network.pm:1
+#, c-format
 msgid ""
 "\n"
-"There is one unknown printer directly connected to your system"
+"\n"
+"Enter a Zeroconf host name without any dot if you don't\n"
+"want to use the default host name."
 msgstr ""
 "\n"
-"Üks tundmatu printer on Teie süsteemi otse ühendatud"
+"\n"
+"Sisestage Zeroconfi masina nimi (ilma punktideta), kui Te\n"
+"ei soovi kasutada vaikimisi antud masina nime."
 
-#: ../../printer/printerdrake.pm_.c:194
+#: ../../network/ethernet.pm:1
 #, c-format
 msgid ""
-"\n"
-"There are %d unknown printers directly connected to your system"
+"Please enter your host name if you know it.\n"
+"Some DHCP servers require the hostname to work.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''."
 msgstr ""
-"\n"
-"%d tundmatut printerit on Teie süsteemi otse ühendatud"
+"Palun sisestage oma masina nimi.\n"
+"Seda nõuavad ka mõned DHCP serverid.\n"
+"Masina nimi peab olema esitatud täiskujul,\n"
+"nagu ``minumasin.minufirma.ee''."
 
-#: ../../printer/printerdrake.pm_.c:200
-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"
+#: ../../network/ethernet.pm:1 ../../network/network.pm:1
+#, c-format
+msgid "Configuring network"
+msgstr "Võrguseadistused"
 
-#: ../../printer/printerdrake.pm_.c:214
+#: ../../network/ethernet.pm:1
+#, c-format
+msgid "no network card found"
+msgstr "võrgukaarti ei leitud"
+
+#: ../../network/ethernet.pm:1
+#, c-format
 msgid ""
-"Do you want to enable printing on the printers mentioned above or on "
-"printers in the local network?\n"
+"Please choose which network adapter you want to use to connect to Internet."
 msgstr ""
-"Kas soovite trükkimist lubada ülalmainitud printeritel või printeritel Teie "
-"kohtvõrgus?\n"
+"Palun valige, millist võrguliidest soovite internetiühenduse jaoks kasutada"
 
-#: ../../printer/printerdrake.pm_.c:215
-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"
+#: ../../network/ethernet.pm:1 ../../standalone/drakgw:1
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Choose the network interface"
+msgstr "Valige võrguliides"
 
-#: ../../printer/printerdrake.pm_.c:217
-msgid "Do you want to enable printing on the printers mentioned above?\n"
-msgstr "Kas soovite trükkimist lubada ülalmainitud printeritel?\n"
+#: ../../network/ethernet.pm:1
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system.\n"
+"I cannot set up this connection type."
+msgstr ""
+"Ühtegi võrgukaarti ei õnnestunud tuvastada\n"
+"Seega ei saa ka sellist ühendust seadistada."
 
-#: ../../printer/printerdrake.pm_.c:218
-msgid "Are you sure that you want to set up printing on this machine?\n"
+#: ../../network/ethernet.pm:1
+#, c-format
+msgid ""
+"Which dhcp client do you want to use?\n"
+"Default is dhcp-client."
 msgstr ""
-"Kas olete ikka kindel, et soovite seadistada trükkimist sellel masinal?\n"
+"Millist DHCP klienti soovite kasutada?\n"
+"Vaikimisi on selleks 'dhcp-client'"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "No ISDN PCI card found. Please select one on the next screen."
+msgstr "PCI ISDN kaarti ei leitud. Palun valige see järgmisel sammul."
 
-#: ../../printer/printerdrake.pm_.c:219
+#: ../../network/isdn.pm:1
 #, c-format
 msgid ""
-"NOTE: Depending on the printer model and the printing system up to %d MB of "
-"additional software will be installed."
+"I have detected an ISDN PCI card, but I don't know its type. Please select a "
+"PCI card on the next screen."
 msgstr ""
-"MÄRKUS: Sõltuvalt printeri mudelist ja trükkimissüsteemist paigaldatakse "
-"kuni %d MB lisatarkvara."
+"Leiti küll PCI ISDN kaart, kuid selle tüüp on tundmatu. Palun valige PCI "
+"kaart järgmisel sammul."
 
-#: ../../printer/printerdrake.pm_.c:258 ../../printer/printerdrake.pm_.c:270
-#: ../../printer/printerdrake.pm_.c:328 ../../printer/printerdrake.pm_.c:2933
-#: ../../printer/printerdrake.pm_.c:3060
-msgid "Add a new printer"
-msgstr "Lisa uus printer"
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr "Milline on Teie ISDN kaart?"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "ISDN Configuration"
+msgstr "ISDN sätted"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "Abort"
+msgstr "Loobu"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "Continue"
+msgstr "Jätka"
 
-#: ../../printer/printerdrake.pm_.c:259
+#: ../../network/isdn.pm:1
+#, c-format
 msgid ""
 "\n"
-"Welcome to the Printer Setup Wizard\n"
-"\n"
-"This wizard allows you to install local or remote printers to be used from "
-"this machine and also from other machines in the network.\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
 "\n"
-"It asks you for all necessary information to set up the printer and gives "
-"you access to all available printer drivers, driver options, and printer "
-"connection types."
+"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
+"card.\n"
 msgstr ""
 "\n"
-"Printeri seadistamise nõustaja\n"
-"\n"
-"Nõustaja võimaldab Teile paigaldada kohalikke või võrguprintereid, mida saab "
-"kasutada Teie masin, samuti teised võrgus olevad masinad.\n"
+"Kui Teil on ISA kaart, siis peaks järgmised väärtused olema õiged.\n"
 "\n"
-"Teil palutakse määrata kogu vajalik info printeri seadistamiseks, see "
-"tähendab olemasolevad printeridraiverid, draiveri valikud ja printeri "
-"ühendusviis."
+"Kui Teil on PCMCIA kaart, peaksite Te ise teadma selle IRQ ning IO "
+"väärtusi.\n"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "I don't know"
+msgstr "Ei tea"
 
-#: ../../printer/printerdrake.pm_.c:272
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "PCI"
+msgstr "PCI"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "ISA / PCMCIA"
+msgstr "ISA / PCMCIA"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "What kind of card do you have?"
+msgstr "Millist tüüpi kaart Teil on?"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "Found \"%s\" interface do you want to use it ?"
+msgstr "Leiti \"%s\" liides, kas soovite seda kasutada?"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "Which protocol do you want to use?"
+msgstr "Millist protokolli soovite kasutada?"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "Protokoll ülejäänud maailma tarbeks"
+
+#: ../../network/isdn.pm:1
+#, c-format
 msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokoll ülejäänud maailma tarbeks\n"
+"Ilma D-kanalita (liisitud liinid)"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "European protocol"
+msgstr "Euroopa protokoll"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Euroopa protokoll (EDSS1)"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid ""
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
+msgstr ""
+"Valige oma teenusepakkuja.\n"
+"Kui see ei ole nimekirjas, valige 'Tundmatu'."
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "External ISDN modem"
+msgstr "Väline ISDN modem"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "Internal ISDN card"
+msgstr "Sisemine ISDN kaart"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "What kind is your ISDN connection?"
+msgstr "Millist ISDN ühendust kasutate?"
+
+#: ../../network/isdn.pm:1 ../../network/netconnect.pm:1
+#, c-format
+msgid "Network Configuration Wizard"
+msgstr "Võrguseadistuste nõustaja"
+
+#
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "Old configuration (isdn4net)"
+msgstr "Vana seadistus (isdn4net)"
+
+#
+#: ../../network/isdn.pm:1
+#, c-format
+msgid "New configuration (isdn-light)"
+msgstr "Uus seadistus (isdn-light)"
+
+#: ../../network/isdn.pm:1
+#, c-format
+msgid ""
+"Which ISDN configuration do you prefer?\n"
 "\n"
-"Welcome to the Printer Setup Wizard\n"
-"\n"
-"This wizard will help you to install your printer(s) connected to this "
-"computer, connected directly to the network or to a remote Windows machine.\n"
-"\n"
-"If you have printer(s) connected to this machine, Please plug it/them in on "
-"this computer and turn it/them on so that it/they can be auto-detected. Also "
-"your network printer(s) and you Windows machines must be connected and "
-"turned on.\n"
+"* The Old configuration uses isdn4net. It contains powerful\n"
+"  tools, but is tricky to configure, and not standard.\n"
 "\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"
+"* The New configuration is easier to understand, more\n"
+"  standard, but with less tools.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
+"We recommand the light configuration.\n"
 msgstr ""
+"Millist ISDN seadistust eelistate?\n"
 "\n"
-"Printeri seadistamine nõustaja\n"
+"* Vana seadistus kasutab isdn4net-i. Sellel on võimsaid\n"
+"  vahendeid, kuid seadistamine on keerukas ja mittestandardne.\n"
 "\n"
-"Nõustaja aitab Teile paigaldada printeri(d), mis on ühendatud selle "
-"arvutiga, otse võrku või võrgus asuva Windowsi masinaga.\n"
+"* Uus seadistus on hõlpsamini mõistetav, vastab paremini\n"
+"  standarditele, kuid pakub vähem tööriistu.\n"
 "\n"
-"Kui Teil on printer(eid), mis on ühendatud selle masinaga, ühendage see/need "
-"palun arvutiga ja lülitage sisse, et seda/neid oleks võimalik automaatselt "
-"tuvastada. Ka võrguprinter(id) ja Windowsi-masinad peavad olema ühendatud ja "
-"sisse lülitatud.\n"
+"Meie soovitus on kasutada light-seadistust.\n"
+
+#: ../../network/modem.pm:1
+#, c-format
+msgid "Do nothing"
+msgstr "Ära tee midagi"
+
+#: ../../network/modem.pm:1
+#, c-format
+msgid "Install rpm"
+msgstr "Paigalda RPM"
+
+#: ../../network/modem.pm:1
+#, c-format
+msgid ""
+"\"%s\" based winmodem detected, do you want to install needed software ?"
+msgstr ""
+"Leiti \"%s\" kiibil põhinev \"winmodem\". Kas paigaldada vajalik tarkvara?"
+
+#: ../../network/modem.pm:1
+#, c-format
+msgid "Title"
+msgstr "Tiitel"
+
+#: ../../network/modem.pm:1
+#, c-format
+msgid ""
+"Your modem isn't 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/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Second DNS Server (optional)"
+msgstr "Teine nimeserver (soovituslik)"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "First DNS Server (optional)"
+msgstr "Esimene nimeserver (soovituslik)"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Domain name"
+msgstr "Domeeninimi"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "CHAP"
+msgstr "CHAP"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Script-based"
+msgstr "Skriptipõhine"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Terminal-based"
+msgstr "Terminalipõhine"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "PAP"
+msgstr "PAP"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Login ID"
+msgstr "Kasutajakonto"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Phone number"
+msgstr "Sissehelistamiskeskuse number"
+
+#: ../../network/modem.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Connection name"
+msgstr "Ühenduse nimi"
+
+#: ../../network/modem.pm:1
+#, c-format
+msgid "Dialup options"
+msgstr "DialUp parameetrid"
+
+#: ../../network/modem.pm:1
+#, c-format
+msgid "Please choose which serial port your modem is connected to."
+msgstr "Millisesse jadaporti on Teie modem ühendatud?"
+
+#: ../../network/netconnect.pm:1 ../../network/tools.pm:1
+#, c-format
+msgid "Network Configuration"
+msgstr "Võrgu sätted"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid ""
+"Problems occured during configuration.\n"
+"Test your connection via net_monitor or mcc. If your connection doesn't "
+"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:1
+#, c-format
+msgid ""
+"After this is done, we recommend that you restart your X environment to "
+"avoid any hostname-related problems."
+msgstr ""
+"Soovitame taaskäivitada ka X keskkonna, et vältida võimalikke\n"
+"masinanime muutmisest tingitud probleeme."
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"The configuration will now be applied to your system.\n"
 "\n"
-"Pange tähele, et võrguprinterite automaattuvastus võtab rohkem aega kui "
-"ainult selle masinaga ühendatud printerite tuvastamine. Nii et kui teil seda "
-"vaja ei ole, lülitage võrgus ja/või Windowsi taga olevate printerite "
-"automaattuvastus välja.\n"
+msgstr ""
+"Õnnitleme, võrk ja internetiühendus on seadistatud.\n"
+"Sätted salvestatakse nüüd.\n"
 "\n"
-"Kui olete valmis, vajutage \"Järgmine\", või \"Katkesta\", kui Te ei soovi "
-"printeri(te) seadistamisega praegu tegelda."
 
-#: ../../printer/printerdrake.pm_.c:281 ../../printer/printerdrake.pm_.c:298
+#: ../../network/netconnect.pm:1
+#, c-format
 msgid ""
+"A problem occured while restarting the network: \n"
 "\n"
-"Welcome to the Printer Setup Wizard\n"
-"\n"
-"This wizard will help you to install your printer(s) connected to this "
-"computer.\n"
+"%s"
+msgstr ""
+"Võrgu taaskäivitamisel tekkis viga: \n"
 "\n"
-"If you have printer(s) connected to this machine, Please plug it/them in on "
-"this computer and turn it/them on so that it/they can be auto-detected.\n"
+"%s"
+
+#: ../../network/netconnect.pm:1
+#, 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:1
+#, c-format
+msgid "Network configuration"
+msgstr "Võrgusätted"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Do you want to start the connection at boot?"
+msgstr "Kas soovite luua ühenduse juba alglaadimisel?"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Internet connection"
+msgstr "Internetiühendus"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid ""
+"You have configured multiple ways to connect to the Internet.\n"
+"Choose the one you want to use.\n"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
 msgstr ""
+"Olete seadistanud mitu võimalust Internetiga ühendumiseks.\n"
+"Valige palun see, mida soovite kasutada.\n"
 "\n"
-"Printeri seadistamise nõustaja\n"
-"\n"
-"Nõustaja aitab Teil paigaldada printeri(d), mis on ühendatud selle "
-"arvutiga.\n"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Choose the connection you want to configure"
+msgstr "Valige ühendus, mida seadistada"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "ethernet card(s) detected"
+msgstr "võrgukaart(i) leiti üles"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "LAN connection"
+msgstr "LAN ühendus"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "cable connection detected"
+msgstr "leiti kaabliühendus"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Cable connection"
+msgstr "Kaabliühendus"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "detected"
+msgstr "tuvastati"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "ADSL connection"
+msgstr "ADSL ühendus"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "detected %s"
+msgstr "tuvastati %s"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "ISDN connection"
+msgstr "ISDN ühendus"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Winmodem connection"
+msgstr "Ühendus \"Winmodemiga\""
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "detected on port %s"
+msgstr "leiti pordis %s"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Normal modem connection"
+msgstr "Tavaline modemiühendus"
+
+#: ../../network/netconnect.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Detecting devices..."
+msgstr "Otsin seadmeid..."
+
+#: ../../network/netconnect.pm:1 ../../printer/printerdrake.pm:1
+#: ../../standalone/drakconnect:1 ../../standalone/drakfloppy:1
+#, c-format
+msgid "Expert Mode"
+msgstr "Ekspertresiim"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Use auto detection"
+msgstr "Kasuta automaattuvastust"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Choose the profile to configure"
+msgstr "Valige profiil, mida seadistada"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid ""
+"Welcome to The Network Configuration Wizard.\n"
 "\n"
-"Kui teil on printer(eid), mis on ühendatud selle masinaga, ühendage palun "
-"see/need arvutiga ja lülitage sisse, et seda/neid saaks automaatselt "
-"tuvastada.\n"
+"We are about to configure your internet/network connection.\n"
+"If you don't want to use the auto detection, deselect the checkbox.\n"
+msgstr ""
+"Internetiühenduse nõustaja\n"
 "\n"
-"Kui olete valmis, vajutage \"Järgmine\", või \"Katkesta\", kui Te ei soovi "
-"praegu printeri(te) seadistamisega tegelda."
+"Nüüd hakkame internetiühendust seadistama.\n"
+"Kui Te ei soovi automaatset tuvastamist, siis jätke see märkimata.\n"
 
-#: ../../printer/printerdrake.pm_.c:289
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid ""
+"Because you are doing a network installation, your network is already "
+"configured.\n"
+"Click on Ok to keep your configuration, or cancel to reconfigure your "
+"Internet & Network connection.\n"
+msgstr ""
+"Võrguühendus on juba seadistatud, sest installitakse ju võrgust.\n"
+"Kui soovite neid seadistusi säilitada, valige Olgu, muidu katkestage ja "
+"saate seadistada uuesti.\n"
+
+#: ../../network/netconnect.pm:1
+#, c-format
 msgid ""
 "\n"
-"Welcome to the Printer Setup Wizard\n"
 "\n"
-"This wizard will help you to install your printer(s) connected to this "
-"computer or connected directly to the network.\n"
 "\n"
-"If you have printer(s) connected to this machine, Please plug it/them in on "
-"this computer and turn it/them on so that it/they can be auto-detected. Also "
-"your network printer(s) must be connected and turned on.\n"
+"We are now going to configure the %s connection.\n"
 "\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"
 "\n"
-" Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
-"want to set up your printer(s) now."
+"Press OK to continue."
 msgstr ""
 "\n"
-"Printeri seadistamine nõustaja\n"
 "\n"
-"Nõustaja aitab Teil paigaldada printeri(d), mis on ühendatud selle arvutiga "
-"või otse võrku.\n"
 "\n"
-"Kui Teil on printer(eid), mis on ühendatud selle masinaga, ühendage palun "
-"see/need arvutiga ja lülitage sisse, et seda/neid saaks automaatselt "
-"tuvastada. Ka võrguprinter(id) peavad olema ühendatud ja sisse lülitatud.\n"
+"Nüüd on aeg seadistada %s ühendus.\n"
 "\n"
-"Pange tähele, et võrguprinterite automaattuvastus võtab rohkem aega kui "
-"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 \"Katkesta\", kui Te ei soovi "
-"praegu printeri(te) seadistamisega tegelda."
+"Vajutage jätkamiseks Olgu."
 
-#: ../../printer/printerdrake.pm_.c:307
-msgid "Auto-detect printers connected to this machine"
-msgstr "Selle masinaga ühendatud printerite automaattuvastus"
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "We are now going to configure the %s connection."
+msgstr "Nüüd on aeg seadistada %s ühendus."
 
-#: ../../printer/printerdrake.pm_.c:310
-msgid "Auto-detect printers connected directly to the local network"
-msgstr "Kohtvõrku ühendatud printerite automaattuvastus"
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Internet connection & configuration"
+msgstr "Internetiühenduse seadistamine"
 
-#: ../../printer/printerdrake.pm_.c:313
-msgid "Auto-detect printers connected to machines running Microsoft Windows"
-msgstr "Microsoft Windowsi masinatega ühendatud printerite automaattuvastus"
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Configure the connection"
+msgstr "Ühenduse seadistamine"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Disconnect"
+msgstr "Katkesta ühendus"
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "Connect"
+msgstr "Ühenda"
 
-#: ../../printer/printerdrake.pm_.c:329
+#: ../../network/netconnect.pm:1
+#, c-format
 msgid ""
 "\n"
-"Congratulations, your printer is now installed and configured!\n"
+"You can reconfigure your connection."
+msgstr ""
 "\n"
-"You can print using the \"Print\" command of your application (usually in "
-"the \"File\" menu).\n"
+"Saate seadistada ühenduse uuesti."
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid ""
 "\n"
-"If you want to add, remove, or rename a printer, or if you want to change "
-"the default option settings (paper input tray, printout quality, ...), "
-"select \"Printer\" in the \"Hardware\" section of the Mandrake Control "
-"Center."
+"You can connect to the Internet or reconfigure your connection."
 msgstr ""
 "\n"
-"Õnnitleme, Teie printer on nüüd paigaldatud ja seadistatud!\n"
+"Saate ühenduda Internetti või seadistada ühendus uuesti."
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "You are not currently connected to the Internet."
+msgstr "Hetkel ei ole Te Internetti ühendatud."
+
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid ""
 "\n"
-"Nüüd võite trükkida, kasutades rakendustes käsku \"Trüki\"\n"
-"(enamasti peitub see menüüs \"Fail\").\n"
+"You can disconnect or reconfigure your connection."
+msgstr ""
 "\n"
-"Kuii soovite printerit lisada, eemaldada või ümber nimetada või soovite "
-"muuta vaikeseadistusi (trükikvaliteet, paberisalv,...), valige Mandrake "
-"juhtimiskeskuse \"Riistvara\" sektsioonis \"Printer\"."
+"Saate ühenduse katkestada või uuesti seadistada."
 
-#: ../../printer/printerdrake.pm_.c:364 ../../printer/printerdrake.pm_.c:538
-#: ../../printer/printerdrake.pm_.c:742 ../../printer/printerdrake.pm_.c:978
-msgid "Printer auto-detection"
-msgstr "Printeri automaattuvastus"
+#: ../../network/netconnect.pm:1
+#, c-format
+msgid "You are currently connected to the Internet."
+msgstr "Hetkel olete Internetti ühendatud."
 
-#: ../../printer/printerdrake.pm_.c:385
+#: ../../network/network.pm:1
 #, c-format
-msgid ", network printer \"%s\", port %s"
-msgstr ", võrguprinter \"%s\", port %s"
+msgid "URL should begin with 'ftp:' or 'http:'"
+msgstr "URLi alguses peab olema 'ftp:' või 'http:'"
 
-#: ../../printer/printerdrake.pm_.c:387
+#: ../../network/network.pm:1
 #, c-format
-msgid ", printer \"%s\" on SMB/Windows server \"%s\""
-msgstr ", printer \"%s\" SMB/Windows serveril \"%s\""
+msgid "Proxy should be http://..."
+msgstr "Vahendaja peab olema kujul http://..."
 
-#: ../../printer/printerdrake.pm_.c:391
+#: ../../network/network.pm:1
 #, c-format
-msgid "Detected %s"
-msgstr "Tuvastati %s"
+msgid "FTP proxy"
+msgstr "FTP vahendaja"
 
-#: ../../printer/printerdrake.pm_.c:395 ../../printer/printerdrake.pm_.c:423
-#: ../../printer/printerdrake.pm_.c:440
+#: ../../network/network.pm:1
 #, c-format
-msgid "Printer on parallel port \\/*%s"
-msgstr "Printer paralleelpordis \\/*%s"
+msgid "HTTP proxy"
+msgstr "HTTP vahendaja"
 
-#: ../../printer/printerdrake.pm_.c:397 ../../printer/printerdrake.pm_.c:425
-#: ../../printer/printerdrake.pm_.c:443
+#: ../../network/network.pm:1
 #, c-format
-msgid "USB printer \\/*%s"
-msgstr "USB printer \\/*%s"
+msgid "Proxies configuration"
+msgstr "Vahendajate sätted"
 
-#: ../../printer/printerdrake.pm_.c:399
+#: ../../network/network.pm:1
 #, c-format
-msgid "Network printer \"%s\", port %s"
-msgstr "Võrguprinter \"%s\", port %s"
+msgid "Gateway address should be in format 1.2.3.4"
+msgstr "Lüüsi aadress peab olema kujul 1.2.3.4"
 
-#: ../../printer/printerdrake.pm_.c:401
+#: ../../network/network.pm:1
 #, c-format
-msgid "Printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "Printer \"%s\" SMB/Windows serveril \"%s\""
+msgid "DNS server address should be in format 1.2.3.4"
+msgstr "Nimeserveri aadress peab olema kujul 1.2.3.4"
 
-#: ../../printer/printerdrake.pm_.c:525 ../../printer/printerdrake.pm_.c:547
-msgid "Local Printer"
-msgstr "Kohalik printer"
+#: ../../network/network.pm:1
+#, c-format
+msgid "Gateway device"
+msgstr "Lüüsipoolne seade"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "Gateway (e.g. %s)"
+msgstr "Vaikelüüs (nt %s)"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "DNS server"
+msgstr "Nimeserver"
 
-#: ../../printer/printerdrake.pm_.c:526
+#: ../../network/network.pm:1
+#, c-format
 msgid ""
-"No local printer found! To manually install a printer enter a device name/"
-"file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
-"equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB "
-"printer: /dev/usb/lp1, ...)."
+"Please enter your host name.\n"
+"Your host name should be a fully-qualified host name,\n"
+"such as ``mybox.mylab.myco.com''.\n"
+"You may also enter the IP address of the gateway if you have one."
 msgstr ""
-"Kohalikku printerit ei leitud! Printeri paigaldamiseks käsitsi märkige "
-"sisendireale seadmenimi/failinimi (paralleelpordid: /dev/lp0, /dev/lp1..., "
-"mille vasteks teistes süsteemides on LPT1, LPT2...; esimene USB printer: /"
-"dev/usb/lp0, teine USB printer: /dev/usb/lp1...)"
+"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"
 
-#: ../../printer/printerdrake.pm_.c:530
-msgid "You must enter a device or file name!"
-msgstr "Seadme- või failinime sisestamine on kohustuslik!"
+#: ../../network/network.pm:1
+#, c-format
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0' (zeroes)."
+msgstr ""
+"Kiirus peab sisaldama sufiksit k, M või G (näiteks \"11M\"), või lisage "
+"piisavalt nulle."
 
-#: ../../printer/printerdrake.pm_.c:539
-msgid "No printer found!"
-msgstr "Printerit ei leitud!"
+#: ../../network/network.pm:1
+#, c-format
+msgid ""
+"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
+"frequency), or add enough '0' (zeroes)."
+msgstr ""
+"Sagedus peab sisaldama sufiksit k, M või G (näiteks \"2.46G\" - 2,46 GHz "
+"sagedusel), või lisage piisavalt nulle."
 
-#: ../../printer/printerdrake.pm_.c:548
-msgid "Available printers"
-msgstr "Saadaolevad printerid"
+#: ../../network/network.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "IP address should be in format 1.2.3.4"
+msgstr "IP aadress peab olema kujul 1.2.3.4"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "Start at boot"
+msgstr "Käivitub alglaadimisel"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "Network Hotplugging"
+msgstr "Võrgu kohene valmidus (hotplugging)"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "Track network card id (useful for laptops)"
+msgstr "Võrgukaadi id tuvastus (kasulik sülearvutite puhul)"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "(bootp/dhcp/zeroconf)"
+msgstr "(bootp/dhcp/zeroconf)"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "Automatic IP"
+msgstr "Automaatne IP"
 
-#: ../../printer/printerdrake.pm_.c:552
+#: ../../network/network.pm:1 ../../standalone/drakconnect:1
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Netmask"
+msgstr "Võrgumask"
+
+#: ../../network/network.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "IP address"
+msgstr "IP aadress"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid " (driver %s)"
+msgstr " (juhtprogramm %s)"
+
+#: ../../network/network.pm:1
+#, c-format
+msgid "Configuring network device %s"
+msgstr "Seadistame võrgukaardi %s"
+
+#: ../../network/network.pm:1
+#, c-format
 msgid ""
-"The following printer was auto-detected, if it is not the one you want to "
-"configure, enter a device name/file name in the input line"
+"Please enter the IP configuration for this machine.\n"
+"Each item should be entered as an IP address in dotted-decimal\n"
+"notation (for example, 1.2.3.4)."
 msgstr ""
-"Järgmine printer tuvastati automaatselt; kui see ei ole printer, mida "
-"soovite seadistada, kirjutage sisendireale seadmenimi/failinimi"
+"Palun andke IP parameetrid selle masina jaoks.\n"
+"Kõik read tuleb sisestada IP-aadressi kujul\n"
+"(näiteks 12.34.56.78)"
 
-#: ../../printer/printerdrake.pm_.c:553
+#: ../../network/network.pm:1
+#, c-format
 msgid ""
-"Here is a list of all auto-detected printers. Please choose the printer you "
-"want to set up or enter a device name/file name in the input line"
+"WARNING: this device has been previously configured to connect to the "
+"Internet.\n"
+"Simply accept to keep this device configured.\n"
+"Modifying the fields below will override this configuration."
 msgstr ""
-"See on loend kõigist automaatselt tuvastatud printeritest. Valige palun "
-"printer, mida soovite seadistada, või kirjutage sisendireale seadmenimi/"
-"failinimi"
+"HOIATUS: See seade on juba seadistatud Interneti jaoks.\n"
+"Valige lihtsalt Olgu, et sätteid mitte muuta.\n"
+"Allpool olevate väljade muutmine tühistab varasemad sätted."
 
-#: ../../printer/printerdrake.pm_.c:555
+#: ../../network/shorewall.pm:1
+#, c-format
 msgid ""
-"The following printer was auto-detected. The configuration of the printer "
-"will work fully automatically. If your printer was not correctly detected or "
-"if you prefer a customized printer configuration, turn on \"Manual "
-"configuration\"."
+"Warning! An existing firewalling configuration has been detected. You may "
+"need some manual fixes after installation."
 msgstr ""
-"Järgmine printer tuvastati automaatselt. Printeri seadistused peaksid "
-"toimima täiesti automaatselt. Kui printer tuvastati valesti või Te eelistate "
-"seadistusi korrigeerida, lülitage sisse \"Käsitsiseadistamine\"."
+"Hoiatus! Leiti olemasolevad tulemüüri sätted. Tõenäoliselt peaksite need "
+"hiljem üle vaatama."
+
+#
+#: ../../network/shorewall.pm:1
+#, c-format
+msgid "Firewalling configuration detected!"
+msgstr "Leitud tulemüüri sätted!"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Account Password"
+msgstr "Salasõna"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Account Login (user name)"
+msgstr "Kasutajatunnus"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Connection timeout (in sec)"
+msgstr "Ühenduse aegumine (sekundites)"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Connection speed"
+msgstr "Ühenduse kiirus"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Dialing mode"
+msgstr "Valimisviis"
+
+#: ../../network/tools.pm:1
+#, c-format
+msgid "Choose your country"
+msgstr "Valige riik"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Provider dns 2 (optional)"
+msgstr "DNS 2 (võib jätta tühjaks)"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Provider dns 1 (optional)"
+msgstr "DNS 1 (võib jätta tühjaks)"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Provider phone number"
+msgstr "Sissehelistamiskeskuse number"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Provider name (ex provider.net)"
+msgstr "Teenusepakkuja tunnus (näiteks minuisp.ee)"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Your personal phone number"
+msgstr "Teie telefoninumber"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Card IO_1"
+msgstr "Kaardi IO_1"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Card IO_0"
+msgstr "Kaardi IO_0"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Card IO"
+msgstr "Kaardi IO"
 
-#: ../../printer/printerdrake.pm_.c:556
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Card mem (DMA)"
+msgstr "Kaardi mälu (DMA)"
+
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Card IRQ"
+msgstr "Kaardi IRQ"
+
+#: ../../network/tools.pm:1
+#, c-format
+msgid "Please fill or check the field below"
+msgstr "Palun täitke allpool olev väli"
+
+#: ../../network/tools.pm:1
+#, c-format
+msgid "Connection Configuration"
+msgstr "Internetiühenduse sätted"
+
+#: ../../network/tools.pm:1
+#, c-format
 msgid ""
-"Here is a list of all auto-detected printers. Please choose the printer you "
-"want to set up. The configuration of the printer will work fully "
-"automatically. If your printer was not correctly detected or if you prefer a "
-"customized printer configuration, turn on \"Manual configuration\"."
+"The system doesn't seem to be connected to the Internet.\n"
+"Try to reconfigure your connection."
 msgstr ""
-"See on loend kõigist automaatselt tuvastatud printeritest. Valige palun "
-"printer, mida soovite rakendada. Printeri seadistused peaksid toimima "
-"täiesti automaatselt. Kui printer tuvastati valesti või Te eelistate selle "
-"seadistusi korrigeerida, lülitage sisse \"Käsitsiseadistamine\"."
+"Paistab, et süsteem ei ole Internetti ühendatud.\n"
+"Palun seadistage ühendus uuesti."
+
+#: ../../network/tools.pm:1
+#, c-format
+msgid "For security reasons, it will be disconnected now."
+msgstr "Turvakaalutlusel katkestan nüüd ühenduse."
+
+#: ../../network/tools.pm:1
+#, c-format
+msgid "The system is now connected to the Internet."
+msgstr "Süsteem on nüüd Internetti ühendatud."
 
-#: ../../printer/printerdrake.pm_.c:558
+#: ../../network/tools.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Testing your connection..."
+msgstr "Testime Teie ühendust..."
+
+#: ../../network/tools.pm:1
+#, c-format
+msgid "Do you want to try to connect to the Internet now?"
+msgstr "Kas soovite oma Internetiühendust proovida?"
+
+#: ../../network/tools.pm:1
+#, c-format
+msgid "Internet configuration"
+msgstr "Interneti sätted"
+
+#: ../../partition_table/raw.pm:1
+#, c-format
 msgid ""
-"Please choose the port where your printer is connected to or enter a device "
-"name/file name in the input line"
+"Something bad is happening on your drive. \n"
+"A test to check the integrity of data has failed. \n"
+"It means writing anything on the disk will end up with random, corrupted "
+"data."
 msgstr ""
-"Valige palun port, kuhu printer on ühendatud, või kirjutage sisendireale "
-"seadmenimi/failinimi"
+"Teie kõvakettal juhtub imelikke asju. \n"
+"Andmete pidevuse kontroll ebaõnnestus. \n"
+"See tähendab, et kettale kirjutamisel tekivad jamad."
 
-#: ../../printer/printerdrake.pm_.c:559
-msgid "Please choose the port where your printer is connected to."
-msgstr "Valige palun port, kuhu Teie printer on ühendatud."
+#: ../../printer/cups.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid " (Default)"
+msgstr " (Vaikimisi)"
+
+#: ../../printer/cups.pm:1
+#, c-format
+msgid "On CUPS server \"%s\""
+msgstr "CUPS serveril \"%s\""
+
+#: ../../printer/cups.pm:1 ../../printer/main.pm:1
+#, c-format
+msgid "Remote Printers"
+msgstr "Võrguprinterid"
+
+#: ../../printer/cups.pm:1 ../../printer/data.pm:1
+#, c-format
+msgid "CUPS"
+msgstr "CUPS"
+
+#: ../../printer/cups.pm:1
+#, c-format
+msgid "(on this machine)"
+msgstr "(sellel masinal)"
+
+#: ../../printer/cups.pm:1
+#, c-format
+msgid "(on %s)"
+msgstr "(masinal %s)"
+
+#: ../../printer/data.pm:1
+#, c-format
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - Tavaline UNIXi trükkimissüsteem"
+
+#: ../../printer/data.pm:1
+#, c-format
+msgid "LPRng"
+msgstr "LPRng"
+
+#: ../../printer/data.pm:1
+#, c-format
+msgid "LPRng - LPR New Generation"
+msgstr "LPRng - LPR, uus põlvkond"
+
+#: ../../printer/data.pm:1
+#, c-format
+msgid "LPD"
+msgstr "LPD"
+
+#: ../../printer/data.pm:1
+#, c-format
+msgid "LPD - Line Printer Daemon"
+msgstr "LDP - Otsetrükkimisdeemon"
+
+#: ../../printer/data.pm:1
+#, c-format
+msgid "PDQ"
+msgstr "PDQ"
+
+#: ../../printer/data.pm:1
+#, c-format
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - Trüki kohe"
+
+#: ../../printer/detect.pm:1
+#, c-format
+msgid "Unknown Model"
+msgstr "Tundmatu mudel"
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Unknown model"
+msgstr "Tundmatu mudel"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Host %s"
+msgstr "Masin %s"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Network %s"
+msgstr "Võrk %s"
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Interface \"%s\""
+msgstr "Liides \"%s\""
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Local network(s)"
+msgstr "Kohalik võrk"
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Raw printer (No driver)"
+msgstr "Toorprinter (draiverita)"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", using command %s"
+msgstr ", kasutades käsku %s"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid " on Novell server \"%s\", printer \"%s\""
+msgstr " Novelli serveril \"%s\", printer \"%s\""
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid " on SMB/Windows server \"%s\", share \"%s\""
+msgstr " SMB/Windowsi serveril \"%s\", jagatud printer \"%s\""
 
-#: ../../printer/printerdrake.pm_.c:561
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", TCP/IP host \"%s\", port %s"
+msgstr ", TCP/IP masinal \"%s\", port %s"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid " on LPD server \"%s\", printer \"%s\""
+msgstr " LPD serveril \"%s\", printer \"%s\""
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", printing to %s"
+msgstr ", trükkimine masinal %s"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", multi-function device"
+msgstr ", mitme funktsiooniga seade"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", multi-function device on HP JetDirect"
+msgstr ", mitme funktsiooniga seade HP JetDirectil"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", multi-function device on USB"
+msgstr ", mitme funktsiooniga seade USB-l"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", multi-function device on parallel port \\#%s"
+msgstr ", mitme funktsiooniga seade paralleelpordis \\#%s"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid ", USB printer"
+msgstr ", USB printer"
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid ", USB printer \\#%s"
+msgstr ", USB printer \\#%s"
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid " on parallel port \\#%s"
+msgstr " paralleelpordis \\#%s"
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Local Printers"
+msgstr "Kohalikud printerid"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Pipe job into a command"
+msgstr "Töö toru kaudu käsuks"
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Enter a printer device URI"
+msgstr "Printeri seadme URI"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Printer on NetWare server"
+msgstr "NetWare printserver"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Printer on SMB/Windows 95/98/NT server"
+msgstr "SMB/Windows 95/98/NT printserver"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Network printer (TCP/Socket)"
+msgstr "Võrguprinter (TCP/Socket)"
+
+#: ../../printer/main.pm:1 ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer on remote lpd server"
+msgstr "lpd printserver"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Printer on remote CUPS server"
+msgstr "CUPS printserver"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Remote printer"
+msgstr "Võrguprinter"
+
+#: ../../printer/main.pm:1
+#, c-format
+msgid "Local printer"
+msgstr "Kohalik printer"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Configuring applications..."
+msgstr "Rakenduste seadistamine..."
+
+#: ../../printer/printerdrake.pm:1 ../../standalone/printerdrake:1
+#, c-format
+msgid "Printerdrake"
+msgstr "Printerdrake"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Do you want to configure another printer?"
+msgstr "Kas soovite seadistada mõne muu printeri?"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Removing printer \"%s\"..."
+msgstr "Printeri \"%s\" eemaldamine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Do you really want to remove the printer \"%s\"?"
+msgstr "Kas tõesti eemaldada printer \"%s\"?"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Remove printer"
+msgstr "Eemalda printer"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Know how to use this printer"
+msgstr "Printeri kasutama õppimine"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Print test pages"
+msgstr "Trüki testlehekülg(i)"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
-"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
+"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr ""
-" (paralleelpordid: /dev/lp0, /dev/lp1..., millele teistes süsteemides vastab "
-"LPT1:, LPT2:...; esimene USB printer: /dev/usb/lp0, teine USB printer: /dev/"
-"usb/lp1...)"
+"Printeri \"%s\" eemaldamine StarOffice/OpenOffice.org/GIMP-ilt ebaõnnestus."
 
-#: ../../printer/printerdrake.pm_.c:565
-msgid "You must choose/enter a printer/device!"
-msgstr "Printeri/seadme valimine/sisestamine on kohustuslik!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
+"GIMP."
+msgstr "Printer \"%s\" eemaldati edukalt StarOffice/OpenOffice.org/GIMP-ilt."
 
-#: ../../printer/printerdrake.pm_.c:584
-msgid "Manual configuration"
-msgstr "Käsitsiseadistamine"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
+msgstr "Printeri eemaldamine StarOffice/OpenOffice.org/GIMP-ilt"
 
-#: ../../printer/printerdrake.pm_.c:633
-msgid "Remote lpd Printer Options"
-msgstr "Võrguprinteri (lpd) sätted"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
+msgstr "Eemalda StarOffice/OpenOffice.org/GIMP-ilt"
 
-#: ../../printer/printerdrake.pm_.c:634
-msgid ""
-"To use a remote lpd printer, you need to supply the hostname of the printer "
-"server and the printer name on that server."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr ""
-"Et kasutada teise masina lpd printerit, peate sisestama printserveri nime ja "
-"serveril kasutatava printeri nime."
+"Printeri \"%s\" lisamine StarOffice/OpenOffice.org/GIMP-ile ebaõnnestus."
 
-#: ../../printer/printerdrake.pm_.c:635
-msgid "Remote host name"
-msgstr "Kaugarvuti nimi"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
+msgstr "Printer \"%s\" lisati edukalt StarOffice/OpenOffice.org/GIMP-ile."
 
-#: ../../printer/printerdrake.pm_.c:636
-msgid "Remote printer name"
-msgstr "Võrguprinteri nimi"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
+msgstr "Printeri lisamine StarOffice/OpenOffice.org/GIMP-ile"
 
-#: ../../printer/printerdrake.pm_.c:639
-msgid "Remote host name missing!"
-msgstr "Kaugarvuti nimi puudub!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
+msgstr "Lisa printer StarOffice/OpenOffice.org/GIMP-ile"
 
-#: ../../printer/printerdrake.pm_.c:643
-msgid "Remote printer name missing!"
-msgstr "Võrguprinteri nimi puudub!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "The printer \"%s\" is set as the default printer now."
+msgstr "Printer \"%s\" on määratud vaikeprinteriks."
 
-#: ../../printer/printerdrake.pm_.c:665 ../../printer/printerdrake.pm_.c:1170
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Detected model: %s %s"
-msgstr "Tuvastati mudel: %s %s"
+msgid "Default printer"
+msgstr "Vaikeprinter"
 
-#: ../../printer/printerdrake.pm_.c:742 ../../printer/printerdrake.pm_.c:978
-msgid "Scanning network..."
-msgstr "Võrgu uurimine..."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Set this printer as the default"
+msgstr "Määra vaikeprinteriks"
 
-#: ../../printer/printerdrake.pm_.c:751 ../../printer/printerdrake.pm_.c:772
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ", printer \"%s\" on server \"%s\""
-msgstr ", printer \"%s\" serveril \"%s\""
+msgid "Printer options"
+msgstr "Printeri valikud"
 
-#: ../../printer/printerdrake.pm_.c:754 ../../printer/printerdrake.pm_.c:775
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Printer \"%s\" on server \"%s\""
-msgstr "Printer \"%s\" serveril \"%s\""
+msgid "Printer manufacturer, model"
+msgstr "Printeri tootja, mudel"
 
-#: ../../printer/printerdrake.pm_.c:795
-msgid "SMB (Windows 9x/NT) Printer Options"
-msgstr "SMB (Windows 9x/NT) printeri sätted"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer manufacturer, model, driver"
+msgstr "Printeri tootja, mudel, draiver"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Removing old printer \"%s\"..."
+msgstr "Vana printeri \"%s\" eemaldamine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer name, description, location"
+msgstr "Printeri nimi, kirjeldus, asukoht"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer connection type"
+msgstr "Printeri ühendusviis"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Learn how to use this printer"
+msgstr "Printeri kasutama õppimine"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Raw printer"
+msgstr "Toorprinter"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Do it!"
+msgstr "Nüüd!"
+
+#: ../../printer/printerdrake.pm:1 ../../standalone/drakTermServ:1
+#: ../../standalone/drakbackup:1 ../../standalone/drakbug:1
+#: ../../standalone/drakfont:1 ../../standalone/net_monitor:1
+#, c-format
+msgid "Close"
+msgstr "Sulge"
 
-#: ../../printer/printerdrake.pm_.c:796
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"To print to a SMB printer, you need to provide the SMB host name (Note! It "
-"may be different from its TCP/IP hostname!) and possibly the IP address of "
-"the print server, as well as the share name for the printer you wish to "
-"access and any applicable user name, password, and workgroup information."
+"Printer %s\n"
+"What do you want to modify on this printer?"
 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."
+"Printer %s\n"
+"Mida soovite muuta?"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Modify printer configuration"
+msgstr "Printeri seadistuste muutmine"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Add a new printer"
+msgstr "Lisa uus printer"
+
+#: ../../printer/printerdrake.pm:1 ../../standalone/drakconnect:1
+#, c-format
+msgid "Normal Mode"
+msgstr "Tavakasutus"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Change the printing system"
+msgstr "Trükkimissüsteemi muutmine"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer sharing"
+msgstr "Printeri jagamine"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "CUPS configuration"
+msgstr "CUPSi sätted"
 
-#: ../../printer/printerdrake.pm_.c:797
+#: ../../printer/printerdrake.pm:1
+#, 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)"
+
+#: ../../printer/printerdrake.pm:1
+#, 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."
+"The following printers are configured. Double-click on a printer to change "
+"its settings; to make it the default printer; or to view information about "
+"it."
 msgstr ""
-" Kui soovitud printer tuvastati automaatselt, valige see loendist ning "
-"lisage siis vajadusel kasutajatunnus, parool ja/või töögrupp."
+"Seadistatud on järgmised printerid. Topeltklõps printeril võimaldab muuta "
+"selle seadistusi, teha see vaikeprinteriks või vaadata selle infot."
 
-#: ../../printer/printerdrake.pm_.c:799
-msgid "SMB server host"
-msgstr "SMB serveri nimi"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"The following printers are configured. Double-click on a printer to change "
+"its settings; to make it the default printer; to view information about it; "
+"or to make a printer on a remote CUPS server available for Star Office/"
+"OpenOffice.org/GIMP."
+msgstr ""
+"Seadistatud on järgmised printerid. Topeltklõps printeril võimaldab muuta "
+"selle seadistusi, teha see vaikeprinteriks, vaadata selle infot või muuta "
+"CUPSi printserveri printer kättesaadavaks StarOffice/OpenOffice.org/GIMP-ile."
 
-#: ../../printer/printerdrake.pm_.c:800
-msgid "SMB server IP"
-msgstr "SMB serveri IP"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printing system: "
+msgstr "Trükkimissüsteem: "
 
-#: ../../printer/printerdrake.pm_.c:801
-msgid "Share name"
-msgstr "Jagatav printer"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Would you like to configure printing?"
+msgstr "Kas soovite trükkimist seadistada?"
 
-#: ../../printer/printerdrake.pm_.c:804
-msgid "Workgroup"
-msgstr "Töögrupp"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Preparing Printerdrake..."
+msgstr "Printerdrake ettevalmistamine..."
 
-#: ../../printer/printerdrake.pm_.c:806
-msgid "Auto-detected"
-msgstr "Automaatselt tuvastatud"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Checking installed software..."
+msgstr "Paigaldatud tarkvara kontroll..."
 
-#: ../../printer/printerdrake.pm_.c:816
-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:1
+#, c-format
+msgid "Installing Foomatic..."
+msgstr "Foomaticu paigaldamine..."
 
-#: ../../printer/printerdrake.pm_.c:820
-msgid "Samba share name missing!"
-msgstr "Samba jagatava printeri nimi puudub!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Failed to configure printer \"%s\"!"
+msgstr "Printeri \"%s\" seadistamine ebaõnnestus!"
 
-#: ../../printer/printerdrake.pm_.c:826
-msgid "SECURITY WARNING!"
-msgstr "TURVAHOIATUS!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Configuring printer \"%s\"..."
+msgstr "Printeri \"%s\" seadistamine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Reading printer data..."
+msgstr "Printeri andmete lugemine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Which printing system (spooler) do you want to use?"
+msgstr "Millist trükkimissüsteemi (spuulerit) soovite kasutada?"
 
-#: ../../printer/printerdrake.pm_.c:827
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Select Printer Spooler"
+msgstr "Printeri spuuleri valik"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Installing %s ..."
+msgstr "%s paigaldamine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Removing %s ..."
+msgstr "%s eemaldamine..."
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"You are about to set up printing to a Windows account with password. Due to "
-"a fault in the architecture of the Samba client software the password is put "
-"in clear text into the command line of the Samba client used to transmit the "
-"print job to the Windows server. So it is possible for every user on this "
-"machine to display the password on the screen by issuing commands as \"ps "
-"auxwww\".\n"
+"The printing system (%s) will not be started automatically when the machine "
+"is booted.\n"
 "\n"
-"We recommend to make use of one of the following alternatives (in all cases "
-"you have to make sure that only machines from your local network have access "
-"to your Windows server, for example by means of a firewall):\n"
+"It is possible that the automatic starting was turned off by changing to a "
+"higher security level, because the printing system is a potential point for "
+"attacks.\n"
 "\n"
-"Use a password-less account on your Windows server, as the \"GUEST\" account "
-"or a special account dedicated for printing. Do not remove the password "
-"protection from a personal account or the administrator account.\n"
+"Do you want to have the automatic starting of the printing system turned on "
+"again?"
+msgstr ""
+"Trükkimissüsteemi (%s) ei käivitata automaatselt arvuti alglaadimisel.\n"
 "\n"
-"Set up your Windows server to make the printer available under the LPD "
-"protocol. Then set up printing from this machine with the \"%s\" connection "
-"type in Printerdrake.\n"
+"On võimalik, et automaatkäivitus lülitati välja seoses kõrgema turvataseme "
+"valikuga, sest trükkimissüsteem on võimaliku rünnaku objekt.\n"
 "\n"
-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"
+"Kas soovite trükkimissüsteemi automaatkäivituse taas sisse lülitada?"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Starting the printing system at boot time"
+msgstr "Trükkimissüsteem käivitatakse alglaadimisel"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"You are about to install the printing system %s on a system running in the %"
+"s security level.\n"
 "\n"
-"Soovitame selle asemel kasutada üht alltoodud alternatiividest (igatahes "
-"tuleks teil tagada, et Teie Windowsi serverile pääsevad ligi ainult "
-"kohtvõrgu masinad; selleks sobib hästi kasutada tulemüüri):\n"
+"This printing system runs a daemon (background process) which waits for "
+"print jobs and handles them. This daemon is also accessable by remote "
+"machines through the network and so it is a possible point for attacks. "
+"Therefore only a few selected daemons are started by default in this "
+"security level.\n"
 "\n"
-"Kasutage Windowsi serveril paroolitut kontot, olgu selleks konto \"GUEST\" "
-"või spetsiaalne trükkimiseks kasutatav konto. Ärge eemaldage aga "
-"paroolikaitset oma erakontolt ega administraatori kontolt.\n"
+"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"
 "\n"
-"Seadistage Windowsi server nii, et printer oleks kasutatav LPD protokolliga. "
-"Seejärel seadistage trükkimine Teie masinas Printerdrakes ühendusviisiga \"%s"
-"\".\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. "
+"Seetõttu käivitatakse selle turvataseme puhul vaikimisi ainult mõned valitud "
+"deemonid.\n"
 "\n"
+"Kas soovite tõesti seadistada trükkimist sellel masinal?"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Installing a printing system in the %s security level"
+msgstr "Trükkimissüsteemi paigaldamine turvatasemel '%s'"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "paranoid"
+msgstr "paranoiline"
 
-#: ../../printer/printerdrake.pm_.c:837
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "high"
+msgstr "kõrge"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Restarting printing system..."
+msgstr "Trükkimissüsteemi taaskäivitamine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Configuration of a remote printer"
+msgstr "Võrguprinteri seadistamine"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"Set up your Windows server to make the printer available under the IPP "
-"protocol and set up printing from this machine with the \"%s\" connection "
-"type in Printerdrake.\n"
-"\n"
+"The network access was not running and could not be started. Please check "
+"your configuration and your hardware. Then try to configure your remote "
+"printer again."
 msgstr ""
-"Seadistage oma Windows-server nii, et printer oleks kättesaadav IPP "
-"protokolliga, ning seadistage trükkimine sellelt masinalt \"%s\" "
-"ühendustüübiga Printerdrakes.\n"
-"\n"
+"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_.c:840
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"Connect your printer to a Linux server and let your Windows machine(s) "
-"connect to it as a client.\n"
-"\n"
-"Do you really want to continue setting up this printer as you are doing now?"
+"The network configuration done during the installation cannot be started "
+"now. Please check whether the network is accessable after booting your "
+"system and correct the configuration using the Mandrake Control Center, "
+"section \"Network & Internet\"/\"Connection\", and afterwards set up the "
+"printer, also using the Mandrake Control Center, section \"Hardware\"/"
+"\"Printer\""
 msgstr ""
-"Ühendage oma printer Linux-serveri külge ja lubage oma Windowsi masina(te)l "
-"sellega ühendust võtta kliendina.\n"
-"\n"
-"Kas soovite tõesti jätkata selle printeri seadistamist?"
+"Paigalduse 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 Mandrake Juhtimiskeskuse sektsioonis \"Kohtvõrk ja "
+"Internet\"/\"Ühendus\", misjärel seadistage printer samuti Juhtimiskeskuses, "
+"aga sektsioonis \"Riistvara\"/\"Printer\". "
 
-#: ../../printer/printerdrake.pm_.c:911
-msgid "NetWare Printer Options"
-msgstr "NetWare printeri sätted"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Configure the network now"
+msgstr "Seadistada võrk otsekohe"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Go on without configuring the network"
+msgstr "Jätkata ilma võrku seadistamata"
 
-#: ../../printer/printerdrake.pm_.c:912
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"To print on a NetWare printer, you need to provide the NetWare print server "
-"name (Note! it may be different from its TCP/IP hostname!) as well as the "
-"print queue name for the printer you wish to access and any applicable user "
-"name and password."
+"You are going to configure a remote printer. This needs working network "
+"access, but your network is not configured yet. If you go on without network "
+"configuration, you will not be able to use the printer which you are "
+"configuring now. How do you want to proceed?"
 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."
+"Kavatsesite hakata seadistama võrguprinterit. Selleks läheb vaja töötavat "
+"võrguühendust, aga Teil on võrk veel seadistamata. Kui Te jätkate ilma võrku "
+"seadistamata, et ole Teil võimalik kasutada printerit, mida te tahate "
+"seadistada. Kuidas peaks nüüd edasi talitama?"
 
-#: ../../printer/printerdrake.pm_.c:913
-msgid "Printer Server"
-msgstr "Printserver"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Network functionality not configured"
+msgstr "Võrguvalmidus on seadistamata"
 
-#: ../../printer/printerdrake.pm_.c:914
-msgid "Print Queue Name"
-msgstr "Trükijärjekorra nimi"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Starting network..."
+msgstr "Võrgu käivitamine..."
 
-#: ../../printer/printerdrake.pm_.c:919
-msgid "NCP server name missing!"
-msgstr "NCP serveri nimi puudub!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Refreshing printer data..."
+msgstr "Printeri andmete värskendamine..."
 
-#: ../../printer/printerdrake.pm_.c:923
-msgid "NCP queue name missing!"
-msgstr "NCP järjekorra nimi puudub!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"You have transferred your former default printer (\"%s\"), Should it be also "
+"the default printer under the new printing system %s?"
+msgstr ""
+"Kandsite üle oma senise vaikeprinteri (\"%s\"). Kas see peaks olema "
+"vaikeprinter ka uue trükkimissüsteemi %s puhul?"
 
-#: ../../printer/printerdrake.pm_.c:987 ../../printer/printerdrake.pm_.c:1007
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ", host \"%s\", port %s"
-msgstr ", masin \"%s\", port %s"
+msgid "Transfer printer configuration"
+msgstr "Printeri sätete ülekandmine"
 
-#: ../../printer/printerdrake.pm_.c:990 ../../printer/printerdrake.pm_.c:1010
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Host \"%s\", port %s"
-msgstr "Masin \"%s\", port %s"
+msgid "Transferring %s..."
+msgstr "%s ülekandmine..."
 
-#: ../../printer/printerdrake.pm_.c:1030
-msgid "TCP/Socket Printer Options"
-msgstr "TCP/Socket printeri sätted"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "New printer name"
+msgstr "Uus printeri nimi"
 
-#: ../../printer/printerdrake.pm_.c:1032
+#: ../../printer/printerdrake.pm:1
+#, 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) into the input fields."
+"The printer \"%s\" already exists,\n"
+"do you really want to overwrite its configuration?"
 msgstr ""
-"Valige loendist üks automaatselt tuvastatud printeritest või kirjutage "
-"sisendiväljale masinanimi või IP ja kui teate, ka pordi number (vaikimisi on "
-"see 9100)."
+"Printer \"%s\" on juba olemas,\n"
+"kas tõesti kirjutada selle sätted üle?"
 
-#: ../../printer/printerdrake.pm_.c:1033
+#: ../../printer/printerdrake.pm:1
+#, 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:1
+#, c-format
+msgid "Transfer"
+msgstr "Kanna üle"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"To print to a TCP or socket printer, you need to provide the host name or IP "
-"of the printer and optionally the port number (default is 9100). On HP "
-"JetDirect servers the port number is usually 9100, on other servers it can "
-"vary. See the manual of your hardware."
+"A printer named \"%s\" already exists under %s. \n"
+"Click \"Transfer\" to overwrite it.\n"
+"You can also type a new name or skip this printer."
 msgstr ""
-"Et kasutada TCP/Socket printerit, tuleb määrata printeri masinanimi või IP "
-"ning kui teate, ka pordi number (vaikimisi on see 9100). HP JetDirect "
-"serveritel on pordi number tavaliselt 9100, teistel serveritel võib see olla "
-"teistsugune. Kontrollige seda oma riistvara käsiraamatust."
+"Printer nimega \"%s\" on juba %s olemas. \n"
+"Vajutage \"Kanna üle\" selle ülekirjutamiseks.\n"
+"Te võite küll ka sisestada uue nime või selle printeri vahele jätta."
 
-#: ../../printer/printerdrake.pm_.c:1037
-msgid "Printer host name or IP missing!"
-msgstr "Printeri masinanimi või IP puudub!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Do not transfer printers"
+msgstr "Ära kanna printereid üle"
 
-#: ../../printer/printerdrake.pm_.c:1059
-msgid "Printer host name or IP"
-msgstr "Printeri masinanimi või IP"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"\n"
+"Mark the printers which you want to transfer and click \n"
+"\"Transfer\"."
+msgstr ""
+"\n"
+"Märkige printer(id), mida soovite üle kanda, ning vajutage \n"
+"\"Kanna üle\"."
 
-#: ../../printer/printerdrake.pm_.c:1107 ../../printer/printerdrake.pm_.c:1109
-msgid "Printer Device URI"
-msgstr "Printeri seadme URI"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"\n"
+"Also printers configured with the PPD files provided by their manufacturers "
+"or with native CUPS drivers cannot be transferred."
+msgstr ""
+"\n"
+"Üle kanda ei saa ka printereid, mis on seadistatud nende tootjate pakutud "
+"PPD failidega või loomupäraste CUPS draiveritega."
 
-#: ../../printer/printerdrake.pm_.c:1108
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"You can specify directly the URI to access the printer. The URI must fulfill "
-"either the CUPS or the Foomatic specifications. Note that not all URI types "
-"are supported by all the spoolers."
+"In addition, queues not created with this program or \"foomatic-configure\" "
+"cannot be transferred."
 msgstr ""
-"Siin saab määrata konkreetselt 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."
+"Lisaks sellele ei saa üle kanda järjekordi, mis on loodud käesoleva "
+"programmi või \"foomatic-configure\" poolt."
 
-#: ../../printer/printerdrake.pm_.c:1123
-msgid "A valid URI must be entered!"
-msgstr "Sisestama peab sobiva URI!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "LPD and LPRng do not support IPP printers.\n"
+msgstr "LPD ja LPRng ei toeta IPP printereid.\n"
 
-#: ../../printer/printerdrake.pm_.c:1463
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"Every printer needs a name (for example \"printer\"). The Description and "
-"Location fields do not need to be filled in. They are comments for the users."
+"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
+"printers.\n"
 msgstr ""
-"Iga printer vajab nime (näiteks \"printer\"). Kirjelduse ja asukoha välja ei "
-"ole vaja tingimata täita, need on vaid kommentaarid kasutajatele."
+"PDQ toetab ainult kohalikke printereid, võrguprintereid (LPD) ning Socket/"
+"TCP printereid.\n"
 
-#: ../../printer/printerdrake.pm_.c:1464
-msgid "Name of printer"
-msgstr "Printeri nimi"
+#: ../../printer/printerdrake.pm:1
+#, 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 "
+"andmeid suvalise vormiga käskudena.\n"
 
-#: ../../printer/printerdrake.pm_.c:1465 ../../standalone/harddrake2_.c:38
-msgid "Description"
-msgstr "Kirjeldus"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"You can copy the printer configuration which you have done for the spooler %"
+"s to %s, your current spooler. All the configuration data (printer name, "
+"description, location, connection type, and default option settings) is "
+"overtaken, but jobs will not be transferred.\n"
+"Not all queues can be transferred due to the following reasons:\n"
+msgstr ""
+"Teil on võimalus kopeerida printeri sätted, mida määrasite spuulerile %s, "
+"Teie praegusele spuulerile %s. Üle kantakse kõik sätete andmed (printeri "
+"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_.c:1466
-msgid "Location"
-msgstr "Asukoht"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"Your printer was configured automatically to give you access to the photo "
+"card drives from your PC. Now you can access your photo cards using the "
+"graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> "
+"\"MTools File Manager\") or the command line utilities \"mtools\" (enter "
+"\"man mtools\" on the command line for more info). You find the card's file "
+"system under the drive letter \"p:\", or subsequent drive letters when you "
+"have more than one HP printer with photo card drives. In \"MtoolsFM\" you "
+"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 "
+"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 "
+"leiduvaid tähti vahetades."
 
-#: ../../printer/printerdrake.pm_.c:1478 ../../printer/printerdrake.pm_.c:1599
-msgid "Reading printer database..."
-msgstr "Printeri andmebaasi lugemine..."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"Your multi-function device was configured automatically to be able to scan. "
+"Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the "
+"scanner when you have more than one) from the command line or with the "
+"graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, "
+"you can also scan by choosing the appropriate point in the \"File\"/\"Acquire"
+"\" menu. Call also \"man scanimage\" on the command line to get more "
+"information.\n"
+"\n"
+"Do not use \"scannerdrake\" for this device!"
+msgstr ""
+"Mitme funktsiooniga seade on automaatselt seadistatud ja suudab ka "
+"skaneerida. Nüüd võite skaneerida \"scanimage\" abil (\"scanimage -d hp:%s\" "
+"skänneri määramiseks, kui Teil on neid mitu) käsurealt või graafiliste "
+"liideste \"xscanimage\" või \"xsane\" vahendusel. Kui kasutate GIMPi, võite "
+"skaneerida ka menüükäsuga \"Fail\"/\"Hangi\". Kui soovite rohkem infot, "
+"andke käsureal korraldus \"man scanimage\".\n"
+"\n"
+"Ärge selle seadme puhul \"scannerdraket\" kasutage!"
 
-#: ../../printer/printerdrake.pm_.c:1482
-msgid "Preparing printer database..."
-msgstr "Printeri andmebaasi ettevalmistamine..."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printing test page(s)..."
+msgstr "Trükitakse testlehekülg(i)..."
 
-#: ../../printer/printerdrake.pm_.c:1578
-msgid "Your printer model"
-msgstr "Teie printeri mudel"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Print option list"
+msgstr "Trükkimisvalikute loend"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printing on the printer \"%s\""
+msgstr "Trükkimine printeril \"%s\""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printing/Photo Card Access on \"%s\""
+msgstr "Trükkimine/fotokaartide ligipääs seadmel \"%s\""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printing/Scanning on \"%s\""
+msgstr "Trükkimine/skaneerimine seadmel \"%s\""
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printing/Scanning/Photo Cards on \"%s\""
+msgstr "Trükkimine/skaneerimine/fotokaardid seadmel \"%s\""
 
-#: ../../printer/printerdrake.pm_.c:1579
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"Printerdrake has compared the model name resulting from the printer auto-"
-"detection with the models listed in its printer database to find the best "
-"match. This choice can be wrong, especially when your printer is not listed "
-"at all in the database. So check whether the choice is correct and click "
-"\"The model is correct\" if so and if not, click \"Select model manually\" "
-"so that you can choose your printer model manually on the next screen.\n"
-"\n"
-"For your printer Printerdrake has found:\n"
+"To know about the options available for the current printer read either the "
+"list shown below or click on the \"Print option list\" button.%s%s\n"
 "\n"
-"%s"
 msgstr ""
-"Printerdrake võrdles printeri automaattuvastusel leitud mudelinime oma "
-"printeri 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 "
-"iseseisvalt.\n"
+"Seda, millised valikud on saadaval praeguse printeri puhul, saab teada kas "
+"allpool seisvast loendist või pärast vajutust nupule \"Trükkimisvalikute "
+"loend\".%s%s\n"
 "\n"
-"Teie printeri puhul leidis Printerdrake:\n"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
 "\n"
-"%s"
+"The \"%s\" and \"%s\" commands also allow to modify the option settings for "
+"a particular printing job. Simply add the desired settings to the command "
+"line, e. g. \"%s <file>\".\n"
+msgstr ""
+"\n"
+"Käsud \"%s\" ja \"%s\" võimaldavad samuti muuta konkreetse trükkimistöö "
+"valikuid. Selleks tuleb vaid lisada soovitud sätted käsureale, näiteks \"%s "
+"<fail>\".\n"
 
-#: ../../printer/printerdrake.pm_.c:1584 ../../printer/printerdrake.pm_.c:1587
-msgid "The model is correct"
-msgstr "Mudel õige"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"You can also use the graphical interface \"xpdq\" for setting options and "
+"handling printing jobs.\n"
+"If you are using KDE as desktop environment you have a \"panic button\", an "
+"icon on the desktop, labeled with \"STOP Printer!\", which stops all print "
+"jobs immediately when you click it. This is for example useful for paper "
+"jams.\n"
+msgstr ""
+"Valikute seadistamiseks ja trükkimistööde haldamiseks saab kasutada ka "
+"graafilist liidest \"xpdq\".\n"
+"Kui kasutate töölauakeskkonnana KDE-d, on Teil töölaual \"paanikanupp\", "
+"ikoon nimetusega \"PEATA printer!\", millele klõpsates peatatakse otsekohe "
+"kõik trükkimistööd. See on kasulik näiteks paberiummistuste esinemisel.\n"
 
-#: ../../printer/printerdrake.pm_.c:1585 ../../printer/printerdrake.pm_.c:1586
-#: ../../printer/printerdrake.pm_.c:1589
-msgid "Select model manually"
-msgstr "Mudeli valik käsitsi"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"This command you can also use in the \"Printing command\" field of the "
+"printing dialogs of many applications. But here do not supply the file name "
+"because the file to print is provided by the application.\n"
+msgstr ""
+"Seda käsku saab kasutada ka paljude rakenduste trükkimisdialoogi väljal "
+"\"Trükkimiskäsk\". Kuid seal ei ole vaja kirjutada failinime, sest selle "
+"annab rakendus ise.\n"
 
-#: ../../printer/printerdrake.pm_.c:1606
-msgid "Printer model selection"
-msgstr "Printeri mudeli valik"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\" or \"%s <file>\".\n"
+msgstr ""
+"Faili trükkimiseks käsurealt (terminaliaken) kasutage käsku \"%s <fail>\" "
+"või \"%s <fail>\".\n"
 
-#: ../../printer/printerdrake.pm_.c:1607
-msgid "Which printer model do you have?"
-msgstr "Milline on Teie printeri mudel?"
+#: ../../printer/printerdrake.pm:1
+#, 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\"."
 
-#: ../../printer/printerdrake.pm_.c:1608
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
 "\n"
+"The \"%s\" command also allows to modify the option settings for a "
+"particular printing job. Simply add the desired settings to the command "
+"line, e. g. \"%s <file>\". "
+msgstr ""
 "\n"
-"Please check whether Printerdrake did the auto-detection of your printer "
-"model correctly. Search the correct model in the list when the cursor is "
-"standing on a wrong model or on \"Raw printer\"."
+"Käsk \"%s\" võimaldab muuta ka konkreetse trükkimistöö valikuid. Selleks "
+"lisage vaid soovitud valik käsureale, nt \"%s <fail>\". "
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) use the command \"%s "
+"<file>\".\n"
 msgstr ""
+"Faili trükkimiseks käsurealt (terminaliaken) kasutage käsku \"%s <fail>\".\n"
+
+#: ../../printer/printerdrake.pm:1
+#, 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"
 "\n"
-"Kontrollige palun, kas Printerdrake automaattuvastus määras Teie printeri "
-"mudeli õigesti. Valige loendist õige mudel, kui kursor seisab vale mudeli "
-"või \"toorprinteri\" kohal."
 
-#: ../../printer/printerdrake.pm_.c:1611
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"If your printer is not listed, choose a compatible (see printer manual) or a "
-"similar one."
+"These commands you can also use in the \"Printing command\" field of the "
+"printing dialogs of many applications, but here do not supply the file name "
+"because the file to print is provided by the application.\n"
 msgstr ""
-"Kui Teie printerit loendis ei leidu, valige mõni ühilduv (vaadake printeri "
-"käsiraamatust) või sarnane."
+"Neid käske saab kasutada ka paljude rakenduste trükkimisdialoogi väljal "
+"\"Trükkimiskäsk\", kuid seal pole vaja kirjutada failinime, sest selle annab "
+"rakendus ise.\n"
 
-#: ../../printer/printerdrake.pm_.c:1697
-msgid "OKI winprinter configuration"
-msgstr "OKI winprinteri sätted"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"To print a file from the command line (terminal window) you can either use "
+"the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or "
+"\"kprinter <file>\". The graphical tools allow you to choose the printer and "
+"to modify the option settings easily.\n"
+msgstr ""
+"Faili trükkimiseks käsurealt (terminaliaknas) võib kasutada kas käsku \"%s "
+"<fail>\" või graafilist trükkimisvahendit: \"xpp <fail>\" või \"kprinter "
+"<fail>\". Graafilised vahendid võimaldavad hõlpsamalt valida printerit ja "
+"muuta valikuid.\n"
 
-#: ../../printer/printerdrake.pm_.c:1698
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Did it work properly?"
+msgstr "Kas kõik oli korras?"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"You are configuring an OKI laser winprinter. These printers\n"
-"use a very special communication protocol and therefore they work only when "
-"connected to the first parallel port. When your printer is connected to "
-"another port or to a print server box please connect the printer to the "
-"first parallel port before you print a test page. Otherwise the printer will "
-"not work. Your connection type setting will be ignored by the driver."
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
 msgstr ""
-"Asusite seadistama OKI laserprinterit (winprinter). Need\n"
-"kasutavad väga omapärast sideprotokolli ja töötavad seepärast ainult "
-"esimeses paralleelpordis. Kui Teie printer on ühendatud mõnda muusse porti "
-"või printserveriga, ühendage palun see esimese paralleelpordiga, enne kui "
-"trükite testlehekülje. Vastasel juhul printer lihtsalt ei tööta ja draiver "
-"eirab Teie määratud ühendusviisi."
+"Testlehekülg on saadetud printerile.\n"
+"Nüüd võib minna natuke aega, enne kui printer alustab.\n"
 
-#: ../../printer/printerdrake.pm_.c:1718 ../../printer/printerdrake.pm_.c:1745
-msgid "Lexmark inkjet configuration"
-msgstr "Lexmark inkjeti sätted"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"Test page(s) have been sent to the printer.\n"
+"It may take some time before the printer starts.\n"
+"Printing status:\n"
+"%s\n"
+"\n"
+msgstr ""
+"Testlehekülg on saadetud printerile.\n"
+"Nüüd võib minna natuke aega, enne kui printer alustab.\n"
+"Staatus:\n"
+"%s\n"
+"\n"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Do not print any test page"
+msgstr "Ära trüki ühtegi testlehekülge"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Photo test page"
+msgstr "Fototestlehekülg"
 
-#: ../../printer/printerdrake.pm_.c:1719
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Alternative test page (A4)"
+msgstr "Alternatiivne testlehekülg (A4)"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Alternative test page (Letter)"
+msgstr "Alternatiivne testlehekülg (Letter)"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Standard test page"
+msgstr "Tavaline testlehekülg"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Print"
+msgstr "Trüki"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "No test pages"
+msgstr "Ära trüki"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"The inkjet printer drivers provided by Lexmark only support local printers, "
-"no printers on remote machines or print server boxes. Please connect your "
-"printer to a local port or configure it on the machine where it is connected "
-"to."
+"Please select the test pages you want to print.\n"
+"Note: the photo test page can take a rather long time to get printed and on "
+"laser printers with too low memory it can even not come out. In most cases "
+"it is enough to print the standard test page."
 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."
+"Valige palun testleheküljed, mida trükkida.\n"
+"Märkus: fototesti trükkimine võib võtta üsna kaua aega ning liiga vähese "
+"mäluga laserprinteritel ei pruugi see üldse õnnestuda. Enamasti peaks "
+"piisama tavalise testlehekülje trükkimisest."
 
-#: ../../printer/printerdrake.pm_.c:1746
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Test pages"
+msgstr "Testleheküljed"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"To be able to print with your Lexmark inkjet and this configuration, you "
-"need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
-"com/). Click on the \"Drivers\" link. Then choose your model and afterwards "
-"\"Linux\" as operating system. The drivers come as RPM packages or shell "
-"scripts with interactive graphical installation. You do not need to do this "
-"configuration by the graphical frontends. Cancel directly after the license "
-"agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and "
-"adjust the head alignment settings with this program."
+"Do you want to set this printer (\"%s\")\n"
+"as the default printer?"
 msgstr ""
-"Trükkimiseks Lexmarki inkjetil antud seadistusega läheb Teil tarvis Lexmarki "
-"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 sätteid."
+"Kas soovite määrata selle printeri (\"%s\")\n"
+"vaikeprinteriks?"
 
-#: ../../printer/printerdrake.pm_.c:1749
-msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
-msgstr "GDI laserprinter Zenographics ZJ-Stream vorminguga"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Option %s out of range!"
+msgstr "Võti %s väljub piiridest!"
 
-#: ../../printer/printerdrake.pm_.c:1750
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Option %s must be a number!"
+msgstr "Võti %s peab olema arv!"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Option %s must be an integer number!"
+msgstr "Võti %s peab olema täisarv!"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"Printer default settings\n"
+"\n"
+"You should make sure that the page size and the ink type/printing mode (if "
+"available) and also the hardware configuration of laser printers (memory, "
+"duplex unit, extra trays) are set correctly. Note that with a very high "
+"printout quality/resolution printing can get substantially slower."
+msgstr ""
+"Printeri vaikesätted\n"
+"\n"
+"Kontrollige palun, et lehekülje suurus ja tinditüüp/trükiresiim (kui "
+"võimalik), samuti laserprinterite riistvaralised sätted (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:1
+#, c-format
 msgid ""
 "Your printer belongs to the group of GDI laser printers (winprinters) sold "
 "by different manufacturers which uses the Zenographics ZJ-stream raster "
@@ -8860,1241 +11906,1844 @@ msgstr ""
 "Esimese käsu võib anda suvaline kasutaja, teise andmiseks on vaja olla "
 "administraator. Pärast seda võite normaalselt trükkida.\n"
 
-#: ../../printer/printerdrake.pm_.c:1972
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
+msgstr "GDI laserprinter Zenographics ZJ-Stream vorminguga"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"To be able to print with your Lexmark inkjet and this configuration, you "
+"need the inkjet printer drivers provided by Lexmark (http://www.lexmark."
+"com/). Click on the \"Drivers\" link. Then choose your model and afterwards "
+"\"Linux\" as operating system. The drivers come as RPM packages or shell "
+"scripts with interactive graphical installation. You do not need to do this "
+"configuration by the graphical frontends. Cancel directly after the license "
+"agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and "
+"adjust the head alignment settings with this program."
+msgstr ""
+"Trükkimiseks Lexmarki inkjetil antud seadistusega läheb Teil tarvis Lexmarki "
+"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 sätteid."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Lexmark inkjet configuration"
+msgstr "Lexmark inkjeti sätted"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"The inkjet printer drivers provided by Lexmark only support local printers, "
+"no printers on remote machines or print server boxes. Please connect your "
+"printer to a local port or configure it on the machine where it is connected "
+"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."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"You are configuring an OKI laser winprinter. These printers\n"
+"use a very special communication protocol and therefore they work only when "
+"connected to the first parallel port. When your printer is connected to "
+"another port or to a print server box please connect the printer to the "
+"first parallel port before you print a test page. Otherwise the printer will "
+"not work. Your connection type setting will be ignored by the driver."
+msgstr ""
+"Asusite seadistama OKI laserprinterit (winprinter). Need\n"
+"kasutavad väga omapärast sideprotokolli ja töötavad seepärast ainult "
+"esimeses paralleelpordis. Kui Teie printer on ühendatud mõnda muusse porti "
+"või printserveriga, ühendage palun see esimese paralleelpordiga, enne kui "
+"trükite testlehekülje. Vastasel juhul printer lihtsalt ei tööta ja draiver "
+"eirab Teie määratud ühendusviisi."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "OKI winprinter configuration"
+msgstr "OKI winprinteri sätted"
+
+#: ../../printer/printerdrake.pm:1
+#, 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."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"Printer default settings\n"
 "\n"
-"You should make sure that the page size and the ink type/printing mode (if "
-"available) and also the hardware configuration of laser printers (memory, "
-"duplex unit, extra trays) are set correctly. Note that with a very high "
-"printout quality/resolution printing can get substantially slower."
+"\n"
+"Please check whether Printerdrake did the auto-detection of your printer "
+"model correctly. Find the correct model in the list when a wrong model or "
+"\"Raw printer\" is highlighted."
 msgstr ""
-"Printeri vaikesätted\n"
 "\n"
-"Kontrollige palun, et lehekülje suurus ja tinditüüp/trükiresiim (kui "
-"võimalik), samuti laserprinterite riistvaralised sätted (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."
+"\n"
+"Kontrollige palun, kas Printerdrake automaattuvastus määras Teie printeri "
+"mudeli õigesti. Valige loendist õige mudel, kui kursor seisab vale mudeli "
+"või \"toorprinteri\" kohal."
 
-#: ../../printer/printerdrake.pm_.c:1981
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Option %s must be an integer number!"
-msgstr "Võti %s peab olema täisarv!"
+msgid "Which printer model do you have?"
+msgstr "Milline on Teie printeri mudel?"
 
-#: ../../printer/printerdrake.pm_.c:1985
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Option %s must be a number!"
-msgstr "Võti %s peab olema arv!"
+msgid "Printer model selection"
+msgstr "Printeri mudeli valik"
 
-#: ../../printer/printerdrake.pm_.c:1989
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Option %s out of range!"
-msgstr "Võti %s väljub piiridest!"
+msgid "Reading printer database..."
+msgstr "Printeri andmebaasi lugemine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Select model manually"
+msgstr "Mudeli valik käsitsi"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "The model is correct"
+msgstr "Mudel õige"
 
-#: ../../printer/printerdrake.pm_.c:2028
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"Do you want to set this printer (\"%s\")\n"
-"as the default printer?"
+"Printerdrake has compared the model name resulting from the printer auto-"
+"detection with the models listed in its printer database to find the best "
+"match. This choice can be wrong, especially when your printer is not listed "
+"at all in the database. So check whether the choice is correct and click "
+"\"The model is correct\" if so and if not, click \"Select model manually\" "
+"so that you can choose your printer model manually on the next screen.\n"
+"\n"
+"For your printer Printerdrake has found:\n"
+"\n"
+"%s"
 msgstr ""
-"Kas soovite määrata selle printeri (\"%s\")\n"
-"vaikeprinteriks?"
+"Printerdrake võrdles printeri automaattuvastusel leitud mudelinime oma "
+"printeri 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 "
+"iseseisvalt.\n"
+"\n"
+"Teie printeri puhul leidis Printerdrake:\n"
+"\n"
+"%s"
 
-#: ../../printer/printerdrake.pm_.c:2051
-msgid "Test pages"
-msgstr "Testleheküljed"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Your printer model"
+msgstr "Teie printeri mudel"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Preparing printer database..."
+msgstr "Printeri andmebaasi ettevalmistamine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Location"
+msgstr "Asukoht"
+
+#: ../../printer/printerdrake.pm:1 ../../standalone/harddrake2:1
+#, c-format
+msgid "Description"
+msgstr "Kirjeldus"
 
-#: ../../printer/printerdrake.pm_.c:2052
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Name of printer"
+msgstr "Printeri nimi"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"Please select the test pages you want to print.\n"
-"Note: the photo test page can take a rather long time to get printed and on "
-"laser printers with too low memory it can even not come out. In most cases "
-"it is enough to print the standard test page."
+"Every printer needs a name (for example \"printer\"). The Description and "
+"Location fields do not need to be filled in. They are comments for the users."
 msgstr ""
-"Valige palun testleheküljed, mida trükkida.\n"
-"Märkus: fototesti trükkimine võib võtta üsna kaua aega ning liiga vähese "
-"mäluga laserprinteritel ei pruugi see üldse õnnestuda. Enamasti peaks "
-"piisama tavalise testlehekülje trükkimisest."
+"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_.c:2056
-msgid "No test pages"
-msgstr "Ära trüki"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Enter Printer Name and Comments"
+msgstr "Sisestage printeri nimi ja kommentaar"
 
-#: ../../printer/printerdrake.pm_.c:2057
-msgid "Print"
-msgstr "Trüki"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Making printer port available for CUPS..."
+msgstr "Printer tehakse CUPS-ile kättesaadavaks"
 
-#: ../../printer/printerdrake.pm_.c:2114
-msgid "Standard test page"
-msgstr "Tavaline testlehekülg"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Photo memory card access on your HP multi-function device"
+msgstr "Digifoto mälukaardi lugeja Teie HP mitmefunktsionaalsel seadmel"
 
-#: ../../printer/printerdrake.pm_.c:2117
-msgid "Alternative test page (Letter)"
-msgstr "Alternatiivne testlehekülg (Letter)"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Scanning on your HP multi-function device"
+msgstr "Skaneerimine Teie HP mitmefunktsionaalsel seadmel"
 
-#: ../../printer/printerdrake.pm_.c:2120
-msgid "Alternative test page (A4)"
-msgstr "Alternatiivne testlehekülg (A4)"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Installing mtools packages..."
+msgstr "Paketi \"mtools\" paigaldamine..."
 
-#: ../../printer/printerdrake.pm_.c:2122
-msgid "Photo test page"
-msgstr "Fototestlehekülg"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Installing SANE packages..."
+msgstr "SANE pakettide paigaldamine..."
 
-#: ../../printer/printerdrake.pm_.c:2126
-msgid "Do not print any test page"
-msgstr "Ära trüki ühtegi testlehekülge"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Checking device and configuring HPOJ..."
+msgstr "Kontrollin ja häälestan HPOJ.."
 
-#: ../../printer/printerdrake.pm_.c:2134 ../../printer/printerdrake.pm_.c:2285
-msgid "Printing test page(s)..."
-msgstr "Trükitakse testlehekülg(i)..."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Installing HPOJ package..."
+msgstr "HPOJ pakettide paigaldamine..."
 
-#: ../../printer/printerdrake.pm_.c:2159
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"Test page(s) have been sent to the printer.\n"
-"It may take some time before the printer starts.\n"
-"Printing status:\n"
-"%s\n"
-"\n"
+"Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
+"LaserJet 1100/1200/1220/3200/3300 with scanner, Sony IJP-V100), an HP "
+"PhotoSmart or an HP LaserJet 2200?"
 msgstr ""
-"Testlehekülg on saadetud printerile.\n"
-"Nüüd võib minna natuke aega, enne kui printer alustab.\n"
-"Staatus:\n"
-"%s\n"
-"\n"
+"Kas Teie printer on mitmefunktsionaalne HP või Sony toode (OfficeJet, PSC, "
+"LaserJet 1100/1200/1220/3200/3300 with scanner, Sony IJP-V100) või vahest HP "
+"PhotoSmart ehk siis HP LaserJet 2200?"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "A command line must be entered!"
+msgstr "Sisestama peab käsurea!"
 
-#: ../../printer/printerdrake.pm_.c:2163
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Command line"
+msgstr "Käsurida"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"Test page(s) have been sent to the printer.\n"
-"It may take some time before the printer starts.\n"
+"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:1
+#, c-format
+msgid "Pipe into command"
+msgstr "Töö toru kaudu käsuks"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Detected model: %s %s"
+msgstr "Tuvastati mudel: %s %s"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "A valid URI must be entered!"
+msgstr "Sisestama peab sobiva URI!"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer Device URI"
+msgstr "Printeri seadme URI"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"You can specify directly the URI to access the printer. The URI must fulfill "
+"either the CUPS or the Foomatic specifications. Note that not all URI types "
+"are supported by all the spoolers."
 msgstr ""
-"Testlehekülg on saadetud printerile.\n"
-"Nüüd võib minna natuke aega, enne kui printer alustab.\n"
+"Siin saab määrata konkreetselt 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."
 
-#: ../../printer/printerdrake.pm_.c:2170
-msgid "Did it work properly?"
-msgstr "Kas kõik oli korras?"
+#: ../../printer/printerdrake.pm:1 ../../standalone/harddrake2:1
+#, c-format
+msgid "Port"
+msgstr "Port"
 
-#: ../../printer/printerdrake.pm_.c:2190 ../../printer/printerdrake.pm_.c:3229
-msgid "Raw printer"
-msgstr "Toorprinter"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer host name or IP"
+msgstr "Printeri masinanimi või IP"
 
-#: ../../printer/printerdrake.pm_.c:2216
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "The port number should be an integer!"
+msgstr "Pordi number peab olema täisarv!"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer host name or IP missing!"
+msgstr "Printeri masinanimi või IP puudub!"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"To print a file from the command line (terminal window) you can either use "
-"the command \"%s <file>\" or a graphical printing tool: \"xpp <file>\" or "
-"\"kprinter <file>\". The graphical tools allow you to choose the printer and "
-"to modify the option settings easily.\n"
+"To print to a TCP or socket printer, you need to provide the host name or IP "
+"of the printer and optionally the port number (default is 9100). On HP "
+"JetDirect servers the port number is usually 9100, on other servers it can "
+"vary. See the manual of your hardware."
 msgstr ""
-"Faili trükkimiseks käsurealt (terminaliaknas) võib kasutada kas käsku \"%s "
-"<fail>\" või graafilist trükkimisvahendit: \"xpp <fail>\" või \"kprinter "
-"<fail>\". Graafilised vahendid võimaldavad hõlpsamalt valida printerit ja "
-"muuta valikuid.\n"
+"Et kasutada TCP/Socket printerit, tuleb määrata printeri masinanimi või IP "
+"ning kui teate, ka pordi number (vaikimisi on see 9100). HP JetDirect "
+"serveritel on pordi number tavaliselt 9100, teistel serveritel võib see olla "
+"teistsugune. Kontrollige seda oma riistvara käsiraamatust."
 
-#: ../../printer/printerdrake.pm_.c:2218
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"These commands you can also use in the \"Printing command\" field of the "
-"printing dialogs of many applications, but here do not supply the file name "
-"because the file to print is provided by the application.\n"
+"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 ""
-"Neid käske saab kasutada ka paljude rakenduste trükkimisdialoogi väljal "
-"\"Trükkimiskäsk\", kuid seal pole vaja kirjutada failinime, sest selle annab "
-"rakendus ise.\n"
+"Valige loendist ü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:1
+#, c-format
+msgid "TCP/Socket Printer Options"
+msgstr "TCP/Socket printeri sätted"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Host \"%s\", port %s"
+msgstr "Masin \"%s\", port %s"
 
-#: ../../printer/printerdrake.pm_.c:2221 ../../printer/printerdrake.pm_.c:2238
-#: ../../printer/printerdrake.pm_.c:2248
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ", host \"%s\", port %s"
+msgstr ", masin \"%s\", port %s"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Scanning network..."
+msgstr "Võrgu uurimine..."
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer auto-detection"
+msgstr "Printeri automaattuvastus"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "NCP queue name missing!"
+msgstr "NCP järjekorra nimi puudub!"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "NCP server name missing!"
+msgstr "NCP serveri nimi puudub!"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Print Queue Name"
+msgstr "Trükijärjekorra nimi"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer Server"
+msgstr "Printserver"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"\n"
-"The \"%s\" command also allows to modify the option settings for a "
-"particular printing job. Simply add the desired settings to the command "
-"line, e. g. \"%s <file>\". "
+"To print on a NetWare printer, you need to provide the NetWare print server "
+"name (Note! it may be different from its TCP/IP hostname!) as well as the "
+"print queue name for the printer you wish to access and any applicable user "
+"name and password."
 msgstr ""
-"\n"
-"Käsk \"%s\" võimaldab muuta ka konkreetse trükkimistöö valikuid. Selleks "
-"lisage vaid soovitud valik käsureale, nt \"%s <fail>\". "
+"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."
 
-#: ../../printer/printerdrake.pm_.c:2224 ../../printer/printerdrake.pm_.c:2264
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "NetWare Printer Options"
+msgstr "NetWare printeri sätted"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"To know about the options available for the current printer read either the "
-"list shown below or click on the \"Print option list\" button.%s%s\n"
+"Connect your printer to a Linux server and let your Windows machine(s) "
+"connect to it as a client.\n"
 "\n"
+"Do you really want to continue setting up this printer as you are doing now?"
 msgstr ""
-"Seda, millised valikud on saadaval praeguse printeri puhul, saab teada kas "
-"allpool seisvast loendist või pärast vajutust nupule \"Trükkimisvalikute "
-"loend\".%s%s\n"
+"Ühendage oma printer Linux-serveri külge 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_.c:2228
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"Here is a list of the available printing options for the current printer:\n"
+"Set up your Windows server to make the printer available under the IPP "
+"protocol and set up printing from this machine with the \"%s\" connection "
+"type in Printerdrake.\n"
 "\n"
 msgstr ""
-"See on loend praegusel printeril kasutamiskõlblike trükkimisvalikutega:\n"
+"Seadistage oma Windows-server nii, et printer oleks kättesaadav IPP "
+"protokolliga, ning seadistage trükkimine sellelt masinalt \"%s\" "
+"ühendustüübiga Printerdrakes.\n"
 "\n"
 
-#: ../../printer/printerdrake.pm_.c:2233 ../../printer/printerdrake.pm_.c:2243
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"To print a file from the command line (terminal window) use the command \"%s "
-"<file>\".\n"
+"You are about to set up printing to a Windows account with password. Due to "
+"a fault in the architecture of the Samba client software the password is put "
+"in clear text into the command line of the Samba client used to transmit the "
+"print job to the Windows server. So it is possible for every user on this "
+"machine to display the password on the screen by issuing commands as \"ps "
+"auxwww\".\n"
+"\n"
+"We recommend to make use of one of the following alternatives (in all cases "
+"you have to make sure that only machines from your local network have access "
+"to your Windows server, for example by means of a firewall):\n"
+"\n"
+"Use a password-less account on your Windows server, as the \"GUEST\" account "
+"or a special account dedicated for printing. Do not remove the password "
+"protection from a personal account or the administrator account.\n"
+"\n"
+"Set up your Windows server to make the printer available under the LPD "
+"protocol. Then set up printing from this machine with the \"%s\" connection "
+"type in Printerdrake.\n"
+"\n"
 msgstr ""
-"Faili trükkimiseks käsurealt (terminaliaken) kasutage käsku \"%s <fail>\".\n"
+"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"
+"\n"
+"Soovitame selle asemel kasutada üht alltoodud alternatiividest (igatahes "
+"tuleks teil tagada, et Teie Windowsi serverile 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\" "
+"või spetsiaalne trükkimiseks kasutatav konto. Ärge eemaldage aga "
+"paroolikaitset oma erakontolt ega administraatori kontolt.\n"
+"\n"
+"Seadistage Windowsi server nii, et printer oleks kasutatav LPD protokolliga. "
+"Seejärel seadistage trükkimine Teie masinas Printerdrakes ühendusviisiga \"%s"
+"\".\n"
+"\n"
 
-#: ../../printer/printerdrake.pm_.c:2235 ../../printer/printerdrake.pm_.c:2245
-#: ../../printer/printerdrake.pm_.c:2255
-msgid ""
-"This command you can also use in the \"Printing command\" field of the "
-"printing dialogs of many applications. But here do not supply the file name "
-"because the file to print is provided by the application.\n"
-msgstr ""
-"Seda käsku saab kasutada ka paljude rakenduste trükkimisdialoogi väljal "
-"\"Trükkimiskäsk\". Kuid seal ei ole vaja kirjutada failinime, sest selle "
-"annab rakendus ise.\n"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "SECURITY WARNING!"
+msgstr "TURVAHOIATUS!"
 
-#: ../../printer/printerdrake.pm_.c:2240 ../../printer/printerdrake.pm_.c:2250
-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\"."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Samba share name missing!"
+msgstr "Samba jagatava printeri nimi puudub!"
 
-#: ../../printer/printerdrake.pm_.c:2253
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ""
-"To print a file from the command line (terminal window) use the command \"%s "
-"<file>\" or \"%s <file>\".\n"
-msgstr ""
-"Faili trükkimiseks käsurealt (terminaliaken) kasutage käsku \"%s <fail>\" "
-"või \"%s <fail>\".\n"
+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:1
+#, c-format
+msgid "Auto-detected"
+msgstr "Automaatselt tuvastatud"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Workgroup"
+msgstr "Töögrupp"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Share name"
+msgstr "Jagatav printer"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "SMB server IP"
+msgstr "SMB serveri IP"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "SMB server host"
+msgstr "SMB serveri nimi"
 
-#: ../../printer/printerdrake.pm_.c:2257
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"You can also use the graphical interface \"xpdq\" for setting options and "
-"handling printing jobs.\n"
-"If you are using KDE as desktop environment you have a \"panic button\", an "
-"icon on the desktop, labeled with \"STOP Printer!\", which stops all print "
-"jobs immediately when you click it. This is for example useful for paper "
-"jams.\n"
+" 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 ""
-"Valikute seadistamiseks ja trükkimistööde haldamiseks saab kasutada ka "
-"graafilist liidest \"xpdq\".\n"
-"Kui kasutate töölauakeskkonnana KDE-d, on Teil töölaual \"paanikanupp\", "
-"ikoon nimetusega \"PEATA printer!\", millele klõpsates peatatakse otsekohe "
-"kõik trükkimistööd. See on kasulik näiteks paberiummistuste esinemisel.\n"
+" Kui soovitud printer tuvastati automaatselt, valige see loendist ning "
+"lisage siis vajadusel kasutajatunnus, parool ja/või töögrupp."
 
-#: ../../printer/printerdrake.pm_.c:2261
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"\n"
-"The \"%s\" and \"%s\" commands also allow to modify the option settings for "
-"a particular printing job. Simply add the desired settings to the command "
-"line, e. g. \"%s <file>\".\n"
+"To print to a SMB printer, you need to provide the SMB host name (Note! It "
+"may be different from its TCP/IP hostname!) and possibly the IP address of "
+"the print server, as well as the share name for the printer you wish to "
+"access and any applicable user name, password, and workgroup information."
 msgstr ""
-"\n"
-"Käsud \"%s\" ja \"%s\" võimaldavad samuti muuta konkreetse trükkimistöö "
-"valikuid. Selleks tuleb vaid lisada soovitud sätted käsureale, näiteks \"%s "
-"<fail>\".\n"
+"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."
 
-#: ../../printer/printerdrake.pm_.c:2271
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Printing/Scanning/Photo Cards on \"%s\""
-msgstr "Trükkimine/skaneerimine/fotokaardid seadmel \"%s\""
+msgid "SMB (Windows 9x/NT) Printer Options"
+msgstr "SMB (Windows 9x/NT) printeri sätted"
 
-#: ../../printer/printerdrake.pm_.c:2272
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Printing/Scanning on \"%s\""
-msgstr "Trükkimine/skaneerimine seadmel \"%s\""
+msgid "Printer \"%s\" on server \"%s\""
+msgstr "Printer \"%s\" serveril \"%s\""
 
-#: ../../printer/printerdrake.pm_.c:2274
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Printing/Photo Card Access on \"%s\""
-msgstr "Trükkimine/fotokaartide ligipääs seadmel \"%s\""
+msgid ", printer \"%s\" on server \"%s\""
+msgstr ", printer \"%s\" serveril \"%s\""
 
-#: ../../printer/printerdrake.pm_.c:2275
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Printing on the printer \"%s\""
-msgstr "Trükkimine printeril \"%s\""
+msgid "Remote printer name missing!"
+msgstr "Võrguprinteri nimi puudub!"
 
-#: ../../printer/printerdrake.pm_.c:2278 ../../printer/printerdrake.pm_.c:2281
-#: ../../printer/printerdrake.pm_.c:2282 ../../printer/printerdrake.pm_.c:2283
-#: ../../printer/printerdrake.pm_.c:3216 ../../standalone/drakTermServ_.c:307
-#: ../../standalone/drakbackup_.c:1533 ../../standalone/drakbackup_.c:4156
-#: ../../standalone/drakbug_.c:108 ../../standalone/drakfont_.c:695
-#: ../../standalone/drakfont_.c:956 ../../standalone/net_monitor_.c:118
-msgid "Close"
-msgstr "Sulge"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Remote host name missing!"
+msgstr "Kaugarvuti nimi puudub!"
 
-#: ../../printer/printerdrake.pm_.c:2281
-msgid "Print option list"
-msgstr "Trükkimisvalikute loend"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Remote printer name"
+msgstr "Võrguprinteri nimi"
 
-#: ../../printer/printerdrake.pm_.c:2301
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ""
-"Your multi-function device was configured automatically to be able to scan. "
-"Now you can scan with \"scanimage\" (\"scanimage -d hp:%s\" to specify the "
-"scanner when you have more than one) from the command line or with the "
-"graphical interfaces \"xscanimage\" or \"xsane\". If you are using the GIMP, "
-"you can also scan by choosing the appropriate point in the \"File\"/\"Acquire"
-"\" menu. Call also \"man scanimage\" on the command line to get more "
-"information.\n"
-"\n"
-"Do not use \"scannerdrake\" for this device!"
-msgstr ""
-"Mitme funktsiooniga seade on automaatselt seadistatud ja suudab ka "
-"skaneerida. Nüüd võite skaneerida \"scanimage\" abil (\"scanimage -d hp:%s\" "
-"skänneri määramiseks, kui Teil on neid mitu) käsurealt või graafiliste "
-"liideste \"xscanimage\" või \"xsane\" vahendusel. Kui kasutate GIMPi, võite "
-"skaneerida ka menüükäsuga \"Fail\"/\"Hangi\". Kui soovite rohkem infot, "
-"andke käsureal korraldus \"man scanimage\".\n"
-"\n"
-"Ärge selle seadme puhul \"scannerdraket\" kasutage!"
+msgid "Remote host name"
+msgstr "Kaugarvuti nimi"
 
-#: ../../printer/printerdrake.pm_.c:2322
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"Your printer was configured automatically to give you access to the photo "
-"card drives from your PC. Now you can access your photo cards using the "
-"graphical program \"MtoolsFM\" (Menu: \"Applications\" -> \"File tools\" -> "
-"\"MTools File Manager\") or the command line utilities \"mtools\" (enter "
-"\"man mtools\" on the command line for more info). You find the card's file "
-"system under the drive letter \"p:\", or subsequent drive letters when you "
-"have more than one HP printer with photo card drives. In \"MtoolsFM\" you "
-"can switch between drive letters with the field at the upper-right corners "
-"of the file lists."
+"To use a remote lpd printer, you need to supply the hostname of the printer "
+"server and the printer name on that server."
 msgstr ""
-"Teie printer on seadistatud automaatselt ja võimaldab Teil oma arvutilt 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 "
-"leiduvaid tähti vahetades."
+"Et kasutada teise masina lpd printerit, peate sisestama printserveri nime ja "
+"serveril kasutatava printeri nime."
 
-#: ../../printer/printerdrake.pm_.c:2344 ../../printer/printerdrake.pm_.c:2702
-#: ../../printer/printerdrake.pm_.c:2990
-msgid "Reading printer data..."
-msgstr "Printeri andmete lugemine..."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Remote lpd Printer Options"
+msgstr "Võrguprinteri (lpd) sätted"
 
-#: ../../printer/printerdrake.pm_.c:2364 ../../printer/printerdrake.pm_.c:2391
-#: ../../printer/printerdrake.pm_.c:2426
-msgid "Transfer printer configuration"
-msgstr "Printeri sätete ülekandmine"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Manual configuration"
+msgstr "Käsitsiseadistamine"
 
-#: ../../printer/printerdrake.pm_.c:2365
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ""
-"You can copy the printer configuration which you have done for the spooler %"
-"s to %s, your current spooler. All the configuration data (printer name, "
-"description, location, connection type, and default option settings) is "
-"overtaken, but jobs will not be transferred.\n"
-"Not all queues can be transferred due to the following reasons:\n"
-msgstr ""
-"Teil on võimalus kopeerida printeri sätted, mida määrasite spuulerile %s, "
-"Teie praegusele spuulerile %s. Üle kantakse kõik sätete andmed (printeri "
-"nimi, kirjeldus, asukoht, ühendusviis, vaikevalikud), aga mitte tööd.\n"
-"Kõiki järjekordi ei saa üle kanda järgmistel põhjustel:\n"
+msgid "You must choose/enter a printer/device!"
+msgstr "Printeri/seadme valimine/sisestamine on kohustuslik!"
 
-#: ../../printer/printerdrake.pm_.c:2368
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"CUPS does not support printers on Novell servers or printers sending the "
-"data into a free-formed command.\n"
+" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
+"1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 msgstr ""
-"CUPS ei toeta printereid Novelli serveritel ega printereid, mis saadavad "
-"andmeid suvalise vormiga käskudena.\n"
+" (paralleelpordid: /dev/lp0, /dev/lp1..., millele teistes süsteemides vastab "
+"LPT1:, LPT2:...; esimene USB printer: /dev/usb/lp0, teine USB printer: /dev/"
+"usb/lp1...)"
+
+#: ../../printer/printerdrake.pm:1
+#, 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_.c:2370
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"PDQ only supports local printers, remote LPD printers, and Socket/TCP "
-"printers.\n"
+"Please choose the port that your printer is connected to or enter a device "
+"name/file name in the input line"
 msgstr ""
-"PDQ toetab ainult kohalikke printereid, võrguprintereid (LPD) ning Socket/"
-"TCP printereid.\n"
+"Valige palun port, kuhu printer on ühendatud, või kirjutage sisendireale "
+"seadmenimi/failinimi"
 
-#: ../../printer/printerdrake.pm_.c:2372
-msgid "LPD and LPRng do not support IPP printers.\n"
-msgstr "LPD ja LPRng ei toeta IPP printereid.\n"
+#: ../../printer/printerdrake.pm:1
+#, 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_.c:2374
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"In addition, queues not created with this program or \"foomatic-configure\" "
-"cannot be transferred."
+"Please choose the printer you want to set up. The configuration of the "
+"printer will work fully automatically. If your printer was not correctly "
+"detected or if you prefer a customized printer configuration, turn on "
+"\"Manual configuration\"."
 msgstr ""
-"Lisaks sellele ei saa üle kanda järjekordi, mis on loodud käesoleva "
-"programmi või \"foomatic-configure\" poolt."
+"Valige palun printer, mida soovite rakendada. Printeri seadistused peaksid "
+"toimima täiesti automaatselt. Kui printer tuvastati valesti või Te eelistate "
+"selle seadistusi korrigeerida, lülitage sisse \"Käsitsiseadistamine\"."
 
-#: ../../printer/printerdrake.pm_.c:2375
-msgid ""
-"\n"
-"Also printers configured with the PPD files provided by their manufacturers "
-"or with native CUPS drivers cannot be transferred."
-msgstr ""
-"\n"
-"Üle kanda ei saa ka printereid, mis on seadistatud nende tootjate pakutud "
-"PPD failidega või loomupäraste CUPS draiveritega."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Here is a list of all auto-detected printers. "
+msgstr "Nimekiri kõigist automaatselt tuvastatud printeritest. "
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Currently, no alternative possibility is available"
+msgstr "Praegu ei ole ühtegi teist võimalust"
 
-#: ../../printer/printerdrake.pm_.c:2376
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"\n"
-"Mark the printers which you want to transfer and click \n"
-"\"Transfer\"."
+"The configuration of the printer will work fully automatically. If your "
+"printer was not correctly detected or if you prefer a customized printer "
+"configuration, turn on \"Manual configuration\"."
 msgstr ""
-"\n"
-"Märkige printer(id), mida soovite üle kanda, ning vajutage \n"
-"\"Kanna üle\"."
+"Printeri seadistused peaksid toimima täiesti automaatselt. Kui printer "
+"tuvastati valesti või Te eelistate seadistusi korrigeerida, lülitage sisse "
+"\"Käsitsiseadistamine\"."
 
-#: ../../printer/printerdrake.pm_.c:2379
-msgid "Do not transfer printers"
-msgstr "Ära kanna printereid üle"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "The following printer was auto-detected. "
+msgstr "See printer tuvastati automaatselt. "
 
-#: ../../printer/printerdrake.pm_.c:2380 ../../printer/printerdrake.pm_.c:2396
-msgid "Transfer"
-msgstr "Kanna üle"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"Please choose the printer to which the print jobs should go or enter a "
+"device name/file name in the input line"
+msgstr ""
+"Valige palun printer, kuhu trükitööd tuleks saata, või kirjutage "
+"sisendireale seadmenimi/failinimi"
 
-#: ../../printer/printerdrake.pm_.c:2392
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"A printer named \"%s\" already exists under %s. \n"
-"Click \"Transfer\" to overwrite it.\n"
-"You can also type a new name or skip this printer."
+"Please choose the printer you want to set up or enter a device name/file "
+"name in the input line"
 msgstr ""
-"Printer nimega \"%s\" on juba %s olemas. \n"
-"Vajutage \"Kanna üle\" selle ülekirjutamiseks.\n"
-"Te võite küll ka sisestada uue nime või selle printeri vahele jätta."
+"Valige palun printer, mida soovite seadistada, või kirjutage sisendireale "
+"seadmenimi/failinimi"
 
-#: ../../printer/printerdrake.pm_.c:2400
-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:1
+#, 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_.c:2405
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"The printer \"%s\" already exists,\n"
-"do you really want to overwrite its configuration?"
+"If it is not the one you want to configure, enter a device name/file name in "
+"the input line"
 msgstr ""
-"Printer \"%s\" on juba olemas,\n"
-"kas tõesti kirjutada selle sätted üle?"
+"Kui see ei ole printer, mida soovite seadistada, kirjutage sisendireale "
+"seadmenimi/failinimi"
 
-#: ../../printer/printerdrake.pm_.c:2413
-msgid "New printer name"
-msgstr "Uus printeri nimi"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Available printers"
+msgstr "Saadaolevad printerid"
 
-#: ../../printer/printerdrake.pm_.c:2416
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Transferring %s..."
-msgstr "%s ülekandmine..."
+msgid "No printer found!"
+msgstr "Printerit ei leitud!"
+
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "You must enter a device or file name!"
+msgstr "Seadme- või failinime sisestamine on kohustuslik!"
 
-#: ../../printer/printerdrake.pm_.c:2427
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"You have transferred your former default printer (\"%s\"), Should it be also "
-"the default printer under the new printing system %s?"
+"No local printer found! To manually install a printer enter a device name/"
+"file name in the input line (Parallel Ports: /dev/lp0, /dev/lp1, ..., "
+"equivalent to LPT1:, LPT2:, ..., 1st USB printer: /dev/usb/lp0, 2nd USB "
+"printer: /dev/usb/lp1, ...)."
 msgstr ""
-"Kandsite üle oma senise vaikeprinteri (\"%s\"). Kas see peaks olema "
-"vaikeprinter ka uue trükkimissüsteemi %s puhul?"
+"Kohalikku printerit ei leitud! Printeri paigaldamiseks käsitsi märkige "
+"sisendireale seadmenimi/failinimi (paralleelpordid: /dev/lp0, /dev/lp1..., "
+"mille vasteks teistes süsteemides on LPT1, LPT2...; esimene USB printer: /"
+"dev/usb/lp0, teine USB printer: /dev/usb/lp1...)"
 
-#: ../../printer/printerdrake.pm_.c:2437
-msgid "Refreshing printer data..."
-msgstr "Printeri andmete värskendamine..."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Local Printer"
+msgstr "Kohalik printer"
 
-#: ../../printer/printerdrake.pm_.c:2445 ../../printer/printerdrake.pm_.c:2516
-#: ../../printer/printerdrake.pm_.c:2528
-msgid "Configuration of a remote printer"
-msgstr "Võrguprinteri seadistamine"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "USB printer \\#%s"
+msgstr "USB printer \\#%s"
 
-#: ../../printer/printerdrake.pm_.c:2446
-msgid "Starting network..."
-msgstr "Võrgu käivitamine..."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer on parallel port \\#%s"
+msgstr "Printer paralleelpordis \\#%s"
 
-#: ../../printer/printerdrake.pm_.c:2479 ../../printer/printerdrake.pm_.c:2483
-#: ../../printer/printerdrake.pm_.c:2485
-msgid "Configure the network now"
-msgstr "Seadista võrk otsekohe"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer \"%s\" on SMB/Windows server \"%s\""
+msgstr "Printer \"%s\" SMB/Windows serveril \"%s\""
 
-#: ../../printer/printerdrake.pm_.c:2480
-msgid "Network functionality not configured"
-msgstr "Võrguvalmidus on seadistamata"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Network printer \"%s\", port %s"
+msgstr "Võrguprinter \"%s\", port %s"
 
-#: ../../printer/printerdrake.pm_.c:2481
-msgid ""
-"You are going to configure a remote printer. This needs working network "
-"access, but your network is not configured yet. If you go on without network "
-"configuration, you will not be able to use the printer which you are "
-"configuring now. How do you want to proceed?"
-msgstr ""
-"Kavatsesite hakata seadistama võrguprinterit. Selleks läheb vaja töötavat "
-"võrguühendust, aga Teil on võrk veel seadistamata. Kui Te jätkate ilma võrku "
-"seadistamata, et ole Teil võimalik kasutada printerit, mida te tahate "
-"seadistada. Kuidas peaks nüüd edasi talitama?"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Detected %s"
+msgstr "Tuvastati %s"
 
-#: ../../printer/printerdrake.pm_.c:2484
-msgid "Go on without configuring the network"
-msgstr "Jätkama ilma võrku seadistamata"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ", printer \"%s\" on SMB/Windows server \"%s\""
+msgstr ", printer \"%s\" SMB/Windows serveril \"%s\""
 
-#: ../../printer/printerdrake.pm_.c:2518
-msgid ""
-"The network configuration done during the installation cannot be started "
-"now. Please check whether the network gets accessable after booting your "
-"system and correct the configuration using the Mandrake Control Center, "
-"section \"Network & Internet\"/\"Connection\", and afterwards set up the "
-"printer, also using the Mandrake Control Center, section \"Hardware\"/"
-"\"Printer\""
-msgstr ""
-"Paigalduse 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 Mandrake juhtimiskeskuse sektsioonis \"Kohtvõrk ja "
-"Internet\"/\"Ühendus\", misjärel seadistage printer samuti juhtimiskeskuses, "
-"aga sektsioonis \"Riistvara\"/\"Printer\". "
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ", network printer \"%s\", port %s"
+msgstr ", võrguprinter \"%s\", port %s"
 
-#: ../../printer/printerdrake.pm_.c:2519
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"The network access was not running and could not be started. Please check "
-"your configuration and your hardware. Then try to configure your remote "
-"printer again."
+"\n"
+"Congratulations, your printer is now installed and configured!\n"
+"\n"
+"You can print using the \"Print\" command of your application (usually in "
+"the \"File\" menu).\n"
+"\n"
+"If you want to add, remove, or rename a printer, or if you want to change "
+"the default option settings (paper input tray, printout quality, ...), "
+"select \"Printer\" in the \"Hardware\" section of the Mandrake Control "
+"Center."
 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_.c:2529
-msgid "Restarting printing system..."
-msgstr "Trükkimissüsteemi uuestikäivitamine..."
+"\n"
+"Õnnitleme, Teie printer on nüüd paigaldatud ja seadistatud!\n"
+"\n"
+"Nüüd võite trükkida, kasutades rakendustes käsku \"Trüki\"\n"
+"(enamasti peitub see menüüs \"Fail\").\n"
+"\n"
+"Kuii soovite printerit lisada, eemaldada või ümber nimetada või soovite "
+"muuta vaikeseadistusi (trükikvaliteet, paberisalv,...), valige Mandrake "
+"juhtimiskeskuse \"Riistvara\" sektsioonis \"Printer\"."
 
-#: ../../printer/printerdrake.pm_.c:2568
-msgid "high"
-msgstr "kõrge"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Auto-detect printers connected to machines running Microsoft Windows"
+msgstr "Microsoft Windowsi masinatega ühendatud printerite automaattuvastus"
 
-#: ../../printer/printerdrake.pm_.c:2568
-msgid "paranoid"
-msgstr "paranoiline"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Auto-detect printers connected directly to the local network"
+msgstr "Kohtvõrku ühendatud printerite automaattuvastus"
 
-#: ../../printer/printerdrake.pm_.c:2569
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Installing a printing system in the %s security level"
-msgstr "Trükkimissüsteemi paigaldamine turvatasemel '%s'"
+msgid "Auto-detect printers connected to this machine"
+msgstr "Selle masinaga ühendatud printerite automaattuvastus"
 
-#: ../../printer/printerdrake.pm_.c:2570
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"You are about to install the printing system %s on a system running in the %"
-"s security level.\n"
 "\n"
-"This printing system runs a daemon (background process) which waits for "
-"print jobs and handles them. This daemon is also accessable by remote "
-"machines through the network and so it is a possible point for attacks. "
-"Therefore only a few selected daemons are started by default in this "
-"security level.\n"
+"Welcome to the Printer Setup Wizard\n"
 "\n"
-"Do you really want to configure printing on this machine?"
+"This wizard will help you to install your printer(s) connected to this "
+"computer.\n"
+"\n"
+"If you have printer(s) connected to this machine, Please plug it/them in on "
+"this computer and turn it/them on so that it/they can be auto-detected.\n"
+"\n"
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
 msgstr ""
-"Te püüate praegu paigaldada trükkimissüsteemi %s süsteemi, mis töötab "
-"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. "
-"Seetõttu käivitatakse selle turvataseme puhul vaikimisi ainult mõned valitud "
-"deemonid.\n"
+"Printeri seadistamise nõustaja\n"
 "\n"
-"Kas soovite tõesti seadistada trükkimist sellel masinal?"
-
-#: ../../printer/printerdrake.pm_.c:2604
-msgid "Starting the printing system at boot time"
-msgstr "Trükkimissüsteem käivitatakse alglaadimisel"
+"Nõustaja aitab Teil paigaldada printeri(d), mis on ühendatud selle "
+"arvutiga.\n"
+"\n"
+"Kui teil on printer(eid), mis on ühendatud selle masinaga, ühendage palun "
+"see/need arvutiga ja lülitage sisse, et seda/neid saaks automaatselt "
+"tuvastada.\n"
+"\n"
+"Kui olete valmis, vajutage \"Järgmine\", või \"Katkesta\", kui Te ei soovi "
+"praegu printeri(te) seadistamisega tegelda."
 
-#: ../../printer/printerdrake.pm_.c:2605
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"The printing system (%s) will not be started automatically when the machine "
-"is booted.\n"
 "\n"
-"It is possible that the automatic starting was turned off by changing to a "
-"higher security level, because the printing system is a potential point for "
-"attacks.\n"
+"Welcome to the Printer Setup Wizard\n"
 "\n"
-"Do you want to have the automatic starting of the printing system turned on "
-"again?"
+"This wizard will help you to install your printer(s) connected to this "
+"computer or connected directly to the network.\n"
+"\n"
+"If you have printer(s) connected to this machine, Please plug it/them in on "
+"this computer and turn it/them on so that it/they can be auto-detected. Also "
+"your network printer(s) must be connected and turned on.\n"
+"\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"
+"\n"
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
 msgstr ""
-"Trükkimissüsteemi (%s) ei käivitata automaatselt arvuti alglaadimisel.\n"
 "\n"
-"On võimalik, et automaatkäivitus lülitati välja seoses kõrgema turvataseme "
-"valikuga, sest trükkimissüsteem on võimaliku rünnaku objekt.\n"
+"Printeri seadistamise nõustaja\n"
 "\n"
-"Kas soovite trükkimissüsteemi automaatkäivituse taas sisse lülitada?"
+"Nõustaja aitab Teil paigaldada printeri(d), mis on ühendatud selle arvutiga "
+"või otse võrku.\n"
+"\n"
+"Kui Teil on printer(eid), mis on ühendatud selle masinaga, ühendage palun "
+"see/need arvutiga ja lülitage sisse, et seda/neid saaks automaatselt "
+"tuvastada. Ka võrguprinter(id) peavad olema ühendatud ja sisse lülitatud.\n"
+"\n"
+"Pange tähele, et võrguprinterite automaattuvastus võtab rohkem aega kui "
+"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 \"Katkesta\", kui Te ei soovi "
+"praegu printeri(te) seadistamisega tegelda."
 
-#: ../../printer/printerdrake.pm_.c:2625 ../../printer/printerdrake.pm_.c:2765
-msgid "Checking installed software..."
-msgstr "Paigaldatud tarkvara kontroll..."
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard will help you to install your printer(s) connected to this "
+"computer, connected directly to the network or to a remote Windows machine.\n"
+"\n"
+"If you have printer(s) connected to this machine, Please plug it/them in on "
+"this computer and turn it/them on so that it/they can be auto-detected. Also "
+"your network printer(s) and your Windows machines must be connected and "
+"turned on.\n"
+"\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"
+"\n"
+" Click on \"Next\" when you are ready, and on \"Cancel\" if you do not want "
+"to set up your printer(s) now."
+msgstr ""
+"\n"
+"Printeri seadistamise nõustaja\n"
+"\n"
+"Nõustaja aitab Teil paigaldada printeri(d), mis on ühendatud selle arvutiga, "
+"otse võrku või võrgus asuva Windowsi masinaga.\n"
+"\n"
+"Kui Teil on printer(eid), mis on ühendatud selle masinaga, ühendage see/need "
+"palun arvutiga ja lülitage sisse, et seda/neid oleks võimalik automaatselt "
+"tuvastada. Ka võrguprinter(id) ja Windowsi-masinad peavad olema ühendatud ja "
+"sisse lülitatud.\n"
+"\n"
+"Pange tähele, et võrguprinteri(te) automaattuvastus võtab rohkem aega kui "
+"ainult selle masinaga ühendatud printeri(te) tuvastamine. Nii et kui teil "
+"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 \"Katkesta\", kui Te ei soovi "
+"printeri(te) seadistamisega praegu tegelda."
 
-#: ../../printer/printerdrake.pm_.c:2630
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Removing %s ..."
-msgstr "%s eemaldamine..."
+msgid ""
+"\n"
+"Welcome to the Printer Setup Wizard\n"
+"\n"
+"This wizard allows you to install local or remote printers to be used from "
+"this machine and also from other machines in the network.\n"
+"\n"
+"It asks you for all necessary information to set up the printer and gives "
+"you access to all available printer drivers, driver options, and printer "
+"connection types."
+msgstr ""
+"\n"
+"Printeri seadistamise nõustaja\n"
+"\n"
+"Nõustaja võimaldab Teile paigaldada kohalikke või võrguprintereid, mida saab "
+"kasutada Teie masin, samuti teised võrgus olevad masinad.\n"
+"\n"
+"Teil palutakse määrata kogu vajalik info printeri seadistamiseks, see "
+"tähendab olemasolevad printeridraiverid, draiveri valikud ja printeri "
+"ühendusviis."
 
-#: ../../printer/printerdrake.pm_.c:2636
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Installing %s ..."
-msgstr "%s paigaldamine..."
+msgid "Searching for new printers..."
+msgstr "Uute printerite otsimine..."
 
-#: ../../printer/printerdrake.pm_.c:2685
-msgid "Select Printer Spooler"
-msgstr "Printeri spuuleri valik"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"NOTE: Depending on the printer model and the printing system up to %d MB of "
+"additional software will be installed."
+msgstr ""
+"MÄRKUS: Sõltuvalt printeri mudelist ja trükkimissüsteemist paigaldatakse "
+"kuni %d MB lisatarkvara."
 
-#: ../../printer/printerdrake.pm_.c:2686
-msgid "Which printing system (spooler) do you want to use?"
-msgstr "Millist trükkimissüsteemi (spuulerit) soovite kasutada?"
+#: ../../printer/printerdrake.pm:1
+#, 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"
 
-#: ../../printer/printerdrake.pm_.c:2720
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Configuring printer \"%s\"..."
-msgstr "Printeri \"%s\" seadistamine..."
+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_.c:2731
-msgid "Installing Foomatic..."
-msgstr "Foomaticu paigaldamine..."
+#: ../../printer/printerdrake.pm:1
+#, 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_.c:2800 ../../printer/printerdrake.pm_.c:2838
-#: ../../printer/printerdrake.pm_.c:3230 ../../printer/printerdrake.pm_.c:3300
-msgid "Printer options"
-msgstr "Printeri valikud"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"Do you want to enable printing on the printers mentioned above or on "
+"printers in the local network?\n"
+msgstr ""
+"Kas soovite trükkimist lubada ülalmainitud printeritel või printeritel Teie "
+"kohtvõrgus?\n"
 
-#: ../../printer/printerdrake.pm_.c:2810
-msgid "Preparing Printerdrake..."
-msgstr "Printerdrake ettevalmistamine..."
+#: ../../printer/printerdrake.pm:1
+#, 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_.c:2825 ../../printer/printerdrake.pm_.c:3369
-msgid "Configuring applications..."
-msgstr "Rakenduste seadistamine..."
+#: ../../printer/printerdrake.pm:1
+#, 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_.c:2845
-msgid "Would you like to configure printing?"
-msgstr "Kas soovite trükkimist seadistada?"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"\n"
+"There are %d unknown printers directly connected to your system"
+msgstr ""
+"\n"
+"%d tundmatut printerit on Teie süsteemi otse ühendatud"
 
-#: ../../printer/printerdrake.pm_.c:2857
-msgid "Printing system: "
-msgstr "Trükkimissüsteem: "
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"\n"
+"There is one unknown printer directly connected to your system"
+msgstr ""
+"\n"
+"Üks tundmatu printer on Teie süsteemi otse ühendatud"
 
-#: ../../printer/printerdrake.pm_.c:2915
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"The following printers are configured. Double-click on a printer to change "
-"its settings; to make it the default printer; to view information about it; "
-"or to make a printer on a remote CUPS server available for Star Office/"
-"OpenOffice.org/GIMP."
+"The following printer\n"
+"\n"
+"%s%s\n"
+"is directly connected to your system"
 msgstr ""
-"Seadistatud on järgmised printerid. Topeltklõps printeril võimaldab muuta "
-"selle seadistusi, teha see vaikeprinteriks, vaadata selle infot või muuta "
-"CUPSi printserveri printer kättesaadavaks StarOffice/OpenOffice.org/GIMP-ile."
+"Teie süsteemiga on ühendatud\n"
+"\n"
+"%s%s\n"
+"printer"
 
-#: ../../printer/printerdrake.pm_.c:2916
+#: ../../printer/printerdrake.pm:1
+#, c-format
 msgid ""
-"The following printers are configured. Double-click on a printer to change "
-"its settings; to make it the default printer; or to view information about "
-"it."
+"The following printer\n"
+"\n"
+"%s%s\n"
+"are directly connected to your system"
 msgstr ""
-"Seadistatud on järgmised printerid. Topeltklõps printeril võimaldab muuta "
-"selle seadistusi, teha see vaikeprinteriks või vaadata selle infot."
+"Teie süsteemiga on ühendatud\n"
+"\n"
+"%s%s\n"
+"printer(id)"
 
-#: ../../printer/printerdrake.pm_.c:2942
-msgid "Refresh printer list (to display all available remote CUPS printers)"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"The following printers\n"
+"\n"
+"%s%s\n"
+"are directly connected to your system"
 msgstr ""
-"Värskenda printeriloendit (näitamaks kõiki saadaolevaid CUPS printserveri "
-"printereid)"
+"Teie süsteemiga on ühendatud\n"
+"\n"
+"%s%s\n"
+"printerid"
 
-#: ../../printer/printerdrake.pm_.c:2960
-msgid "Change the printing system"
-msgstr "Trükkimissüsteemi muutmine"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "and %d unknown printers"
+msgstr "ja %d tundmatut printerit"
 
-#: ../../printer/printerdrake.pm_.c:2965 ../../standalone/drakconnect_.c:274
-msgid "Normal Mode"
-msgstr "Tavakasutus"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "and one unknown printer"
+msgstr "ja üks tundmatu printer"
 
-#: ../../printer/printerdrake.pm_.c:3127 ../../printer/printerdrake.pm_.c:3176
-#: ../../printer/printerdrake.pm_.c:3363
-msgid "Do you want to configure another printer?"
-msgstr "Kas soovite seadistada mõne muu printeri?"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Checking your system..."
+msgstr "Süsteemi kontrollimine..."
 
-#: ../../printer/printerdrake.pm_.c:3211
-msgid "Modify printer configuration"
-msgstr "Printeri seadistuste muutmine"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "IP address of host/network:"
+msgstr "Masina/võrgu IP aadress:"
 
-#: ../../printer/printerdrake.pm_.c:3213
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ""
-"Printer %s\n"
-"What do you want to modify on this printer?"
+msgid "This host/network is already in the list, it cannot be added again.\n"
 msgstr ""
-"Printer %s\n"
-"Mida soovite muuta?"
+"See masin/võrk on juba nimekirjas ja seda ei ole võimalik uuesti lisada.\n"
 
-#: ../../printer/printerdrake.pm_.c:3217
-msgid "Do it!"
-msgstr "Nüüd!"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "192.168.100.0/255.255.255.0\n"
+msgstr "192.168.100.0/255.255.255.0\n"
 
-#: ../../printer/printerdrake.pm_.c:3222 ../../printer/printerdrake.pm_.c:3271
-msgid "Printer connection type"
-msgstr "Printeri ühendusviis"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "192.168.100.0/24\n"
+msgstr "192.168.100.0/24\n"
 
-#: ../../printer/printerdrake.pm_.c:3223 ../../printer/printerdrake.pm_.c:3275
-msgid "Printer name, description, location"
-msgstr "Printeri nimi, kirjeldus, asukoht"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "10.1.*\n"
+msgstr "10.1.*\n"
 
-#: ../../printer/printerdrake.pm_.c:3225 ../../printer/printerdrake.pm_.c:3293
-msgid "Printer manufacturer, model, driver"
-msgstr "Printeri tootja, mudel, draiver"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "10.0.0.*\n"
+msgstr "10.0.0.*\n"
 
-#: ../../printer/printerdrake.pm_.c:3226 ../../printer/printerdrake.pm_.c:3294
-msgid "Printer manufacturer, model"
-msgstr "Printeri tootja, mudel"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "192.168.100.194\n"
+msgstr "192.168.100.194\n"
 
-#: ../../printer/printerdrake.pm_.c:3232 ../../printer/printerdrake.pm_.c:3304
-msgid "Set this printer as the default"
-msgstr "Määra vaikeprinteriks"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Examples for correct IPs:\n"
+msgstr "Korrektne IP aadress on näiteks:\n"
 
-#: ../../printer/printerdrake.pm_.c:3234 ../../printer/printerdrake.pm_.c:3309
-msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Lisa printer StarOffice/OpenOffice.org/GIMP-ile"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "The entered host/network IP is not correct.\n"
+msgstr "Sisestatud masina/võrgu IP aadress ei ole korrektne.\n"
 
-#: ../../printer/printerdrake.pm_.c:3235 ../../printer/printerdrake.pm_.c:3314
-msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Eemalda StarOffice/OpenOffice.org/GIMP-ilt"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"Choose the network or host on which the local printers should be made "
+"available:"
+msgstr ""
+"Valige palun võrk või masin, mille jaoks soovite siinseid printereid välja "
+"jagada."
 
-#: ../../printer/printerdrake.pm_.c:3236 ../../printer/printerdrake.pm_.c:3319
-msgid "Print test pages"
-msgstr "Trüki testlehekülg(i)"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Sharing of local printers"
+msgstr "Printerite jagamine"
 
-#: ../../printer/printerdrake.pm_.c:3237 ../../printer/printerdrake.pm_.c:3321
-msgid "Know how to use this printer"
-msgstr "Printeri kasutama õppimine"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Remove selected host/network"
+msgstr "Eemalda valitud masin/võrk"
 
-#: ../../printer/printerdrake.pm_.c:3238 ../../printer/printerdrake.pm_.c:3323
-msgid "Remove printer"
-msgstr "Eemalda printer"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Edit selected host/network"
+msgstr "Muuda valitud masinat/võrku"
 
-#: ../../printer/printerdrake.pm_.c:3282
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Removing old printer \"%s\"..."
-msgstr "Vana printeri \"%s\" eemaldamine..."
+msgid "Add host/network"
+msgstr "Lisa masin/võrk"
 
-#: ../../printer/printerdrake.pm_.c:3307
-msgid "Default printer"
-msgstr "Vaikeprinter"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"These are the machines and networks on which the locally connected printer"
+"(s) should be available:"
+msgstr ""
+"Nende masinate ja võrkude jaoks on selle arvuti küljes olevad printerid "
+"kättesaadavaks  tehtud:"
 
-#: ../../printer/printerdrake.pm_.c:3308
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "The printer \"%s\" is set as the default printer now."
-msgstr "Printer \"%s\" on määratud vaikeprinteriks."
+msgid ""
+"When this option is turned on, on every startup of CUPS it is automatically "
+"made sure that\n"
+"\n"
+"- if LPD/LPRng is installed, /etc/printcap will not be overwritten by CUPS\n"
+"\n"
+"- if /etc/cups/cupsd.conf is missing, it will be created\n"
+"\n"
+"- when printer information is broadcasted, it does not contain \"localhost\" "
+"as the server name.\n"
+"\n"
+"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 "
+"automaatselt, et\n"
+"\n"
+"- kui LPD/LPRng on paigaldatud, ei kirjutaks CUPS üle faili /etc/printcap\n"
+"\n"
+"- kui /etc/cups/cupsd.conf puudub, see loodaks\n"
+"\n"
+"- kui printeriinfo läheb üldlevisse, ei ole seal serveri nimeks \"localhost"
+"\".\n"
+"\n"
+"Kui mõni neist sammudest tekitab probleeme, lülitage võimalus välja, aga "
+"siis peate nende eest ise hoolt kandma."
 
-#: ../../printer/printerdrake.pm_.c:3310
-msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr "Printeri lisamine StarOffice/OpenOffice.org/GIMP-ile"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Automatic correction of CUPS configuration"
+msgstr "CUPS-i automaatne seadistamine"
 
-#: ../../printer/printerdrake.pm_.c:3312
+#: ../../printer/printerdrake.pm:1 ../../standalone/scannerdrake:1
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr "Printer \"%s\" lisati edukalt StarOffice/OpenOffice.org/GIMP-ile."
+msgid "No remote machines"
+msgstr "Ainult sellel masinal"
 
-#: ../../printer/printerdrake.pm_.c:3313
+#: ../../printer/printerdrake.pm:1
 #, c-format
-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 "Custom configuration"
+msgstr "Kohandatud sätted"
 
-#: ../../printer/printerdrake.pm_.c:3315
-msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr "Printeri eemaldamine StarOffice/OpenOffice.org/GIMP-ilt"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "Printer sharing on hosts/networks: "
+msgstr "Printeri jagamine masinal/võrgus:"
 
-#: ../../printer/printerdrake.pm_.c:3317
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid ""
-"The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
-"GIMP."
-msgstr "Printer \"%s\" eemaldati edukalt StarOffice/OpenOffice.org/GIMP-ilt."
+msgid "Automatically find available printers on remote machines"
+msgstr "Otsi automaatselt kõiki kättesaadavaid võrguprintereid"
 
-#: ../../printer/printerdrake.pm_.c:3318
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "The printers on this machine are available to other computers"
+msgstr "Selle arvuti külge ühendatud printerid on teistele kättesaadavad"
+
+#: ../../printer/printerdrake.pm:1
 #, c-format
 msgid ""
-"Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
+"You can also decide here whether printers on remote machines should be "
+"automatically made available on this machine."
 msgstr ""
-"Printeri \"%s\" eemaldamine StarOffice/OpenOffice.org/GIMP-ilt ebaõnnestus."
+"Samuti saate otsustada, kas võrguprinterid peaksid olema automaatselt siin "
+"arvutis kättesaadavad"
 
-#: ../../printer/printerdrake.pm_.c:3325
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Do you really want to remove the printer \"%s\"?"
-msgstr "Kas tõesti eemaldada printer \"%s\"?"
+msgid ""
+"Here you can choose whether the printers connected to this machine should be "
+"accessable 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."
 
-#: ../../printer/printerdrake.pm_.c:3329
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Removing printer \"%s\"..."
-msgstr "Printeri \"%s\" eemaldamine..."
+msgid "CUPS printer sharing configuration"
+msgstr "CUPS printeri jagamise sätted"
 
-#: ../../raid.pm_.c:35
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Can't add a partition to _formatted_ RAID md%d"
-msgstr "Juba vormindatud RAID-ile (md%d) ei saa partitsiooni lisada"
+msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
+msgstr "Printeri automaattuvastus (kohalikud, TCP/Socketi ja SMB printerid)"
 
-#: ../../raid.pm_.c:137
-msgid "mkraid failed"
-msgstr "mkraid ebaõnnestus"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid ""
+"\n"
+"Printers on remote CUPS servers do not need to be configured here; these "
+"printers will be automatically detected."
+msgstr ""
+"\n"
+"Kui võrgus on CUPS server, siis ei ole Teil vaja siin printereid seadistada, "
+"need leitakse automaatselt."
 
-#: ../../raid.pm_.c:137
-msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid ebaõnnestus (võib-olla puudub 'raidtools'?)"
+#: ../../printer/printerdrake.pm:1
+#, c-format
+msgid "How is the printer connected?"
+msgstr "Kuidas on see printer ühendatud?"
 
-#: ../../raid.pm_.c:153
+#: ../../printer/printerdrake.pm:1
 #, c-format
-msgid "Not enough partitions for RAID level %d\n"
-msgstr "Ei ole piisavalt partitsioone RAID-%d jaoks\n"
+msgid "Select Printer Connection"
+msgstr "Valige printeri ühendusviis"
 
-#: ../../security/main.pm_.c:36
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Standard: This is the standard security recommended for a computer that will "
-"be used to connect\n"
-"               to the Internet as a client.\n"
+"Arguments: (umask)\n"
 "\n"
-"High:       There are already some restrictions, and more automatic checks "
-"are run every night.\n"
-"\n"
-"Higher:    The security is now high enough to use the system as a server "
-"which can accept\n"
-"              connections from many clients. If your machine is only a "
-"client on the Internet, you\n"
-"\t      should choose a lower level.\n"
+"Set the user umask."
+msgstr ""
+"Argumendid: (umask)\n"
 "\n"
-"Paranoid:  This is similar to the previous level, but the system is entirely "
-"closed and security\n"
-"                features are at their maximum\n"
+"Määrab kasutaja umask-i."
+
+#: ../../security/help.pm:1
+#, c-format
+msgid ""
+"Arguments: (val)\n"
 "\n"
-"Security Administrator:\n"
-"               If the 'Security Alerts' option is set, security alerts will "
-"be sent to this user (username or\n"
-"\t       email)"
+"Set the shell timeout. A value of zero means no timeout."
 msgstr ""
-"Standardne: see on tavaline turvatase, mida võib soovitada arvutile, mis on "
-"Internetiga\n"
-"               ühendatud kui klient.\n"
+"Argumendid: (val)\n"
 "\n"
-"Kõrge:       On juba mõningaid piiranguid, igal ööl sooritatakse märksa "
-"rohkem automaatseid kontrollimisi.\n"
-"\n"
-"Väga kõrge:  Turvalisus on piisav, et süsteemi saaks kasutada serverina, mis "
-"võib vastu võtta\n"
-"               ühendusi paljudelt klientidelt. Kui Teie masin on Internetis "
-"vaid kui klient, oleks mõttekam\n"
-"\t      valida madalam tase.\n"
+"Määrab shelli aegumise. Null tähendab aegumise puudumist."
+
+#: ../../security/help.pm:1
+#, c-format
+msgid ""
+"Arguments: (size)\n"
 "\n"
-"Paranoiline: See sarnaneb eelmisele tasemele, ainult et süsteem on täiesti "
-"suletud ja turvasätted\n"
-"               maksimumi peale keeratud.\n"
+"Set shell commands history size. A value of -1 means unlimited."
+msgstr ""
+"Argumendid: (size)\n"
 "\n"
-"Turvaadministraator:\n"
-"               Kui valitud on võimalus 'Turvahoiatused', saadetakse "
-"turvahoiatused sellele kasutajale (kasutajanimele\n"
-"\t       või e-posti aadressile)"
+"Määrab shellikäskude ajaloo suuruse. -1 tähendab piiramatu."
 
-#: ../../security/main.pm_.c:66
-msgid "Security Level:"
-msgstr "Turvatase:"
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, check additions/removals of sgid files."
+msgstr "kui on 'jah', kontrollib sgid-failide lisamist/eemaldamist."
 
-#: ../../security/main.pm_.c:77
+#: ../../security/help.pm:1
 #, c-format
-msgid " (default value: %s)"
-msgstr " (vaikeväärtus: %s)"
+msgid "if set to yes, check open ports."
+msgstr "kui on 'jah', kontrollib avatud porte."
 
-#: ../../security/main.pm_.c:113
-msgid "Security Alerts:"
-msgstr "Turvahoiatused:"
+#: ../../security/help.pm:1
+#, c-format
+msgid ""
+"if set, send the mail report to this email address else send it to root."
+msgstr ""
+"kui on lubatud, saadab meiliraporti sellele aadressile, muidu "
+"administraatorile."
 
-#: ../../security/main.pm_.c:115
-msgid "Security Administrator:"
-msgstr "Turvaadministraator:"
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, report check result by mail."
+msgstr "kui on 'jah', annab kontrolli tulemustest teada meilitsi."
 
-#: ../../security/main.pm_.c:128
-msgid "Network Options"
-msgstr "Võrguparameetrid"
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, check files/directories writable by everybody."
+msgstr "kui on 'jah', kontrollib kõigi kirjutatavaid faile/katalooge."
 
-#: ../../security/main.pm_.c:128
-msgid "System Options"
-msgstr "Süsteemi parameetrid"
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, reports check result to tty."
+msgstr "kui on 'jah', saadab kontrolli tulemused tty-sse."
+
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, run some checks against the rpm database."
+msgstr "kui on 'jah', kontrollib veidi rpm andmebaasist."
+
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, check if the network devices are in promiscuous mode."
+msgstr "kui on 'jah', kontrollib, kas võrguseadmed on mitte-eelisresiimis."
+
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, run chkrootkit checks."
+msgstr "kui on 'jah', käivitab chkrootkit kontrolli."
 
-#: ../../security/main.pm_.c:133 ../../security/main.pm_.c:164
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, check permissions of files in the users' home."
+msgstr "kui on 'jah', kontrollib failide loabitte kasutajate kodukataloogis."
+
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, check additions/removals of suid root files."
+msgstr "kui on 'jah', kontrollib suid root failide lisamist/eemaldamist."
+
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, report check result to syslog."
+msgstr "kui on 'jah', saadab kontrolli tulemused syslog-i."
+
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"The following options can be set to customize your\n"
-"system security. If you need explanations, click on Help.\n"
+"if set to yes, check for empty password, or a password while it should be "
+"in /etc/shadow or other users with id 0."
 msgstr ""
-"Süsteemi turvalisuse kohandamiseks saab seadistada\n"
-"järgmisi parameetreid. Seletuste saamiseks vajutage 'Abi'.\n"
+"kui on 'jah', kontrollib tühja salasõna või salasõna, kui see peaks olema /"
+"etc/shadow-s või teisi kasutajaid id-ga 0."
 
-#: ../../security/main.pm_.c:177
-msgid "Periodic Checks"
-msgstr "Perioodiline kontroll"
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, run the daily security checks."
+msgstr "kui on 'jah', sooritab igapäevase turvakontrolli."
 
-#: ../../security/main.pm_.c:191
-msgid "Please wait, setting security level..."
-msgstr "Palun oodake, sätin turvataseme..."
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, verify checksum of the suid/sgid files."
+msgstr "kui on 'jah', kontrollib suid/sgid failide checksum-i."
 
-#: ../../security/main.pm_.c:197
-msgid "Please wait, setting security options..."
-msgstr "Palun oodake, sätin turvaparameetrid..."
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, check empty password in /etc/shadow."
+msgstr "kui on 'jah', kontrollib tühja salasõna /etc/shadow-s."
 
-#: ../../services.pm_.c:19
-msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr "Helisüsteemi ALSA (Advanced Linux Sound Architecture) käivitamine"
+#: ../../security/help.pm:1
+#, c-format
+msgid "if set to yes, report unowned files."
+msgstr "kui on 'jah', teatab omanikuta failidest."
 
-#: ../../services.pm_.c:20
-msgid "Anacron a periodic command scheduler."
+#: ../../security/help.pm:1
+#, c-format
+msgid ""
+"Arguments: (umask)\n"
+"\n"
+"Set the root umask."
 msgstr ""
-"Anacron käivitab programme perioodiliselt analoogiliselt cron-ile.\n"
-"Kasutage seda juhul, kui Teie arvuti ei tööta 24h."
+"Argumendid: (umask)\n"
+"\n"
+"Määrab administraatori umask-i."
 
-#: ../../services.pm_.c:21
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"apmd is used for monitoring batery status and logging it via syslog.\n"
-"It can also be used for shutting down the machine when the battery is low."
+"Arguments: (length, ndigits=0, nupper=0)\n"
+"\n"
+"Set the password minimum length and minimum number of digit and minimum "
+"number of capitalized letters."
 msgstr ""
-"apmd on kasutusel põhiliselt sülearvutites akude täituvuse jälgimiseks.\n"
-"Samuti suudab see aku tühjenemisel süsteemi viisakalt seisata."
+"Argumendid: (length, ndigits=0, nupper=0)\n"
+"\n"
+"Määrab salasõna minimaalse pikkuse ning numbrite ja suurtähtede minimaalse "
+"hulga."
 
-#: ../../services.pm_.c:23
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Runs commands scheduled by the at command at the time specified when\n"
-"at was run, and runs batch commands when the load average is low enough."
+"Arguments: (arg)\n"
+"\n"
+"Set the password history length to prevent password reuse."
 msgstr ""
-"Laseb käivitada ühekordseid käske etteantud ajal või ootab süsteemi\n"
-"koormuse laskumist käsu käivitamiseks piisavale tasemele."
+"Argumendid: (arg)\n"
+"\n"
+"Määrab salasõna ajaloo suuruse, et vältida selle taaskasutamist."
 
-#: ../../services.pm_.c:25
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"cron is a standard UNIX program that runs user-specified programs\n"
-"at periodic scheduled times. vixie cron adds a number of features to the "
-"basic\n"
-"UNIX cron, including better security and more powerful configuration options."
+"Arguments: (max, inactive=-1)\n"
+"\n"
+"Set password aging to \\fImax\\fP days and delay to change to \\fIinactive"
+"\\fP."
 msgstr ""
-"cron on UNIXi süsteemide standardvahend kasutaja programmide perioodiliseks\n"
-"käivitamiseks. Vixie cron sisaldab lisaks veel turvalisust ja kasutus-\n"
-"mugavust tõstvaid omadusi. Soovitatav süsteemile, mis töötab 24h."
+"Argumendid: (max, inactive=-1)\n"
+"\n"
+"Määrab salasõna aeguma \\fImaks.\\fP n päeva pärast ning viivituse enne "
+"muutmist \\fImittekehtivaks\\fP."
 
-#: ../../services.pm_.c:28
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"GPM adds mouse support to text-based Linux applications such the\n"
-"Midnight Commander. It also allows mouse-based console cut-and-paste "
-"operations,\n"
-"and includes support for pop-up menus on the console."
+"Arguments: (name)\n"
+"\n"
+"Add the name as an exception to the handling of password aging by msec."
 msgstr ""
-"GPM annab võimaluse kasutada hiirt ka tekstikonsoolil. Lisaks tavalisele\n"
-"lõikamisele/kleepimisele saab kasutada ka menüüsüsteeme."
+"Argumendid: (name)\n"
+"\n"
+"Lisab nime erandite hulka, kui msec uurib salasõnade aegumist."
 
-#: ../../services.pm_.c:31
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"HardDrake runs a hardware probe, and optionally configures\n"
-"new/changed hardware."
+"Arguments: (arg)\n"
+"\n"
+" Enable/Disable sulogin(8) in single user level."
 msgstr ""
-"HardDrake kontrollib riistvara ja lisavõimalusena ka seadistab\n"
-"uue või muudetud riistvara."
+"Argumendid: (arg)\n"
+"\n"
+" sulogin(8) lubamine/keelamine üksikkasutaja tasemel."
 
-#: ../../services.pm_.c:33
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Apache is a World Wide Web server. It is used to serve HTML files and CGI."
+"Arguments: (arg)\n"
+"\n"
+" Activate/Disable daily security check."
 msgstr ""
-"Apache on maailma juhtiv veebiserveri programm. Tõenäoliselt\n"
-"ka võimsaim."
+"Argumendid: (arg)\n"
+"\n"
+" Aktiveerib/keelab igapäevase turvakontrolli."
 
-#: ../../services.pm_.c:34
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"The internet superserver daemon (commonly called inetd) starts a\n"
-"variety of other internet services as needed. It is responsible for "
-"starting\n"
-"many services, including telnet, ftp, rsh, and rlogin. Disabling inetd "
-"disables\n"
-"all of the services it is responsible for."
+"Arguments: (arg)\n"
+"\n"
+"Activate/Disable ethernet cards promiscuity check."
 msgstr ""
-"Interneti \"superserver\" nimega inetd laseb käivituda mitmetel võrgu-\n"
-"teenustel, nagu telnet, ftp, rsh, rlogin jne. Inetdi keelamine keelab\n"
-"ka kõik teenused, mida see haldab."
+"Argumendid: (arg)\n"
+"\n"
+"Aktiveerib/keelab võrgukaardi mitte-eelisoleku kontrolli."
 
-#: ../../services.pm_.c:38
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Launch packet filtering for Linux kernel 2.2 series, to set\n"
-"up a firewall to protect your machine from network attacks."
+"Arguments: (arg)\n"
+"\n"
+"Use password to authenticate users."
 msgstr ""
-"Käivitab paketifiltri Linuxi kerneliseeriale 2.2 ning loob\n"
-"tulemüüri, mis kaitseb Teie masinat rünnakute eest Internetist."
+"Argumendid: (arg)\n"
+"\n"
+"Salasõna kasutamine kasutajate autentimiseks."
 
-#: ../../services.pm_.c:40
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"This package loads the selected keyboard map as set in\n"
-"/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
-"You should leave this enabled for most machines."
+"Arguments: (arg)\n"
+"\n"
+" Enabling su only from members of the wheel group or allow su from any user."
 msgstr ""
-"See pakett laeb süsteemi käivitumisel klaviatuuripaigutuse vastavalt\n"
-"failis /etc/sysconfig/keyboard kirjeldatule. Vähe on juhtumeid, kus\n"
-"seda teenust vaja ei läheks."
+"Argumendid: (arg)\n"
+"\n"
+" su lubamine ainult grupi wheel liikmetele või su lubamine igale kasutajale."
 
-#: ../../services.pm_.c:43
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Automatic regeneration of kernel header in /boot for\n"
-"/usr/include/linux/{autoconf,version}.h"
+"Arguments: (arg)\n"
+"\n"
+"Enable/Disable msec hourly security check."
 msgstr ""
-"Kerneli päise automaatne regenereerimine partitsioonil /boot\n"
-"/usr/include/linux/{autoconf,version}.h jaoks"
-
-#: ../../services.pm_.c:45
-msgid "Automatic detection and configuration of hardware at boot."
-msgstr "Riistvara automaatne tuvastamine ja seadistamine alglaadimisel."
+"Argumendid: (arg)\n"
+"\n"
+"Msec igatunnise turvakontrolli lubamine/keelamine."
 
-#: ../../services.pm_.c:46
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Linuxconf will sometimes arrange to perform various tasks\n"
-"at boot-time to maintain the system configuration."
+"Arguments: (arg)\n"
+"\n"
+"Enable/Disable the logging of IPv4 strange packets."
 msgstr ""
-"Linuxconf sooritab mõnikord alglaadimise ajal mitmesuguseid\n"
-"asju süsteemi seadistuse säilitamiseks."
+"Argumendid: (arg)\n"
+"\n"
+"Ipv4 veidrate pakettide logimise lubamine/keelamine."
 
-#: ../../services.pm_.c:48
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"lpd is the print daemon required for lpr to work properly. It is\n"
-"basically a server that arbitrates print jobs to printer(s)."
+"Arguments: (arg)\n"
+"\n"
+"Enable/Disable libsafe if libsafe is found on the system."
 msgstr ""
-"lpd on trükideemon, ilma selleta ei ole võimalik trükkida.\n"
-"Põhimõtteliselt on see server, mis saadab töö printeri(te)le."
+"Argumendid: (arg)\n"
+"\n"
+"Libsafe lubamine/keelamine, kui see süsteemist leitakse."
 
-#: ../../services.pm_.c:50
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Linux Virtual Server, used to build a high-performance and highly\n"
-"available server."
+"Arguments: (arg, alert=1)\n"
+"\n"
+"Enable/Disable IP spoofing protection."
 msgstr ""
-"Linuxi virtuaalserver, mis on mõeldud veatult töötavaks ja igati\n"
-"kättesaadavaks serveriks."
+"Argumendid: (arg, alert=1)\n"
+"\n"
+"IP võltsimiskaitse lubamine/keelamine."
 
-#: ../../services.pm_.c:52
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
-"names to IP addresses."
+"Arguments: (arg, alert=1)\n"
+"\n"
+"Enable/Disable name resolution spoofing protection.  If\n"
+"\\fIalert\\fP is true, also reports to syslog."
 msgstr ""
-"named (BIND) on kasutusel nimeserverites, mis teenindavad DNS hierarhiat, "
-"tõlkimaks nimesid IP-aadressideks."
+"Argumendid: (arg, alert=1)\n"
+"\n"
+"Nimelahenduse võltsimiskaitse lubamine/keelamine. Kui\n"
+"\\fIalert\\fP on tõese väärtusega, saadab ka raporti syslog-i."
 
-#: ../../services.pm_.c:53
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
-"Manager/Windows), and NCP (NetWare) mount points."
+"Arguments: (arg, expr='*.*', dev='tty12')\n"
+"\n"
+"Enable/Disable syslog reports to console 12. \\fIexpr\\fP is the\n"
+"expression describing what to log (see syslog.conf(5) for more details) and\n"
+"dev the device to report the log."
 msgstr ""
-"Haagib ja lahutab kõiki võrgufailisüsteeme\n"
-"(nii NFS, SMB kui ka NCP)."
+"Argumendid: (arg, expr='*.*', dev='tty12')\n"
+"\n"
+"Syslog-i raportite lubamine/keelamine konsoolile 12. \\fIexpr\\fP on \n"
+"avaldis, mis kirjeldab, mida logida (vt lähemalt syslog.conf(5)) ja \n"
+"dev seade, kuhu logiraport saata."
 
-#: ../../services.pm_.c:55
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Activates/Deactivates all network interfaces configured to start\n"
-"at boot time."
-msgstr "Aktiveerib süsteemi alglaadimisel kõik vajalikud võrguliidesed."
+"Arguments: (arg)\n"
+"\n"
+"Enable/Disable crontab and at for users. Put allowed users in /etc/cron."
+"allow and /etc/at.allow\n"
+"(see man at(1) and crontab(1))."
+msgstr ""
+"Argumendid: (arg)\n"
+"\n"
+"Crontab ja at lubamine/keelamine kasutajatele. Lubatud kasutajad "
+"kirjutatakse failidesse /etc/cron.allow ja /etc/at.allow (vt man at(1) ja "
+"crontab(1))."
 
-#: ../../services.pm_.c:57
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"NFS is a popular protocol for file sharing across TCP/IP networks.\n"
-"This service provides NFS server functionality, which is configured via the\n"
-"/etc/exports file."
+"Arguments: ()\n"
+"\n"
+"If SERVER_LEVEL (or SECURE_LEVEL if absent) is greater than 3\n"
+"in /etc/security/msec/security.conf, creates the symlink /etc/security/msec/"
+"server\n"
+"to point to /etc/security/msec/server.<SERVER_LEVEL>. The /etc/security/msec/"
+"server\n"
+"is used by chkconfig --add to decide to add a service if it is present in "
+"the file\n"
+"during the installation of packages."
 msgstr ""
-"NFS on UNIXi keskkonna standardne failijaotusprotokoll.\n"
-"See täidab NFS serveri funktsioone ja seadistatakse failis /etc/exports."
+"Argumendid: ()\n"
+"\n"
+"Kui SERVER_LEVEL (või selle puudumisel SECURE_LEVEL) failis \n"
+"/etc/security/msec/security.conf on suurem kui 3, loob sümbolviida \n"
+"/etc/security/msec/server, mis osutab failile \n"
+"/etc/security/msec/server.<SERVER_LEVEL>. /etc/security/msec/server on \n"
+"fail, mida chkconfig --add kasutab otsustamaks, kas lisada teenus või \n"
+"mitte, kui see on pakettide paigaldamise ajal failis olemas."
 
-#: ../../services.pm_.c:60
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"NFS is a popular protocol for file sharing across TCP/IP\n"
-"networks. This service provides NFS file locking functionality."
+"Arguments: (arg)\n"
+"\n"
+"Authorize all services controlled by tcp_wrappers (see hosts.deny(5)) if "
+"\\fIarg\\fP = ALL. Only local ones\n"
+"if \\fIarg\\fP = LOCAL and none if \\fIarg\\fP = NONE. To authorize the "
+"services you need, use /etc/hosts.allow\n"
+"(see hosts.allow(5))."
 msgstr ""
-"NFS on UNIXi keskkonna standardne failijaotusprotokoll.\n"
-"See programm täidab NFS failide lukustamise funktsioone.\n"
-"Vajalik serveerimisel."
+"Argumendid: (arg)\n"
+"\n"
+"Autoriseerib kõik teenused, mida kontrollib tcp_wrappers (vt hosts.deny"
+"(5)), \n"
+"kui \\fIarg\\fP = ALL. Ainult kohalikud, kui \\fIarg\\fP = LOCAL ja keelab \n"
+"kõik, kui \\fIarg\\fP = NONE. Vajalise teenuste autoriseerimiseks kasutage \n"
+"faili /etc/hosts.allow (vt hosts.allow(5))."
 
-#: ../../services.pm_.c:62
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Automatically switch on numlock key locker under console\n"
-"and XFree at boot."
-msgstr "Lülitab automaatselt alglaadimise ajal sisse numlock-i."
-
-#: ../../services.pm_.c:64
-msgid "Support the OKI 4w and compatible winprinters."
-msgstr "Toetab OKI 4w ja sellega ühilduvaid winprintereid."
+"Arguments: (arg)\n"
+"\n"
+"The argument specifies if clients are authorized to connect\n"
+"to the X server on the tcp port 6000 or not."
+msgstr ""
+"Argumendid: (arg)\n"
+"\n"
+"Argument määrab, kas klientidel on õigus võtta ühendust X-serveriga \n"
+"tcp pordis 6000 või mitte."
 
-#: ../../services.pm_.c:65
+#: ../../security/help.pm:1
+#, 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."
+"Arguments: (arg, listen_tcp=None)\n"
+"\n"
+"Allow/Forbid X connections. First arg specifies what is done\n"
+"on the client side: ALL (all connections are allowed), LOCAL (only\n"
+"local connection) and NONE (no connection)."
 msgstr ""
-"PCMCIA tugi on tavaliselt vajalik sülearvutitele võrgu- ja\n"
-"modemiliideste lisamiseks."
+"Argumendid: (arg, listen_tcp=None)\n"
+"\n"
+"Lubab/keelab X-i ühendused. Esimene arg määrab, mida tehakse kliendi \n"
+"poolel: ALL (kõik ühendused on lubatud), LOCAL (ainult kohalikud \n"
+"ühendused) ja NONE (ühendusi ei lubata)."
 
-#: ../../services.pm_.c:68
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"The portmapper manages RPC connections, which are used by\n"
-"protocols such as NFS and NIS. The portmap server must be running on "
-"machines\n"
-"which act as servers for protocols which make use of the RPC mechanism."
+"Arguments: (arg)\n"
+"\n"
+"Allow/Forbid the list of users on the system on display managers (kdm and "
+"gdm)."
 msgstr ""
-"portmapper haldab RPC ühendusi, mida kasutavad NFS ja NIS.\n"
-"Neil serveritel on see hädavajalik."
+"Argumendid: (arg)\n"
+"\n"
+"Lubab/keelab kasutajate nimekirja kuvahalduritel (kdm ja gdm)."
 
-#: ../../services.pm_.c:71
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Postfix is a Mail Transport Agent, which is the program that moves mail from "
-"one machine to another."
+"Arguments: (arg)\n"
+"\n"
+"Allow/Forbid direct root login."
 msgstr ""
-"Postfix on meili transpordiagent, see tähendab rakendus,\n"
-"mis toimetab meili ühest masinast teise."
+"Argumendid: (arg)\n"
+"\n"
+"Lubab/keelab administraatori vahetu sisselogimise."
 
-#: ../../services.pm_.c:72
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Saves and restores system entropy pool for higher quality random\n"
-"number generation."
+"Arguments: (arg)\n"
+"\n"
+"Allow/Forbid remote root login."
 msgstr ""
-"Salvestab ja taastab juhuarvude genereerimiseks vajaliku\n"
-"süsteemse entroopiasalve."
+"Argumendid: (arg)\n"
+"\n"
+"Lubab/keelab administraatori sisselogimise võrgust."
 
-#: ../../services.pm_.c:74
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Assign raw devices to block devices (such as hard drive\n"
-"partitions), for the use of applications such as Oracle"
+"Arguments: (arg)\n"
+"\n"
+"Allow/Forbid reboot by the console user."
 msgstr ""
-"Toorseadmete seostamine blokkseadmetega\n"
-"(näiteks kõvaketta partitsioonid)\n"
-"selliste rakenduste, nagu Oracle tarbeks"
+"Argumendid: (arg)\n"
+"\n"
+"Lubab/keelab konsoolikasutajal taaskäivituse."
 
-#: ../../services.pm_.c:76
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"The routed daemon allows for automatic IP router table updated via\n"
-"the RIP protocol. While RIP is widely used on small networks, more complex\n"
-"routing protocols are needed for complex networks."
+"Arguments: (arg)\n"
+"\n"
+"If \\fIarg\\fP = ALL allow /etc/issue and /etc/issue.net to exist. If \\fIarg"
+"\\fP = NONE no issues are\n"
+"allowed else only /etc/issue is allowed."
 msgstr ""
-"routed on RIP deemon, mis vahetab selle protokolli alusel\n"
-"marsruutimisinfot. Kui Teil on RIP kasutusel, on vajalik ka routed."
+"Argumendid: (arg)\n"
+"\n"
+"Kui \\fIarg\\fP = ALL, on lubatud nii /etc/issue kui /etc/issue.net. kui \n"
+"\\fIarg\\fP = NONE, ei ole lubatud muud väljundid kui need, mida määrab \n"
+"/etc/issue."
 
-#: ../../services.pm_.c:79
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"The rstat protocol allows users on a network to retrieve\n"
-"performance metrics for any machine on that network."
+"Arguments: (arg)\n"
+"\n"
+"Allow/Forbid autologin."
 msgstr ""
-"rstat protokoll laseb üle võrgu saada informatsiooni\n"
-"süsteemi töö kohta. Ettevaatust!"
+"Argumendid: (arg)\n"
+"\n"
+"Lubab/keelab automaatse sisselogimise."
 
-#: ../../services.pm_.c:81
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"The rusers protocol allows users on a network to identify who is\n"
-"logged in on other responding machines."
+"Arguments: (arg)\n"
+"\n"
+" Accept/Refuse icmp echo."
 msgstr ""
-"rusers protokoll laseb üle võrgu saada informatsiooni\n"
-"süsteemi kasutajate kohta. Ettevaatust!"
+"Argumendid: (arg)\n"
+"\n"
+" Aktsepteerib/lükkab tagasi icmp echo."
 
-#: ../../services.pm_.c:83
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"The rwho protocol lets remote users get a list of all of the users\n"
-"logged into a machine running the rwho daemon (similiar to finger)."
+"Arguments: (arg)\n"
+"\n"
+" Accept/Refuse broadcasted icmp echo."
 msgstr ""
-"rwho protokoll laseb üle võrgu saada informatsiooni\n"
-"süsteemi kasutajate kohta. Ettevaatust!"
-
-#: ../../services.pm_.c:85
-msgid "Launch the sound system on your machine"
-msgstr "Käivitab helisüsteemi"
+"Argumendid: (arg)\n"
+"\n"
+" Aktsepteerib/lükkab tagasi üldlevi icmp echo."
 
-#: ../../services.pm_.c:86
+#: ../../security/help.pm:1
+#, c-format
 msgid ""
-"Syslog is the facility by which many daemons use to log messages\n"
-"to various system log files.  It is a good idea to always run syslog."
-msgstr "Syslog-i kaudu toimub süsteemis toimiva logimine. Vajalik!"
-
-#: ../../services.pm_.c:88
-msgid "Load the drivers for your usb devices."
-msgstr "Laeb draiverid USB-seadmete tarbeks."
-
-#: ../../services.pm_.c:89
-msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Käivitab X fondiserveri, ilma milleta X lihtsalt ei lähe käima."
-
-#: ../../services.pm_.c:115 ../../services.pm_.c:157
-msgid "Choose which services should be automatically started at boot time"
-msgstr "Valige, millised teenused tuleks alglaadimisel käivitada"
+"Arguments: (arg)\n"
+"\n"
+"Accept/Refuse bogus IPv4 error messages."
+msgstr ""
+"Argumendid: (arg)\n"
+"\n"
+"Aktsepteerib/lükkab tagasi IPv4 võltsveateated."
 
-#: ../../services.pm_.c:127
-msgid "Printing"
-msgstr "Trükkimine"
+#: ../../security/level.pm:1
+#, c-format
+msgid "Security Administrator (login or email)"
+msgstr "Turvaadministraator (kasutajatunnus või e-posti aadress)"
 
-#: ../../services.pm_.c:128
-msgid "Internet"
-msgstr "Internet"
+#: ../../security/level.pm:1
+#, c-format
+msgid ""
+"A library which defends against buffer overflow and format string attacks."
+msgstr "Teek, mis kaitseb puhvri ületäite ja vormingustringide rünnaku vastu."
 
-#: ../../services.pm_.c:131
-msgid "File sharing"
-msgstr "Failide jagamine"
+#: ../../security/level.pm:1
+#, c-format
+msgid "Use libsafe for servers"
+msgstr "Serveritel kasutatakse libsafe'i"
 
-#: ../../services.pm_.c:133 ../../standalone/drakbackup_.c:1709
-msgid "System"
-msgstr "Süsteem"
+#: ../../security/level.pm:1
+#, c-format
+msgid "Security level"
+msgstr "Turvatase"
 
-#: ../../services.pm_.c:138
-msgid "Remote Administration"
-msgstr "Kaughaldus"
+#: ../../security/level.pm:1
+#, c-format
+msgid "Please choose the desired security level"
+msgstr "Palun valige meelepärane turvatase"
 
-#: ../../services.pm_.c:146
-msgid "Database Server"
-msgstr "Andmebaasi server"
+#: ../../security/level.pm:1
+#, c-format
+msgid "DrakSec Basic Options"
+msgstr "DrakSeci põhiseadistused"
 
-#: ../../services.pm_.c:175
+#: ../../security/level.pm:1
 #, c-format
-msgid "Services: %d activated for %d registered"
-msgstr "Teenused: %d aktiveeritud, kokku %d"
+msgid ""
+"This is similar to the previous level, but the system is entirely closed and "
+"security features are at their maximum."
+msgstr ""
+"Süsteem on täielikult suletud. Võrgust kasutamine on võimalik ainult\n"
+"spetsiaalselt loodud juurdepääsuteid kasutades."
 
-#: ../../services.pm_.c:191
-msgid "Services"
-msgstr "Teenused"
+#: ../../security/level.pm:1
+#, c-format
+msgid ""
+"With this security level, the use of this system as a server becomes "
+"possible.\n"
+"The security is now high enough to use the system as a server which can "
+"accept\n"
+"connections from many clients. Note: if your machine is only a client on the "
+"Internet, you should choose a lower level."
+msgstr ""
+"Sellel turvatasemel võib süsteemi kasutada Internetis ka serverina.\n"
+" Turvalisus on nüüd piisavalt kõrge, et töötades serverina võib masin\n"
+"vastu võtta ka palju kliente. Märkus: kui Teie masin kasutab Internetti\n"
+"ainult kliendina, võiks valida madalama taseme."
 
-#: ../../services.pm_.c:203
-msgid "running"
-msgstr "töötab"
+#: ../../security/level.pm:1
+#, c-format
+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."
 
-#: ../../services.pm_.c:203
-msgid "stopped"
-msgstr "peatatud"
+#: ../../security/level.pm:1
+#, c-format
+msgid ""
+"This is the standard security recommended for a computer that will be used "
+"to connect to the Internet as a client."
+msgstr ""
+"See on sobilik turvatase arvutile, mis ühendatakse Internetti kui klient."
 
-#: ../../services.pm_.c:217
-msgid "Services and deamons"
-msgstr "Teenused ja deemonid"
+#: ../../security/level.pm:1
+#, c-format
+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."
 
-#: ../../services.pm_.c:222
+#: ../../security/level.pm:1
+#, c-format
 msgid ""
-"No additional information\n"
-"about this service, sorry."
+"This level is to be used with care. It makes your system more easy to use,\n"
+"but very sensitive. It must not be used for a machine connected to others\n"
+"or to the Internet. There is no password access."
 msgstr ""
-"Selle teenuse kohta\n"
-"ei oska lisainfot anda."
+"See tase muudab küll süsteemi lihtsalt kasutatavaks, kuid väga\n"
+"haavatavaks: ligipääsupiirangute puudumise tõttu ei peaks arvutit ühendama\n"
+"ei teiste arvutitega ega ka mitte Internetti."
 
-#: ../../services.pm_.c:229
-msgid "On boot"
-msgstr "Alglaadimisel"
+#: ../../security/level.pm:1
+#, c-format
+msgid "Paranoid"
+msgstr "Paranoiline"
 
-#: ../../services.pm_.c:241
-msgid "Start"
-msgstr "Käivita"
+#: ../../security/level.pm:1
+#, c-format
+msgid "Higher"
+msgstr "Veel kõrgem"
 
-#: ../../services.pm_.c:241
-msgid "Stop"
-msgstr "Peata"
+#: ../../security/level.pm:1
+#, c-format
+msgid "High"
+msgstr "Kõrge"
 
-#: ../../share/advertising/01-thanks.pl_.c:9
-msgid "Thank you for choosing Mandrake Linux 9.0"
-msgstr "Täname, et valisite Mandrake Linux 9.0"
+#: ../../security/level.pm:1
+#, c-format
+msgid "Poor"
+msgstr "Vähene"
 
-#: ../../share/advertising/01-thanks.pl_.c:10
-msgid "Welcome to the Open Source world"
-msgstr "Tere tulemast avatud tarkvara maailma"
+#: ../../security/level.pm:1
+#, c-format
+msgid "Welcome To Crackers"
+msgstr "Tere tulemast, kräkkerid"
 
-#: ../../share/advertising/01-thanks.pl_.c:11
+#: ../../share/advertising/01-thanks.pl:1
+#, c-format
 msgid ""
 "The success of MandrakeSoft is based upon the principle of Free Software. "
 "Your new operating system is the result of collaborative work on the part of "
@@ -10103,15 +13752,18 @@ msgstr ""
 "MandrakeSofti edu tugineb vaba tarkvara põhimõtte järgimisele. Teie uus "
 "operatsioonisüsteem on üleilmse Linuxi kogukonna ühise töö tulemus."
 
-#: ../../share/advertising/02-community.pl_.c:9
-msgid "Get involved in the Free Software world"
-msgstr "Liituge vaba tarkvara maailmaga"
+#: ../../share/advertising/01-thanks.pl:1
+#, c-format
+msgid "Welcome to the Open Source world"
+msgstr "Tere tulemast avatud tarkvara maailma"
 
-#: ../../share/advertising/02-community.pl_.c:10
-msgid "Want to know more about the Open Source community?"
-msgstr "Kas soovite avatud tarkvara kogukonnast rohkem teada saada?"
+#: ../../share/advertising/01-thanks.pl:1
+#, c-format
+msgid "Thank you for choosing Mandrake Linux 9.1"
+msgstr "Täname, et valisite Mandrake Linux 9.1"
 
-#: ../../share/advertising/02-community.pl_.c:11
+#: ../../share/advertising/02-community.pl:1
+#, c-format
 msgid ""
 "To share your own knowledge and help build Linux tools, join the discussion "
 "forums you'll find on our \"Community\" webpages"
@@ -10119,81 +13771,95 @@ msgstr ""
 "Oma teadmiste jagamiseks ning Linuxi vahendite loomiseks võite ühineda "
 "diskussioonirühmadega, mida leiab meie \"kogukonna\" veebilehekülgedel"
 
-#: ../../share/advertising/03-internet.pl_.c:9
-msgid "Get the most from the Internet"
-msgstr "Võtke Internetist viimane välja"
+#: ../../share/advertising/02-community.pl:1
+#, c-format
+msgid "Want to know more about the Open Source community?"
+msgstr "Kas soovite avatud tarkvara kogukonnast rohkem teada saada?"
+
+#: ../../share/advertising/02-community.pl:1
+#, c-format
+msgid "Get involved in the Free Software world"
+msgstr "Liituge vaba tarkvara maailmaga"
 
-#: ../../share/advertising/03-internet.pl_.c:10
+#: ../../share/advertising/03-internet.pl:1
+#, c-format
 msgid ""
-"Mandrake Linux 9.0 has selected the best software for you. Surf the Web and "
+"Mandrake Linux 9.1 has selected the best software for you. Surf the Web and "
 "view animations with Mozilla and Konqueror, or read your mail and handle "
 "your personal information with Evolution and Kmail"
 msgstr ""
-"Mandrake Linux 9.0 on valinud just Teie jaoks välja parima tarkvara. Liikuge "
+"Mandrake Linux 9.1 on valinud just Teie jaoks välja parima tarkvara. Liikuge "
 "ringi veebis ja vaadake animatsioone Mozilla ja Konquerori vahendusel või "
 "lugege kirju ja korraldage oma vajalikku erainfot Evolution ja KMaili abil"
 
-#: ../../share/advertising/04-multimedia.pl_.c:9
-msgid "Discover the most up-to-date graphical and multimedia tools!"
-msgstr "Avastage uusimad ja parimad graafika- ja multimeediavahendid!"
-
-#: ../../share/advertising/04-multimedia.pl_.c:10
-msgid "Push multimedia to its limits!"
-msgstr "Võtke multimeediast kõik, mida võtta annab!"
+#: ../../share/advertising/03-internet.pl:1
+#, c-format
+msgid "Get the most from the Internet"
+msgstr "Võtke Internetist viimane välja"
 
-#: ../../share/advertising/04-multimedia.pl_.c:11
+#: ../../share/advertising/04-multimedia.pl:1
+#, c-format
 msgid ""
-"Mandrake Linux 9.0 enables you to use the very latest software to play audio "
+"Mandrake Linux 9.1 enables you to use the very latest software to play audio "
 "files, edit and handle your images or photos, and play videos"
 msgstr ""
-"Mandrake Linux 9.0 võimaldab teil kasutada uusimat tarkvara helifailide "
+"Mandrake Linux 9.1 võimaldab teil kasutada uusimat tarkvara helifailide "
 "mängimiseks, piltide või fotode töötlemiseks ning videode vaatamiseks"
 
-#: ../../share/advertising/05-games.pl_.c:9
-msgid "Games"
-msgstr "Mängud"
+#: ../../share/advertising/04-multimedia.pl:1
+#, c-format
+msgid "Push multimedia to its limits!"
+msgstr "Võtke multimeediast kõik, mida võtta annab!"
 
-#: ../../share/advertising/05-games.pl_.c:10
+#: ../../share/advertising/04-multimedia.pl:1
+#, c-format
+msgid "Discover the most up-to-date graphical and multimedia tools!"
+msgstr "Avastage uusimad ja parimad graafika- ja multimeediavahendid!"
+
+#: ../../share/advertising/05-games.pl:1
+#, c-format
 msgid ""
-"Mandrake Linux 9.0 provides the best Open Source games - arcade, action, "
+"Mandrake Linux 9.1 provides the best Open Source games - arcade, action, "
 "strategy, ..."
 msgstr ""
-"Mandrake Linux 9.0 pakub parimaid avatud tarkvara mänge - põnevust, "
+"Mandrake Linux 9.1 pakub parimaid avatud tarkvara mänge - põnevust, "
 "seiklusi, strateegiat..."
 
-#: ../../share/advertising/06-mcc.pl_.c:9 ../../standalone/drakbug_.c:49
-msgid "Mandrake Control Center"
-msgstr "Mandrake juhtimiskeskus"
+#: ../../share/advertising/05-games.pl:1
+#, c-format
+msgid "Games"
+msgstr "Mängud"
 
-#: ../../share/advertising/06-mcc.pl_.c:10
+#: ../../share/advertising/06-mcc.pl:1
+#, c-format
 msgid ""
-"Mandrake Linux 9.0 provides a powerful tool to fully customize and configure "
+"Mandrake Linux 9.1 provides a powerful tool to fully customize and configure "
 "your machine"
 msgstr ""
-"Mandrake Linux 9.0 pakub võimsa vahendi oma masinat igati kohandada ja "
+"Mandrake Linux 9.1 pakub võimsa vahendi oma masinat igati kohandada ja "
 "seadistada"
 
-#: ../../share/advertising/07-desktop.pl_.c:9
-msgid "User interfaces"
-msgstr "Kasutajaliidesed"
+#: ../../share/advertising/06-mcc.pl:1 ../../standalone/drakbug:1
+#, c-format
+msgid "Mandrake Control Center"
+msgstr "Mandrake juhtimiskeskus"
 
-#: ../../share/advertising/07-desktop.pl_.c:10
+#: ../../share/advertising/07-desktop.pl:1
+#, c-format
 msgid ""
-"Mandrake Linux 9.0 provides you with 11 user interfaces that can be fully "
+"Mandrake Linux 9.1 provides you with 11 user interfaces that can be fully "
 "modified: KDE 3, Gnome 2, WindowMaker, ..."
 msgstr ""
-"Mandrake Linux 9.0 pakub Teile 11 kasutajaliidest, mida saab igati "
+"Mandrake Linux 9.1 pakub Teile 11 kasutajaliidest, mida saab igati "
 "kohandada: KDE 3, GNOME 2, WindowMaker..."
 
-#: ../../share/advertising/08-development.pl_.c:9
-msgid "Development simplified"
-msgstr "Arendus lihtsamat moodi"
-
-#: ../../share/advertising/08-development.pl_.c:10
-msgid "Mandrake Linux 9.0 is the ultimate development platform"
-msgstr "Mandrake Linux 9.0 kujutab endast täiuslikku arendusplatvormi"
+#: ../../share/advertising/07-desktop.pl:1
+#, c-format
+msgid "User interfaces"
+msgstr "Kasutajaliidesed"
 
-#: ../../share/advertising/08-development.pl_.c:11
+#: ../../share/advertising/08-development.pl:1
+#, c-format
 msgid ""
 "Use the full power of the GNU gcc 3 compiler as well as the best Open Source "
 "development environments"
@@ -10201,11 +13867,18 @@ msgstr ""
 "Kasutage GNU gcc 3 kompilaatori täit jõudu ning parimaid arendusplatvorme, "
 "mida avatud tarkvara kogukond suudab pakkuda"
 
-#: ../../share/advertising/09-server.pl_.c:9
-msgid "Turn your machine into a reliable server"
-msgstr "Muutke oma masin usaldust väärivaks serveriks"
+#: ../../share/advertising/08-development.pl:1
+#, c-format
+msgid "Mandrake Linux 9.1 is the ultimate development platform"
+msgstr "Mandrake Linux 9.1 kujutab endast täiuslikku arendusplatvormi"
+
+#: ../../share/advertising/08-development.pl:1
+#, c-format
+msgid "Development simplified"
+msgstr "Arendus lihtsamat moodi"
 
-#: ../../share/advertising/09-server.pl_.c:10
+#: ../../share/advertising/09-server.pl:1
+#, c-format
 msgid ""
 "Transform your machine into a powerful Linux server with a few clicks of "
 "your mouse: Web server, mail, firewall, router, file and print server, ..."
@@ -10213,19 +13886,18 @@ msgstr ""
 "Kujundage vaid mõne hiireklõpsuga enda masinast võimas Linuxi server: "
 "veebiserver, meili-, tulemüüri-, marsruutimis-, faili- ja printserver..."
 
-#: ../../share/advertising/10-mnf.pl_.c:9
-msgid "Optimize your security"
-msgstr "Turvalisus, nagu Teile meeldib"
+#: ../../share/advertising/09-server.pl:1
+#, c-format
+msgid "Turn your machine into a reliable server"
+msgstr "Muutke oma masin usaldust väärivaks serveriks"
 
-#: ../../share/advertising/10-mnf.pl_.c:10
-msgid ""
-"The MandrakeSecurity range includes the Multi Network Firewall product (M.N."
-"F.)"
-msgstr ""
-"MandrakeSecurity tootepere sisaldab universaalset tulemüüri \"Multi Network "
-"Firewall\" (M.N.F.)"
+#: ../../share/advertising/10-mnf.pl:1
+#, c-format
+msgid "This product is available on MandrakeStore website"
+msgstr "See toode on saadaval MandrakeStore veebisaidil"
 
-#: ../../share/advertising/10-mnf.pl_.c:11
+#: ../../share/advertising/10-mnf.pl:1
+#, c-format
 msgid ""
 "This firewall product includes network features that allow you to fulfill "
 "all your security needs"
@@ -10233,15 +13905,22 @@ msgstr ""
 "See tulemüür sisaldab võrguvõimalusi, mis lubavad rahuldada kõik vajadused, "
 "mis Teil turvalisuse osas võivad esineda"
 
-#: ../../share/advertising/10-mnf.pl_.c:12
-msgid "This product is available on MandrakeStore website"
-msgstr "See toode on saadaval MandrakeStore veebisaidil"
+#: ../../share/advertising/10-mnf.pl:1
+#, c-format
+msgid ""
+"The MandrakeSecurity range includes the Multi Network Firewall product (M.N."
+"F.)"
+msgstr ""
+"MandrakeSecurity tootepere sisaldab universaalset tulemüüri \"Multi Network "
+"Firewall\" (M.N.F.)"
 
-#: ../../share/advertising/11-mdkstore.pl_.c:9
-msgid "The official MandrakeSoft store"
-msgstr "MandrakeSofti ametlik kauplusladu"
+#: ../../share/advertising/10-mnf.pl:1
+#, c-format
+msgid "Optimize your security"
+msgstr "Turvalisus, nagu Teile meeldib"
 
-#: ../../share/advertising/11-mdkstore.pl_.c:10
+#: ../../share/advertising/11-mdkstore.pl:1
+#, c-format
 msgid ""
 "Our full range of Linux solutions, as well as special offers on products and "
 "other \"goodies,\" are available online on our e-store:"
@@ -10249,11 +13928,13 @@ msgstr ""
 "Täisvaliku meie Linuxi lahendusi, samuti toodete eripakkumised ja muud "
 "\"soodustused\", leiate meie internetikaubamajast:"
 
-#: ../../share/advertising/12-mdkstore.pl_.c:9
-msgid "Strategic partners"
-msgstr "Strateegilised partnerid"
+#: ../../share/advertising/11-mdkstore.pl:1
+#, c-format
+msgid "The official MandrakeSoft store"
+msgstr "MandrakeSofti ametlik kauplusladu"
 
-#: ../../share/advertising/12-mdkstore.pl_.c:10
+#: ../../share/advertising/12-mdkstore.pl:1
+#, c-format
 msgid ""
 "MandrakeSoft works alongside a selection of companies offering professional "
 "solutions compatible with Mandrake Linux. A list of these partners is "
@@ -10263,23 +13944,13 @@ msgstr ""
 "ühilduvaid professionaalseid rakendusi. Nende partnerite loendi leiab "
 "MandrakeStore veebileheküljelt"
 
-#: ../../share/advertising/13-mdkcampus.pl_.c:9
-msgid "Discover MandrakeSoft's training catalogue Linux-Campus"
-msgstr "Tutvuge MandrakeSofti õpingukeskusega Linux-Campus"
-
-#: ../../share/advertising/13-mdkcampus.pl_.c:10
-msgid ""
-"The training program has been created to respond to the needs of both end "
-"users and experts (Network and System administrators)"
-msgstr ""
-"Õppeprogrammi loomisel võeti arvesse nii lõppkasutajate kui ekspertide "
-"(võrgu- ja süsteemiadministraatorid) vajadusi"
-
-#: ../../share/advertising/13-mdkcampus.pl_.c:11
-msgid "Certify yourself on Linux"
-msgstr "Hankige endale Linuxi sertifikaat"
+#: ../../share/advertising/12-mdkstore.pl:1
+#, c-format
+msgid "Strategic partners"
+msgstr "Strateegilised partnerid"
 
-#: ../../share/advertising/13-mdkcampus.pl_.c:12
+#: ../../share/advertising/13-mdkcampus.pl:1
+#, c-format
 msgid ""
 "Whether you choose to teach yourself online or via our network of training "
 "partners, the Linux-Campus catalogue prepares you for the acknowledged LPI "
@@ -10290,17 +13961,27 @@ msgstr ""
 "tunnustatud LPI sertifitseerimisprogrammi läbimiseks (see on üleilmne "
 "tehnilise professionaalsuse sertifikaat)"
 
-#: ../../share/advertising/14-mdkexpert.pl_.c:9
-msgid "Become a MandrakeExpert"
-msgstr "Omandage Mandrake eksperdi kuulsus"
+#: ../../share/advertising/13-mdkcampus.pl:1
+#, c-format
+msgid "Certify yourself on Linux"
+msgstr "Hankige endale Linuxi sertifikaat"
 
-#: ../../share/advertising/14-mdkexpert.pl_.c:10
+#: ../../share/advertising/13-mdkcampus.pl:1
+#, c-format
 msgid ""
-"Find the solutions of your problems via MandrakeSoft's online support "
-"platform"
-msgstr "Leidke oma probleemidele lahendus MandrakeSofti internetitoe abil"
+"The training program has been created to respond to the needs of both end "
+"users and experts (Network and System administrators)"
+msgstr ""
+"Õppeprogrammi loomisel võeti arvesse nii lõppkasutajate kui ekspertide "
+"(võrgu- ja süsteemiadministraatorid) vajadusi"
+
+#: ../../share/advertising/13-mdkcampus.pl:1
+#, c-format
+msgid "Discover MandrakeSoft's training catalogue Linux-Campus"
+msgstr "Tutvuge MandrakeSofti õpingukeskusega Linux-Campus"
 
-#: ../../share/advertising/14-mdkexpert.pl_.c:11
+#: ../../share/advertising/14-mdkexpert.pl:1
+#, c-format
 msgid ""
 "Join the MandrakeSoft support teams and the Linux Community online to share "
 "your knowledge and help others by becoming a recognized Expert on the online "
@@ -10310,15 +13991,20 @@ msgstr ""
 "et jagada oma kogemusi ning aidata ka teistel saada tunnustatud ekspertideks "
 "tehnilise toe veebileheküljel:"
 
-#: ../../share/advertising/15-mdkexpert-corporate.pl_.c:9
-msgid "MandrakeExpert Corporate"
-msgstr "Mandrake äriekspert"
+#: ../../share/advertising/14-mdkexpert.pl:1
+#, c-format
+msgid ""
+"Find the solutions of your problems via MandrakeSoft's online support "
+"platform"
+msgstr "Leidke oma probleemidele lahendus MandrakeSofti internetitoe abil"
 
-#: ../../share/advertising/15-mdkexpert-corporate.pl_.c:10
-msgid "An online platform to respond to company's specific support needs"
-msgstr "Internetiplatvorm, mis vastab firmade spetsiifilistele tugivajadustele"
+#: ../../share/advertising/14-mdkexpert.pl:1
+#, c-format
+msgid "Become a MandrakeExpert"
+msgstr "Omandage Mandrake eksperdi kuulsus"
 
-#: ../../share/advertising/15-mdkexpert-corporate.pl_.c:11
+#: ../../share/advertising/15-mdkexpert-corporate.pl:1
+#, c-format
 msgid ""
 "All incidents will be followed up by a single qualified MandrakeSoft "
 "technical expert."
@@ -10326,11 +14012,18 @@ msgstr ""
 "Iga teadet jälgib ja lahendab konkreetne ja kvalifitseeritud MandrakeSofti "
 "tehniline töötaja."
 
-#: ../../share/advertising/17-mdkclub.pl_.c:9
-msgid "Discover MandrakeClub and Mandrake Corporate Club"
-msgstr "Avastage Mandrake klubi ja Mandrake äriklubi"
+#: ../../share/advertising/15-mdkexpert-corporate.pl:1
+#, c-format
+msgid "An online platform to respond to company's specific support needs"
+msgstr "Internetiplatvorm, mis vastab firmade spetsiifilistele tugivajadustele"
+
+#: ../../share/advertising/15-mdkexpert-corporate.pl:1
+#, c-format
+msgid "MandrakeExpert Corporate"
+msgstr "Mandrake äriekspert"
 
-#: ../../share/advertising/17-mdkclub.pl_.c:10
+#: ../../share/advertising/17-mdkclub.pl:1
+#, c-format
 msgid ""
 "MandrakeClub and Mandrake Corporate Club were created for business and "
 "private users of Mandrake Linux who would like to directly support their "
@@ -10346,308 +14039,256 @@ msgstr ""
 "kui Te soovite toetada Mandrake Linuxi arendamist, siis ühinege Mandrake "
 "klubiga!"
 
-#: ../../standalone.pm_.c:21
-msgid ""
-"This program is free software; you can redistribute it and/or modify\n"
-"it under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2, or (at your option)\n"
-"any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful,\n"
-"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-"GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License\n"
-"along with this program; if not, write to the Free Software\n"
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
-msgstr ""
-"Käesolev rakendus on vaba tarkvara. Te võite seda edasi levitada\n"
-"ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu\n"
-"need on avaldanud Vaba Tarkvara Fond; kas Litsentsi versioon number 2\n"
-"või (vastavalt Teie valikule) ükskõik milline hilisem versioon.\n"
-"\n"
-"Seda rakendust levitatakse lootuses, et see on kasulik, kuid\n"
-"ILMA IGASUGUSE GARANTIITA; isegi KESKMISE/TAVALISE\n"
-"KVALITEEDI GARANTIITA või SOBIVUSELE TEATUD KINDLAKS\n"
-"EESMÄRGIKS. Üksikasjade suhtes vaadake GNU Üldist Avalikku Litsentsi.\n"
-"\n"
-"Te peaks olema saanud GNU Üldise Avaliku Litsentsi koopia koos selle\n"
-"rakendusega; kui ei, siis võtke ühendust Vaba Tarkvara Fondiga aadressil:\n"
-"Free Software Foundation, 59 Temple Place - Suite 330, Boston,\n"
-"MA 02111-1307, USA.\n"
+#: ../../share/advertising/17-mdkclub.pl:1
+#, c-format
+msgid "Discover MandrakeClub and Mandrake Corporate Club"
+msgstr "Avastage Mandrake klubi ja Mandrake äriklubi"
 
-#: ../../standalone.pm_.c:40
-msgid ""
-"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
-"Backup and Restore application\n"
-"\n"
-"--default             : save default directories.\n"
-"--debug               : show all debug messages.\n"
-"--show-conf           : list of files or directories to backup.\n"
-"--config-info         : explain configuration file options (for non-X "
-"users).\n"
-"--daemon              : use daemon configuration. \n"
-"--help                : show this message.\n"
-"--version             : show version name.\n"
-msgstr ""
-"[--config-info] [--daemon] [--debug] [--default] [--show-conf]\n"
-"Varundamis- ja taastamisrakendus\n"
-"\n"
-"--default             : salvestab vaikekataloogid.\n"
-"--debug               : näitab kõiki silumisteateid.\n"
-"--show-conf           : varundatavate failide või kataloogide loend.\n"
-"--config-info         : selgitab seadetefaili võtmeid (X-i "
-"mittekasutajaile).\n"
-"--daemon              : kasutab deemoni sätteid.\n"
-"--help                 : näitab käesolevat abiteadet.\n"
-"--version              : näitab versiooni nime.\n"
+# c-format
+#: ../../standalone/XFdrake:1
+#, c-format
+msgid "Please relog into %s to activate the changes"
+msgstr "Muudatuste aktiveerimiseks käivitage %s uuesti"
 
-#: ../../standalone.pm_.c:51
-msgid ""
-"[OPTIONS] [PROGRAM_NAME]\n"
-"\n"
-"OPTIONS:\n"
-"  --help            - print this help message.\n"
-"  --report          - program should be one of mandrake tools\n"
-"  --incident        - program should be one of mandrake tools"
-msgstr ""
-"[VÕTMED] [RAKENDUSE_NIMI]\n"
-"\n"
-"VÕTMED:\n"
-"  --help            - näitab käesolevat abiteadet.\n"
-"  -report           - rakendus peab olema üks Mandrake tööriistadest\n"
-"  -incident         - rakendus peab olema üks Mandrake tööriistadest"
+#: ../../standalone/XFdrake:1
+#, c-format
+msgid "Please log out and then use Ctrl-Alt-BackSpace"
+msgstr "Palun väljuge ja vajutage siis Ctrl-Alt-BackSpace"
 
-#: ../../standalone.pm_.c:57
-msgid ""
-"Font Importation and monitoring "
-"application                                     \n"
-"--windows_import : import from all available windows partitions.\n"
-"--xls_fonts      : show all fonts that already exist from xls\n"
-"--strong         : strong verification of font.\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 ""
-"Fontide importimise ja jälgimise "
-"rakendus                                       \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        : paigaldada iga fondifail ja kataloog.\n"
-"--uninstall      : eemaldada iga font või fondikataloog.\n"
-"--replace        : asendada 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."
+#: ../../standalone/drakTermServ:1
+#, 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.pm_.c:68
-msgid ""
-"[OPTIONS]...\n"
-"\t      --debug         print debugging information"
-msgstr ""
-"[VÕTMED}...\n"
-"\t      --debug         näitab veateateid"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Need to create /etc/dhcpd.conf first!"
+msgstr "Esmalt tuleb luua /etc/dhcpd.conf!"
 
-#: ../../standalone.pm_.c:70
-msgid ""
-"[OPTIONS]...\n"
-"Mandrake Terminal Server Configurator\n"
-"--enable         : enable MTS\n"
-"--disable        : disable MTS\n"
-"--start          : start MTS\n"
-"--stop           : stop MTS\n"
-"--adduser        : add an existing system user to MTS (requires username)\n"
-"--deluser        : delete an existing system user from MTS (requires "
-"username)\n"
-"--addclient      : add a client machine to MTS (requires MAC address, IP, "
-"nbi image name)\n"
-"--delclient      : delete a client machine from MTS (requires MAC address, "
-"IP, nbi image name)"
-msgstr ""
-"[VÕTMED]...\n"
-"Mandrake terminaliserveri seadistaja\n"
-"--enable         : lubab MTSi\n"
-"--disable        : keelab MTSi\n"
-"--start          : käivitab MTSi\n"
-"--stop           : peatab MTSi\n"
-"--adduser        : lisab olemasoleva kasutaja MTSile (nõutav on "
-"kasutajanimi)\n"
-"--deluser        : kustutab olemasoleva kasutaja MTSist (nõutav on "
-"kasutajanimi)\n"
-"--addclient      : lisab kliendimasina MTSile (nõutav on MAC-aadress, IP, "
-"nbi laadepildi nimi)\n"
-"--delclient      : kustutab kliendimasina MTSist (nõutav on MAC-aadress, IP, "
-"nbi laadepildi nimi)"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Something went wrong! - Is mkisofs installed?"
+msgstr "Midagi läks valesti! - Kas mkisofs on ikka paigaldatud?"
 
-#: ../../standalone.pm_.c:82
-msgid "[keyboard]"
-msgstr "[klaviatuur]"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Etherboot ISO image is %s"
+msgstr "Etherboot ISO-laadefail on %s"
 
-#: ../../standalone.pm_.c:83
-msgid "[--file=myfyle] [--word=myword] [--explain=regexp] [--alert]"
-msgstr ""
-"[--file=minufail] [--word=minusõna] [--explain=regulaaravaldis] [--alert]"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "No floppy drive available!"
+msgstr "Flopiseade ei ole kättesaadav!"
 
-#: ../../standalone.pm_.c:84
-msgid ""
-"[OPTIONS]\n"
-"Network & Internet connection and monitoring application\n"
-"\n"
-"--defaultintf interface : show this interface by default\n"
-"--connect : connect to internet if not already connected\n"
-"--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."
-msgstr ""
-"[VÕTMED]\n"
-"Kohtvõrgu ja Interneti ühenduse ja jälgimise rakendus\n"
-"\n"
-"--defaultintf liides : näidab vaikimis antud liidest\n"
-"--connect : ühendab Internetiga, kui ei ole veel ühendust\n"
-"--disconnect : lahutab Internetist, kui on juba ühendus\n"
-"--force : koos võtmega (dis)connect : sunni ühendama/lahutama\n"
-"--status : vastuseks 1, kui on ühendatud, muul juhul 0 ja väljumine.\n"
-"--quiet : lülitab välja interaktiivsuse. Koos võtmega (dis)connect."
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Floppy can be removed now"
+msgstr "Flopi võib nüüd välja võtta"
 
-#: ../../standalone.pm_.c:93
-msgid " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
-msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Couldn't access the floppy!"
+msgstr "Ei suuda flopit leida!"
 
-#: ../../standalone.pm_.c:94
-msgid ""
-"[OPTION]...\n"
-"  --no-confirmation      don't ask first confirmation question in "
-"MandrakeUpdate mode\n"
-"  --no-verify-rpm        don't 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"
-"  -no-verify-rpm        pakettide signatuure ei kontrollita\n"
-"  --changelog-first      näitab kirjelduse aknas enne faililoendit "
-"muudatuste logi\n"
-"  -merge-all-rpmnew     proovib liita kõik leitud failid .rpmnew/.rpmsave"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Please insert floppy disk:"
+msgstr "Sisestage palun flopi:"
 
-#: ../../standalone.pm_.c:99
-msgid ""
-"[--manual] [--device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] "
-"[--dynamic=dev]"
-msgstr ""
-"[--manual] [device=dev] [--update-sane=sane_desc_dir] [--update-usbtable] [--"
-"dynamic=dev]"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Write Config"
+msgstr "Salvesta seadistus"
 
-#: ../../standalone.pm_.c:100
-msgid ""
-" [everything]\n"
-"       XFdrake [--noauto] monitor\n"
-"       XFdrake resolution"
-msgstr ""
-" [kõik]\n"
-"       XFDrake [--noauto] monitor\n"
-"       XFDrake kuvatihedus"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Dynamic IP Address Pool:"
+msgstr "Dünaamiline IP-aadresside vahemik:"
 
-#: ../../standalone.pm_.c:114
+#: ../../standalone/drakTermServ:1
 #, c-format
 msgid ""
-"\n"
-"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
-"testing] [-v|--version] "
+"Most of these values were extracted\n"
+"from your running system.\n"
+"You can modify as needed."
 msgstr ""
-"\n"
-"Kasutamine: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
-"testing] [-v|--version]"
-
-#: ../../standalone.pm_.c:168
-msgid "Installing packages..."
-msgstr "Pakettide paigaldamine..."
-
-#: ../../standalone/XFdrake_.c:138
-msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "Palun väljuge ja vajutage siis Ctrl-Alt-BackSpace"
+"Enamik väärtusi on võetud Teie töötavast\n"
+"süsteemist. Võite neid vajadusel muuta."
 
-# c-format
-#: ../../standalone/XFdrake_.c:142
+#: ../../standalone/drakTermServ:1
 #, c-format
-msgid "Please relog into %s to activate the changes"
-msgstr "Muudatuste aktiveerimiseks käivitage %s uuesti"
+msgid "dhcpd Server Configuration"
+msgstr "Dhcpd serveri seadistamine"
 
-#: ../../standalone/drakTermServ_.c:239
-msgid "Mandrake Terminal Server Configuration"
-msgstr "Mandrake terminaliserveri sätted"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "IP Range End:"
+msgstr "IP vahemiku lõpp:"
 
-#: ../../standalone/drakTermServ_.c:253
-msgid "Enable Server"
-msgstr "Serveri lubamine"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "IP Range Start:"
+msgstr "IP vahemiku algus:"
 
-#: ../../standalone/drakTermServ_.c:260
-msgid "Disable Server"
-msgstr "Serveri keelamine"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Name Servers:"
+msgstr "Nimeserverid:"
 
-#: ../../standalone/drakTermServ_.c:268
-msgid "Start Server"
-msgstr "Serveri käivitamine"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Domain Name:"
+msgstr "Domeeninimi:"
 
-#: ../../standalone/drakTermServ_.c:275
-msgid "Stop Server"
-msgstr "Serveri peatamine"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Broadcast Address:"
+msgstr "Üldlevi aadress:"
 
-#: ../../standalone/drakTermServ_.c:283
-msgid "Etherboot Floppy/ISO"
-msgstr "Etherboot flopi/ISO"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Subnet Mask:"
+msgstr "Alamvõrgu mask:"
 
-#: ../../standalone/drakTermServ_.c:288
-msgid "Net Boot Images"
-msgstr "Võrgu alglaadepildid"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Routers:"
+msgstr "Ruuterid:"
 
-#: ../../standalone/drakTermServ_.c:294
-msgid "Add/Del Users"
-msgstr "Lisa/kustuta kasutaja"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Netmask:"
+msgstr "Võrgumask:"
 
-#: ../../standalone/drakTermServ_.c:299
-msgid "Add/Del Clients"
-msgstr "Lisa/kustuta klient"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Subnet:"
+msgstr "Alamvõrk:"
 
-#: ../../standalone/drakTermServ_.c:328
+#: ../../standalone/drakTermServ:1
+#, c-format
 msgid ""
-"\n"
-" Copyright (C) 2002 by MandrakeSoft \n"
-"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
-"\n"
+"Need to restart the Display Manager for full changes to take effect. \n"
+"(service dm restart - at the console)"
 msgstr ""
-"\n"
-" Copyright (C) 2002: MandrakeSoft \n"
-"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
-"\n"
+"Muutuste täielikuks jõustamiseks tuleb kuvahaldur taaskäivitada.\n"
+"(käsurealt: service dm restart)"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "dhcpd Config..."
+msgstr "Dhcpd seadistamine..."
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Delete Client"
+msgstr "Kustuta klient"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "<-- Edit Client"
+msgstr "<-- Muuda klienti"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Add Client -->"
+msgstr "Lisa klient -->"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Allow Thin Clients"
+msgstr "Luba õhukesi kliente"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Thin Client"
+msgstr "Õhuke Klient"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "No net boot images created!"
+msgstr "Võrgu alglaadefaile pole loodud!"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "type: %s"
+msgstr "tüüp: %s"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "<-- Del User"
+msgstr "<-- Kustuta kasutaja"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Add User -->"
+msgstr "Lisa kasutaja -->"
 
-#: ../../standalone/drakTermServ_.c:332
+#: ../../standalone/drakTermServ:1
+#, c-format
 msgid ""
-"\n"
-"\n"
-" Thanks:\n"
-"\t- LTSP Project http://www.ltsp.org\n"
-"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
-"\n"
+"!!! Indicates the password in the system database is different than\n"
+" the one in the Terminal Server database.\n"
+"Delete/re-add the user to the Terminal Server to enable login."
 msgstr ""
-"\n"
-"\n"
-" Täname:\n"
-"\t- LTSP projekti http://www.ltsp.org\n"
-"\t- Michael rowni <mbrown\\@fensystems.co.uk>\n"
-"\n"
+"!!! Näitab, et parool antud süsteemis erineb sellest, mida teab\n"
+"terminalserver.\n"
+"Palun kustutage ja looge see kasutaja terminalserveris uuesti, et "
+"võimaldada\n"
+"sisselogimist."
 
-#: ../../standalone/drakTermServ_.c:365
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Delete All NBIs"
+msgstr "Kustuta kõik võrgu alglaadefailid"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "<-- Delete"
+msgstr "<-- Kustuta"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "This will take a few minutes."
+msgstr "Selleks kulub päris mitu minutit."
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Build All Kernels -->"
+msgstr "Loo kõik kernelid -->"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "No NIC selected!"
+msgstr "Võrgukaarti pole valitud!"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Build Single NIC -->"
+msgstr "Loo ainus võrgukaart -->"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "No kernel selected!"
+msgstr "Kernelit pole valitud!"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Build Whole Kernel -->"
+msgstr "Loo terve kernel -->"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Boot ISO"
+msgstr "Alglaadimis-ISO"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Boot Floppy"
+msgstr "Alglaadimisflopi"
+
+#: ../../standalone/drakTermServ:1
+#, c-format
 msgid ""
 "drakTermServ Overview\n"
 "\t\t\t   \n"
@@ -10676,7 +14317,7 @@ msgid ""
 "\t\t\t\thost curly {\n"
 "\t\t\t\t\thardware ethernet        00:20:af:2f:f7:9d;\n"
 "\t\t\t\t\tfixed-address              192.168.192.3;\n"
-"\t\t\t\t\t/*type                          fat;*/\n"
+"\t\t\t\t\t#type                          fat;\n"
 "\t\t\t\t\tfilename                      \"i386/boot/boot-3c509.2.4.18-6mdk."
 "nbi\";\n"
 "\t\t\t\t}\n"
@@ -10687,8 +14328,8 @@ msgid ""
 "functionality\n"
 "\t\t\tof client-specific configuration files that ClusterNFS provides.\n"
 "\t\t\t\n"
-"\t\t\tNote: The \"/*type\" entry is only used by drakTermServ.  Clients can "
-"either be \"thin\"*/\n"
+"\t\t\tNote: The \"#type\" entry is only used by drakTermServ.  Clients can "
+"either be \"thin\"\n"
 "\t\t\tor 'fat'.  Thin clients run most software on the server via xdmcp, "
 "while fat clients run most\n"
 "\t\t\tsoftware on the client machine. A special inittab, /etc/inittab\\$\\"
@@ -10777,8 +14418,8 @@ msgid ""
 "        \t\tA basic example of creating a boot floppy for a 3Com 3c509 "
 "manually:\n"
 "        \t\t\n"
-"        \t\tcat /usr/lib/etherboot/boot1a.bin /\\n        \t\t\t/usr/lib/"
-"etherboot/lzrom/3c509.lzrom > /dev/fd0\n"
+"        \t\tcat /usr/lib/etherboot/boot1a.bin \\\n"
+"        \t\t\t/usr/lib/etherboot/lzrom/3c509.lzrom > /dev/fd0\n"
 " \n"
 "\n"
 msgstr ""
@@ -10917,211 +14558,155 @@ msgstr ""
 " \n"
 "\n"
 
-#: ../../standalone/drakTermServ_.c:488
-msgid "Boot Floppy"
-msgstr "Alglaadimisflopi"
-
-#: ../../standalone/drakTermServ_.c:490
-msgid "Boot ISO"
-msgstr "Alglaadimis-ISO"
-
-#: ../../standalone/drakTermServ_.c:559
-msgid "Build Whole Kernel -->"
-msgstr "Loo terve kernel -->"
-
-#: ../../standalone/drakTermServ_.c:561 ../../standalone/drakTermServ_.c:591
-msgid "This will take a few minutes."
-msgstr "Selleks kulub päris mitu minutit."
-
-#: ../../standalone/drakTermServ_.c:573
-msgid "No kernel selected!"
-msgstr "Kernelit pole valitud!"
-
-#: ../../standalone/drakTermServ_.c:576
-msgid "Build Single NIC -->"
-msgstr "Loo ainus võrgukaart -->"
-
-#: ../../standalone/drakTermServ_.c:587
-msgid "No nic selected!"
-msgstr "Võrgukaarti pole valitud!"
-
-#: ../../standalone/drakTermServ_.c:590
-msgid "Build All Kernels -->"
-msgstr "Loo kõik kernelid -->"
-
-#: ../../standalone/drakTermServ_.c:604
-msgid "<-- Delete"
-msgstr "<-- Kustuta"
-
-#: ../../standalone/drakTermServ_.c:611
-msgid "Delete All NBIs"
-msgstr "Kustuta kõik võrgu alglaadepildid"
-
-#: ../../standalone/drakTermServ_.c:668
+#: ../../standalone/drakTermServ:1
+#, c-format
 msgid ""
-"!!! Indicates the password in the system database is different than\n"
-" the one in the Terminal Server database.\n"
-"Delete/re-add the user to the Terminal Server to enable login."
+"\n"
+"\n"
+" Thanks:\n"
+"\t- LTSP Project http://www.ltsp.org\n"
+"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
+"\n"
 msgstr ""
-"!!! Näitab, et parool antud süsteemis erineb sellest, mida teab\n"
-"terminalserver.\n"
-"Palun kustutage ja looge see kasutaja terminalserveris uuesti, et "
-"võimaldada\n"
-"sisselogimist."
-
-#: ../../standalone/drakTermServ_.c:673
-msgid "Add User -->"
-msgstr "Lisa kasutaja -->"
-
-#: ../../standalone/drakTermServ_.c:681
-msgid "<-- Del User"
-msgstr "<-- Kustuta kasutaja"
+"\n"
+"\n"
+" Täname:\n"
+"\t- LTSP projekti http://www.ltsp.org\n"
+"\t- Michael rowni <mbrown\\@fensystems.co.uk>\n"
+"\n"
 
-#: ../../standalone/drakTermServ_.c:720
+#: ../../standalone/drakTermServ:1
 #, c-format
-msgid "type: %s"
-msgstr "tüüp: %s"
-
-#: ../../standalone/drakTermServ_.c:753
-msgid "No net boot images created!"
-msgstr "Võrgu alglaadepilte pole loodud!"
-
-#: ../../standalone/drakTermServ_.c:773
-msgid "Thin Client"
-msgstr "Õhuke Klient"
-
-#: ../../standalone/drakTermServ_.c:775
-msgid "Allow Thin Clients"
-msgstr "Luba õhukesi kliente"
-
-#: ../../standalone/drakTermServ_.c:778
-msgid "Add Client -->"
-msgstr "Lisa klient -->"
-
-#: ../../standalone/drakTermServ_.c:821
-msgid "<-- Edit Client"
-msgstr "<-- Muuda klienti"
-
-#: ../../standalone/drakTermServ_.c:837
-msgid "Delete Client"
-msgstr "Kustuta klient"
-
-#: ../../standalone/drakTermServ_.c:843
-msgid "dhcpd Config..."
-msgstr "Dhcpd seadistamine..."
-
-#: ../../standalone/drakTermServ_.c:876
 msgid ""
-"Need to restart the Display Manager for full changes to take effect. \n"
-"(service dm restart - at the console)"
+"\n"
+" Copyright (C) 2002 by MandrakeSoft \n"
+"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
+"\n"
 msgstr ""
-"Muutuste täielikuks jõustamiseks peate konsoolihalduri restartima.\n"
-"(käsurealt: service dm restart)"
-
-#: ../../standalone/drakTermServ_.c:894
-msgid "Subnet:"
-msgstr "Alamvõrk:"
-
-#: ../../standalone/drakTermServ_.c:901
-msgid "Netmask:"
-msgstr "Võrgumask:"
-
-#: ../../standalone/drakTermServ_.c:908
-msgid "Routers:"
-msgstr "Ruuterid:"
-
-#: ../../standalone/drakTermServ_.c:915
-msgid "Subnet Mask:"
-msgstr "Alamvõrgu mask:"
+"\n"
+" Copyright (C) 2002: MandrakeSoft \n"
+"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
+"\n"
 
-#: ../../standalone/drakTermServ_.c:922
-msgid "Broadcast Address:"
-msgstr "Üldlevi aadress:"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Add/Del Clients"
+msgstr "Lisa/kustuta klient"
 
-#: ../../standalone/drakTermServ_.c:929
-msgid "Domain Name:"
-msgstr "Domeeninimi:"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Add/Del Users"
+msgstr "Lisa/kustuta kasutaja"
 
-#: ../../standalone/drakTermServ_.c:937
-msgid "Name Servers:"
-msgstr "Nimeserverid:"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Net Boot Images"
+msgstr "Võrgu alglaadefailid"
 
-#: ../../standalone/drakTermServ_.c:948
-msgid "IP Range Start:"
-msgstr "IP vahemiku algus:"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Etherboot Floppy/ISO"
+msgstr "Etherboot flopi/ISO"
 
-#: ../../standalone/drakTermServ_.c:949
-msgid "IP Range End:"
-msgstr "IP vahemiku lõpp:"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Stop Server"
+msgstr "Serveri peatamine"
 
-#: ../../standalone/drakTermServ_.c:1001
-msgid "dhcpd Server Configuration"
-msgstr "Dhcpd serveri seadistamine"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Start Server"
+msgstr "Serveri käivitamine"
 
-#: ../../standalone/drakTermServ_.c:1002
-msgid ""
-"Most of these values were extracted\n"
-"from your running system.\n"
-"You can modify as needed."
-msgstr ""
-"Enamik väärtusi on võetud Teie töötavast\n"
-"süsteemist. Võite neid vajadusel muuta."
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Disable Server"
+msgstr "Serveri keelamine"
 
-#: ../../standalone/drakTermServ_.c:1005
-msgid "Dynamic IP Address Pool:"
-msgstr "Dünaamiline IP-aadresside vahemik:"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Enable Server"
+msgstr "Serveri lubamine"
 
-#: ../../standalone/drakTermServ_.c:1018
-msgid "Write Config"
-msgstr "Salvesta seadistus"
+#: ../../standalone/drakTermServ:1
+#, c-format
+msgid "Mandrake Terminal Server Configuration"
+msgstr "Mandrake terminaliserveri sätted"
 
-#: ../../standalone/drakTermServ_.c:1120
-msgid "Please insert floppy disk:"
-msgstr "Sisestage palun flopi:"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "Remove the last item"
+msgstr "Eemalda viimane element"
 
-#: ../../standalone/drakTermServ_.c:1124
-msgid "Couldn't access the floppy!"
-msgstr "Ei suuda flopit leida!"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "Add an item"
+msgstr "Lisa element"
 
-#: ../../standalone/drakTermServ_.c:1126
-msgid "Floppy can be removed now"
-msgstr "Flopi võib nüüd välja võtta"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "Auto Install"
+msgstr "Automaatpaigaldus"
 
-#: ../../standalone/drakTermServ_.c:1129
-msgid "No floppy drive available!"
-msgstr "Flopiseade ei ole kättesaadav!"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid ""
+"The floppy has been successfully generated.\n"
+"You may now replay your installation."
+msgstr ""
+"Flopi on edukalt loodud.\n"
+"Nüüd võite vajadusel paigaldust korrata."
 
-#: ../../standalone/drakTermServ_.c:1138
+#: ../../standalone/drakautoinst:1 ../../standalone/drakgw:1
+#: ../../standalone/scannerdrake:1
 #, c-format
-msgid "Etherboot ISO image is %s"
-msgstr "Etherboot ISO-tõmmis on %s"
+msgid "Congratulations!"
+msgstr "Õnnitleme!"
 
-#: ../../standalone/drakTermServ_.c:1140
-msgid "Something went wrong! - Is mkisofs installed?"
-msgstr "Midagi läks valesti! - Kas mkisofs on ikka paigaldatud?"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid ""
+"\n"
+"Welcome.\n"
+"\n"
+"The parameters of the auto-install are available in the sections on the left"
+msgstr ""
+"\n"
+"Tere tulemast!\n"
+"\n"
+"Automaatpaigalduse parameetrid on näha vasakul"
 
-#: ../../standalone/drakTermServ_.c:1159
-msgid "Need to create /etc/dhcpd.conf first!"
-msgstr "Esmalt tuleb luua /etc/dhcpd.conf!"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "Creating auto install floppy"
+msgstr "Automaatpaigaldusflopi loomine"
 
-#: ../../standalone/drakTermServ_.c:1451
-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/drakautoinst:1
+#, c-format
+msgid "manual"
+msgstr "käsitsi"
 
-#: ../../standalone/drakautoinst_.c:40
-msgid "Error!"
-msgstr "Viga!"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid ""
+"Please choose for each step whether it will replay like your install, or it "
+"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"
 
-#: ../../standalone/drakautoinst_.c:41
+#: ../../standalone/drakautoinst:1
 #, c-format
-msgid "I can't find needed image file `%s'."
-msgstr "Ei suuda leida tõmmisefaili '%s'."
+msgid "Automatic Steps Configuration"
+msgstr "Automaatsete sammude seadistamine"
 
-#: ../../standalone/drakautoinst_.c:43
-msgid "Auto Install Configurator"
-msgstr "Automaatpaigalduse seadistaja"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "replay"
+msgstr "korda"
 
-#: ../../standalone/drakautoinst_.c:44
+#: ../../standalone/drakautoinst:1
+#, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
 "dangerous and must be used circumspectly.\n"
@@ -11147,506 +14732,721 @@ msgstr ""
 "\n"
 "Kas soovite nüüd jätkata?"
 
-#: ../../standalone/drakautoinst_.c:62 ../../standalone/drakautoinst_.c:71
-msgid "manual"
-msgstr "käsitsi"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "Auto Install Configurator"
+msgstr "Automaatpaigalduse seadistaja"
 
-#: ../../standalone/drakautoinst_.c:62
-msgid "replay"
-msgstr "korda"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "I can't find needed image file `%s'."
+msgstr "Ei suuda leida laadefaili '%s'."
 
-#: ../../standalone/drakautoinst_.c:66
-msgid "Automatic Steps Configuration"
-msgstr "Automaatsete sammude seadistamine"
+#: ../../standalone/drakautoinst:1
+#, c-format
+msgid "Error!"
+msgstr "Viga!"
 
-#: ../../standalone/drakautoinst_.c:67
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Please choose for each step whether it will replay like your install, or it "
-"will be manual"
+"\n"
+"Restore Backup Problems:\n"
+"\n"
+"During the restore step, Drakbackup will verify all your\n"
+"backup files before restoring them.\n"
+"Before the restore, Drakbackup will remove \n"
+"your original directory, and you will loose all your \n"
+"data. It is important to be careful and not modify the \n"
+"backup data files by hand.\n"
 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"
-
-#: ../../standalone/drakautoinst_.c:78 ../../standalone/drakautoinst_.c:79
-msgid "Creating auto install floppy"
-msgstr "Automaatpaigaldusflopi loomine"
+"\n"
+"Varukoopia taastamise probleemid:\n"
+"\n"
+"Taastamise ajal kontrollib Drakbackup enne taastamist\n"
+"kõiki Teie varukoopiafaile.\n"
+"Enne taastamist eemaldab Drakbackup Teie originaalkataloogi\n"
+"ja Te kaotate kõik oma andmed. Seepärast on oluline olla\n"
+"hoolikas ja mitte muuta varundatud andmefaile käsitsi.\n"
 
-#: ../../standalone/drakautoinst_.c:139
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
+"options description:\n"
 "\n"
-"Welcome.\n"
+"Please be careful when you are using ftp backup, because only \n"
+"backups that are already built are sent to the server.\n"
+"So at the moment, you need to build the backup on your hard \n"
+"drive before sending it to the server.\n"
 "\n"
-"The parameters of the auto-install are available in the sections on the left"
 msgstr ""
+"valikute kirjeldus:\n"
 "\n"
-"Tere tulemast!\n"
+"Olge palun ettevaatlik, kui kasutate ftp-varundamist, sest serverile\n"
+"saadetakse ainult juba loodud varukoopiad. Seetõttu tuleb esmalt\n"
+"luua varukoopiad kõvakettal ja alles siis need serverile saata.\n"
 "\n"
-"Automaatpaigalduse parameetrid on näha vasakul"
 
-#: ../../standalone/drakautoinst_.c:234 ../../standalone/drakgw_.c:504
-#: ../../standalone/scannerdrake_.c:117
-msgid "Congratulations!"
-msgstr "Õnnitleme!"
-
-#: ../../standalone/drakautoinst_.c:235
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"The floppy has been successfully generated.\n"
-"You may now replay your installation."
+"Description:\n"
+"\n"
+"  Drakbackup is used to backup your system.\n"
+"  During the configuration you can select: \n"
+"\t- System files, \n"
+"\t- Users files, \n"
+"\t- Other files.\n"
+"\tor All your system ...  and Other (like Windows Partitions)\n"
+"\n"
+"  Drakbackup allows you to backup your system on:\n"
+"\t- Harddrive.\n"
+"\t- NFS.\n"
+"\t- CDROM (CDRW), DVDROM (with autoboot, rescue and autoinstall.).\n"
+"\t- FTP.\n"
+"\t- Rsync.\n"
+"\t- Webdav.\n"
+"\t- Tape.\n"
+"\n"
+"  Drakbackup allows you to restore your system to\n"
+"  a user selected directory.\n"
+"\n"
+"  Per default all backups will be stored on your\n"
+"  /var/lib/drakbackup directory\n"
+"\n"
+"  Configuration file:\n"
+"\t/etc/drakconf/drakbackup/drakbackup.conf\n"
+"\n"
+"Restore Step:\n"
+"  \n"
+"  During the restore step, DrakBackup will remove \n"
+"  your original directory and verify that all \n"
+"  backup files are not corrupted. It is recommended \n"
+"  you do a last backup before restoring.\n"
+"\n"
+"\n"
 msgstr ""
-"Flopi on edukalt loodud.\n"
-"Nüüd võite vajadusel paigaldust korrata."
-
-#: ../../standalone/drakautoinst_.c:273
-msgid "Auto Install"
-msgstr "Automaatpaigaldus"
-
-#: ../../standalone/drakautoinst_.c:343
-msgid "Add an item"
-msgstr "Lisa element"
-
-#: ../../standalone/drakautoinst_.c:350
-msgid "Remove the last item"
-msgstr "Eemalda viimane element"
-
-#: ../../standalone/drakbackup_.c:580
-msgid "Cron not available yet as non-root"
-msgstr "Cron ei ole veel saadaval mitteadministraatorile"
-
-#: ../../standalone/drakbackup_.c:690
-msgid "WARNING"
-msgstr "HOIATUS"
+"Kirjeldus:\n"
+"\n"
+"  DrakBackup aitab Teie süsteemist varukoopiaid teha.\n"
+"  Seadistamise ajal saate valida \n"
+"\t- süsteemsed failid, \n"
+"\t- kasutaja failid, \n"
+"\t- muud failid \n"
+"\tvõi kogu süsteemi ...  ja muud (nt Windowsi partitsioonid)\n"
+"\n"
+"  DrakBackup võimaldab varundada järgmistele andmekandjatele:\n"
+"\t- kõvaketas.\n"
+"\t- NFS.\n"
+"\t- CDROM (CDRW), DVDROM (automaatse alglaadimise, pääste- \n"
+"\t- ja automaatse paigalduse võimalustega).\n"
+"\t- FTP.\n"
+"\t- rsync.\n"
+"\t- Webdav.\n"
+"\t- lint.\n"
+"\n"
+"  DrakBackup võimaldab taastada süsteemi\n"
+"  kasutaja määratud kataloogi.\n"
+"\n"
+"  Vaikimisi salvestatakse kõik varukoopiad\n"
+"  kataloogi /var/lib/drakbackup.\n"
+"\n"
+"  Seadistustefail:\n"
+"\t/etc/drakconf/drakbackup/drakbackup.conf\n"
+"\n"
+"Taastamise käik:\n"
+"  \n"
+"  Taastamise ajal eemaldab DrakBackup Teie\n"
+"  originaalkataloogi ja kontrollib, et ükski varukoopia\n"
+"  ei oleks vigane. Soovitatav on enne taastamist\n"
+"  ette võtta veel üks varundamine.\n"
+"\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:691
-msgid "FATAL"
-msgstr "SAATUSLIK"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
+msgstr ""
+" uuendused 2002 MandrakeSoft: Stew Benedict <sbenedict\\@mandrakesoft.com>"
 
-#: ../../standalone/drakbackup_.c:692
-msgid "INFO"
-msgstr "INFO"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+" Copyright (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita."
+"fr>"
+msgstr ""
+" Autoriõigus (C) 2001-2002 MandrakeSoft: DUPONT Sebastien <dupont_s\\@epita."
+"fr>"
 
-#: ../../standalone/drakbackup_.c:704
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
+"restore description:\n"
+" \n"
+"Only the most recent date will be used, because with incremental \n"
+"backups it is necessary to restore one by one each older backup.\n"
 "\n"
-"                      DrakBackup Report \n"
+"So if you don't want to restore a user please unselect all their\n"
+"check boxes.\n"
 "\n"
-msgstr ""
+"Otherwise, you are able to select only one of these.\n"
 "\n"
-"                      DrakBackupi raport \n"
+" - Incremental Backups:\n"
 "\n"
-
-#: ../../standalone/drakbackup_.c:705
-msgid ""
+"\tThe incremental backup is the most powerful \n"
+"\toption to use. This option allows you to \n"
+"\tbackup all of your data the first time, and \n"
+"\tonly the changed data after.\n"
+"\tSo you will be able, during the restore\n"
+"\tstep, to restore your data from a specified\n"
+"\tdate.\n"
+"\tIf you have not selected this option all\n"
+"\told backups are deleted before each backup.    \n"
 "\n"
-"                      DrakBackup Daemon Report\n"
 "\n"
 "\n"
 msgstr ""
+"taastamise kirjeldus:\n"
+"\n"
+"Kasutatakse ainult kõige värskemaid andmeid, sest muutvarunduse\n"
+"korral on oluline taastada üksteise järel kõik vanemad varukoopiad.\n"
+"\n"
+"Kui Te ei soovi taastada näiteks kasutajat, eemaldage märked\n"
+"kõigist tema kastikestest.\n"
+"\n"
+"Vastasel juhul saate valida ainult järgmiste võimaluste vahel.\n"
+"\n"
+" - Muutvarukoopiad:\n"
+"\n"
+"\tMuutvarundamine on kõige võimsam kasutatav\n"
+"\tvalik, mis lubab esmalt varundada kõik andmed\n"
+"\tja seejärel ainult vahepeal muutunud andmed.\n"
+"\tSel moel on võimalik ka taastamise ajal taastada\n"
+"\tkonkreetse daatumiga andmed.\n"
+"\tKui Te ei ole seda võimalust valinud, kustutatakse\n"
+"\tenne iga varundamist vanad varukoopiad.    \n"
 "\n"
-"                      DrakBackup deemoni raport\n"
 "\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:709
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
+"options description:\n"
 "\n"
-"                    DrakBackup Report Details\n"
+" - Backup system files:\n"
+"       \n"
+"\tThis option allows you to backup your /etc directory,\n"
+"\twhich contains all configuration files. Please be\n"
+"\tcareful during the restore step to not overwrite:\n"
+"\t\t/etc/passwd \n"
+"\t\t/etc/group \n"
+"\t\t/etc/fstab\n"
+"\n"
+" - Backup User files: \n"
+"\n"
+"\tThis option allows you select all users that you want \n"
+"\tto backup.\n"
+"\tTo preserve disk space, it is recommended that you \n"
+"\tdo not include the web browser's cache.\n"
+"\n"
+" - Backup Other files: \n"
+"\n"
+"\tThis option allows you to add more data to save.\n"
+"\tWith the other backup it's not possible at the \n"
+"\tmoment to select incremental backup.\t\t\n"
+" \n"
+" - Incremental Backups:\n"
+"\n"
+"\tThe incremental backup is the most powerful \n"
+"\toption for backup. This option allows you \n"
+"\tto backup all your data the first time, and \n"
+"\tonly the changed data afterward.\n"
+"\tThen you will be able, during the restore\n"
+"\tstep, to restore your data from a specified\n"
+"\tdate.\n"
+"\tIf you have not selected this option all\n"
+"\told backups are deleted before each backup.    \n"
 "\n"
 "\n"
 msgstr ""
+"valikute kirjeldus:\n"
 "\n"
-"                      DrakBackupi raporti üksikasjad\n"
+" - Süsteemsete failide varundamine:\n"
+"       \n"
+"\tSee võimalus laseb varundada kataloogi /etc,\n"
+"\tmis sisaldab kõiki Teie seadistustefaile. Olge\n"
+"\tpalun taastamise ajal ettevaatlik ja ärge kirjutage\n"
+"\tüle järgmisi faile:\n"
+"\t\t/etc/passwd \n"
+"\t\t/etc/group \n"
+"\t\t/etc/fstab \n"
+"\n"
+" - Kasutaja failide varundamine: \n"
+"\n"
+"\tSee võimalus laseb valida kõik kasutajad, keda\n"
+"\tsoovite varundada.\n"
+"\tKettaruumi kokkuhoiu huvides on soovitatav mitte\n"
+"\tkaasata veebilehitseja puhvrit.\n"
+"\n"
+" - Muude failide varundamine: \n"
+"\n"
+"\tSee võimalus lubab salvestada veelgi enam\n"
+"\tandmeid, kuid praegu ei ole selle puhul veel\n"
+"\tvõimalik kasutada muutvarundamist.\t\t\n"
+" \n"
+" - Muutvarundamine:\n"
+"\n"
+"\ttMuutvarundamine on kõige võimsam kasutatav\n"
+"\tvalik, mis lubab esmalt varundada kõik andmed\n"
+"\tja seejärel ainult vahepeal muutunud andmed.\n"
+"\tSel moel on võimalik ka taastamise ajal taastada\n"
+"\tkonkreetse daatumiga andmed.\n"
+"\tKui Te ei ole seda võimalust valinud, kustutatakse\n"
+"\tenne iga varundamist vanad varukoopiad.    \n"
 "\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:730 ../../standalone/drakbackup_.c:803
-#: ../../standalone/drakbackup_.c:859
-msgid "Total progess"
-msgstr "Edenemine kokku"
-
-#: ../../standalone/drakbackup_.c:785
+#: ../../standalone/drakbackup:1
 #, c-format
 msgid ""
-"%s exists, delete?\n"
 "\n"
-"Warning: If you've already done this process you'll probably\n"
-" need to purge the entry from authorized_keys on the server."
+" Some errors during sendmail are caused by \n"
+" a bad configuration of postfix. To solve it you have to\n"
+" set myhostname or mydomain in /etc/postfix/main.cf\n"
+"\n"
 msgstr ""
-"%s on olemas, kas kustutada?\n"
 "\n"
-"Hoiatus: Kui te olete selle protsessi juba sooritanud, tuleks\n"
-" Teil ka kirje kustutada serveril autoriseeritud võtmete seast."
-
-#: ../../standalone/drakbackup_.c:794
-msgid "This may take a moment to generate the keys."
-msgstr "Võtmete genereerimine võtab mõne hetke aega."
+" Mõned vead meili saatmisel sendmail-iga on\n"
+" põhjustatud postfixi seadistuste vigadest. Nende\n"
+" kõrvaldamiseks määrake 'myhostname' või\n"
+" 'mydomain' failis /etc/postfix/main.cf\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:801
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "ERROR: Cannot spawn %s."
-msgstr "VIGA: %s tekitamine ebaõnnestus."
+msgid ""
+"options description:\n"
+"\n"
+" In this step Drakbackup allow you to change:\n"
+"\n"
+" - The compression mode:\n"
+"    \n"
+"      If you check bzip2 compression, you will compress\n"
+"      your data better than gzip (about 2-10 %%).\n"
+"      This option is not checked by default because\n"
+"      this compression mode needs more time (about 1000%% more).\n"
+" \n"
+" - The update mode:\n"
+"\n"
+"      This option will update your backup, but this\n"
+"      option is not really useful because you need to\n"
+"      decompress your backup before you can update it.\n"
+"      \n"
+" - the .backupignore mode:\n"
+"\n"
+"      Like with cvs, Drakbackup will ignore all references\n"
+"      included in .backupignore files in each directories.\n"
+"      ex: \n"
+"         #> cat .backupignore\n"
+"         *.o\n"
+"         *~\n"
+"         ...\n"
+"      \n"
+"\n"
+msgstr ""
+"valikute kirjeldused:\n"
+"\n"
+" Sellel sammul võimaldab Drakbackup muuta:\n"
+"\n"
+" - Tihendusmeetodit:\n"
+"    \n"
+"      Kui valite tihenduse bzip2, õnnestub teil andmeid\n"
+"      tihendada paremini kui gzip-iga (umbes 2-10 %%).\n"
+"      See ei ole vaikimisi märgitud, sest see meetod\n"
+"      nõuab ka palju enam aega (umbes 1000%% enam).\n"
+" \n"
+" - Uuendamismeetodit:\n"
+"\n"
+"      See võimalus uuendab Teie varukoopiad, kuid pole\n"
+"      tegelikult eriti mõistlik, sest enne seda, kui uuendada,\n"
+"      tuleb varukoopiad lahti pakkida.\n"
+"      \n"
+" - .backupignore meetodit:\n"
+"\n"
+"      Nagu cvs-i puhul, eirab ka Drakbackup igas kataloogis\n"
+"      kõike seda, mis on kirjas .backupignore failides.\n"
+"      nt: \n"
+"         /*> cat .backupignore*\n"
+"         *.o\n"
+"         *~\n"
+"         ...\n"
+"      \n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:818
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "No password prompt on %s at port %s"
-msgstr "Parooli ei pärita masinal %s pordis %s"
+msgid "Drakbackup"
+msgstr "Drakbackup"
 
-#: ../../standalone/drakbackup_.c:819
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "Bad password on %s"
-msgstr "Halb parool %s puhul"
+msgid "Restore"
+msgstr "Taastamine"
 
-#: ../../standalone/drakbackup_.c:820
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "Permission denied transferring %s to %s"
-msgstr "%s ülekandmiseks %s -le puudub luba"
+msgid "Backup Now"
+msgstr "Varunda nüüd!"
 
-#: ../../standalone/drakbackup_.c:821
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "Can't find %s on %s"
-msgstr "%s leidmine %s -l ebaõnnestus"
+msgid "Advanced Configuration"
+msgstr "Muud sätted"
 
-#: ../../standalone/drakbackup_.c:824
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "%s not responding"
-msgstr "%s ei vasta"
+msgid "Wizard Configuration"
+msgstr "Nõustaja sätted"
 
-#: ../../standalone/drakbackup_.c:828
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid ""
-"Transfer successful\n"
-"You may want to verify you can login to the server with:\n"
-"\n"
-"ssh -i %s %s\\@%s\n"
-"\n"
-"without being prompted for a password."
-msgstr ""
-"Ülekanne oli edukas\n"
-"Võite kontrollida, kas suudate serverile sisse logida käsuga:\n"
-"\n"
-"ssh -i %s %s\\@%s\n"
-"\n"
-"ilma et Teilt küsitaks parooli."
-
-#: ../../standalone/drakbackup_.c:873
-msgid "WebDAV remote site already in sync!"
-msgstr "WebDAVi kaugsait on juba sünkroonis!"
-
-#: ../../standalone/drakbackup_.c:877
-msgid "WebDAV transfer failed!"
-msgstr "WebDAVi ülekanne ebaõnnestus!"
+msgid "View Backup Configuration."
+msgstr "Varundamise sätete vaatamine."
 
-#: ../../standalone/drakbackup_.c:898
-msgid "No CDR/DVDR in drive!"
-msgstr "CDR/DVDR ei ole seadmes!"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup Now from configuration file"
+msgstr "Seadistustefaili varundamine nüüd!"
 
-#: ../../standalone/drakbackup_.c:902
-msgid "Does not appear to be recordable media!"
-msgstr "See ei paista küll olevat kirjutatav andmekandja!"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Drakbackup Configuration"
+msgstr "Drakbackupi sätted"
 
-#: ../../standalone/drakbackup_.c:906
-msgid "Not erasable media!"
-msgstr "Seda andmekandjat ei saa puhastada!"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Total Progress"
+msgstr "Edenemine kokku"
 
-#: ../../standalone/drakbackup_.c:945
-msgid "This may take a moment to erase the media."
-msgstr "Andmekandja puhastamine võtab mõni hetk aega."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Sending files..."
+msgstr "Failide saatmine..."
 
-#: ../../standalone/drakbackup_.c:1033
-msgid "Permission problem accessing CD."
-msgstr "CD-le ligipääsul tekkis loaprobleem."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "files sending by FTP"
+msgstr "failide saatmine FTP kaudu"
 
-#: ../../standalone/drakbackup_.c:1060
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "No tape in %s!"
-msgstr "Seadmes %s puudub lint!"
+msgid "Backup other files"
+msgstr "Muude failide varundamine"
 
-#: ../../standalone/drakbackup_.c:1174 ../../standalone/drakbackup_.c:1223
-msgid "Backup system files..."
-msgstr "Süsteemsete failide varundamine..."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup user files"
+msgstr "Kasutaja failide varundamine"
 
-#: ../../standalone/drakbackup_.c:1224 ../../standalone/drakbackup_.c:1291
-msgid "Hard Disk Backup files..."
-msgstr "Kõvaketta varundamine..."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup system files"
+msgstr "Süsteemsete failide varundamine"
 
-#: ../../standalone/drakbackup_.c:1236
-msgid "Backup User files..."
-msgstr "Kasutajafailide varundamine..."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Under Devel ... please wait."
+msgstr "Tegutsen ... palun oodake."
 
-#: ../../standalone/drakbackup_.c:1237
-msgid "Hard Disk Backup Progress..."
-msgstr "Kõvaketta varundamise edenemine..."
+#: ../../standalone/drakbackup:1
+#, 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'."
 
-#: ../../standalone/drakbackup_.c:1290
-msgid "Backup Other files..."
-msgstr "Muude failide varundamine..."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please select data to backup..."
+msgstr "Valige palun varundamiseks andmed..."
 
-#: ../../standalone/drakbackup_.c:1296
-msgid "No changes to backup!"
-msgstr "Varukoopiaga võrreldes pole mingeid muutusi!"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please select media for backup..."
+msgstr "Valige palun varundamiseks andmekandja..."
 
-#: ../../standalone/drakbackup_.c:1312 ../../standalone/drakbackup_.c:1335
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid ""
-"\n"
-"Drakbackup activities via %s:\n"
-"\n"
-msgstr ""
-"\n"
-"Drakbackupi tegevus %s vahendusel:\n"
-"\n"
+msgid "Please select data to restore..."
+msgstr "Valige palun taastatavad andmed..."
 
-#: ../../standalone/drakbackup_.c:1319
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid ""
-"file list sent by FTP: %s\n"
-" "
-msgstr ""
-"FTP kaudu saadetud faililoend: %s\n"
-" "
+msgid "The following packages need to be installed:\n"
+msgstr "Paigaldada tuleb järgmised paketid:\n"
 
-#: ../../standalone/drakbackup_.c:1322
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"\n"
-" FTP connection problem: It was not possible to send your backup files by "
-"FTP.\n"
+"Error during sending file via FTP.\n"
+" Please correct your FTP configuration."
 msgstr ""
-"\n"
-" FTP ühenduse probleem: FTP kaudu pole võimalik saata Teie varukoopiafaile.\n"
+"Viga faili saatmisel FTP kaudu.\n"
+" Palun korrigeerige FTP seadistusi."
 
-#: ../../standalone/drakbackup_.c:1340
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"\n"
-"Drakbackup activities via CD:\n"
-"\n"
+"Error during sendmail.\n"
+"  Your report mail was not sent.\n"
+"  Please configure sendmail"
 msgstr ""
-"\n"
-"Drakbackupi tegevus CD vahendusel:\n"
-"\n"
+"Viga meili saatmisel.\n"
+"  Raportimeili ei õnnestunud saata.\n"
+"  Seadistage palun sendmail"
 
-#: ../../standalone/drakbackup_.c:1345
-msgid ""
-"\n"
-"Drakbackup activities via tape:\n"
-"\n"
-msgstr ""
-"\n"
-"Drakbackupi tegevus lindi vahendusel:\n"
-"\n"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Next"
+msgstr "Järgmine"
 
-#: ../../standalone/drakbackup_.c:1354
-msgid " Error during mail sending. \n"
-msgstr " Viga meili saatmisel. \n"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Previous"
+msgstr "Eelmine"
 
-#: ../../standalone/drakbackup_.c:1380
-msgid "Can't create catalog!"
-msgstr "Kataloogi ei õnnestunud luua!"
+#: ../../standalone/drakbackup:1 ../../standalone/drakperm:1
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Save"
+msgstr "Salvesta"
 
-#: ../../standalone/drakbackup_.c:1490 ../../standalone/drakbackup_.c:1501
-#: ../../standalone/drakfont_.c:946
-msgid "File Selection"
-msgstr "Failivalik"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Build Backup"
+msgstr "Varukoopia loomine"
 
-#: ../../standalone/drakbackup_.c:1529
-msgid "Select the files or directories and click on 'Add'"
-msgstr "Valige failid või kataloogid ja klõpsake 'Lisa'"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore Progress"
+msgstr "Taastamise edenemine"
 
-#: ../../standalone/drakbackup_.c:1573
-msgid ""
-"\n"
-"Please check all options that you need.\n"
-msgstr ""
-"\n"
-"Kontrollige palun kõiki vajalikke valikuid.\n"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore From Catalog"
+msgstr "Taastamine kataloogist"
 
-#: ../../standalone/drakbackup_.c:1574
-msgid ""
-"These options can backup and restore all files in your /etc directory.\n"
-msgstr ""
-"Need valikud võivad varundada ja taastada kõik failid kataloogis /etc.\n"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Browse to new restore repository."
+msgstr "Lehitse uut taastamishoidlat."
 
-#: ../../standalone/drakbackup_.c:1575
-msgid "Backup your System files. (/etc directory)"
-msgstr "Varunda süsteemsed failid (kataloog /etc)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "CD in place - continue."
+msgstr "CD on kohal - jätka."
 
-#: ../../standalone/drakbackup_.c:1576
-msgid "Use incremental backup  (do not replace old backups)"
-msgstr "Muutvarunduse kasutamine  (vanu varukoopiaid ei asendata)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Custom Restore"
+msgstr "Taastamise kohandamine"
 
-#: ../../standalone/drakbackup_.c:1577
-msgid "Do not include critical files (passwd, group, fstab)"
-msgstr "Kriitiliste failide kõrvalejätmine (passwd, group, fstab)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore all backups"
+msgstr "Taasta kõik varukoopiad"
 
-#: ../../standalone/drakbackup_.c:1578
-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:1
+#, c-format
+msgid "Restore Failed..."
+msgstr "Taastamine ebaõnnestus..."
 
-#: ../../standalone/drakbackup_.c:1595
-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:1
+#, c-format
+msgid "Files Restored..."
+msgstr "Taastatud failid..."
 
-#: ../../standalone/drakbackup_.c:1622
-msgid "Do not include the browser cache"
-msgstr "Veebilehitseja mälupuhvri kõrvalejätmine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Path or Module required"
+msgstr "Kataloogi või mooduli nõudmine"
 
-#: ../../standalone/drakbackup_.c:1623 ../../standalone/drakbackup_.c:1647
-msgid "Use Incremental Backups  (do not replace old backups)"
-msgstr "Muutvarunduse kasutamine (vanu varukoopiaid ei asendata)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Hostname required"
+msgstr "Masinanime nõudmine"
 
-#: ../../standalone/drakbackup_.c:1645 ../../standalone/drakfont_.c:1000
-msgid "Remove Selected"
-msgstr "Eemalda valitud"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Username required"
+msgstr "Kasutajatunnuse nõudmine"
 
-#: ../../standalone/drakbackup_.c:1679
-msgid "Windows (FAT32)"
-msgstr "Windows (FAT32)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Password required"
+msgstr "Parooli nõudmine"
 
-#: ../../standalone/drakbackup_.c:1714
-msgid "Users"
-msgstr "Kasutajad"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Host Path or Module"
+msgstr "Masina kataloog või moodul"
 
-#: ../../standalone/drakbackup_.c:1740
-msgid "Use network connection to backup"
-msgstr "Võrguühenduse kasutamine varundamiseks"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Host Name"
+msgstr "Masinanimi"
 
-#: ../../standalone/drakbackup_.c:1742
-msgid "Net Method:"
-msgstr "Võrgumeetod:"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore Via Network Protocol: %s"
+msgstr "Taasta võrguprotokolli abil: %s"
 
-#: ../../standalone/drakbackup_.c:1746
-msgid "Use Expect for SSH"
-msgstr "Expecti kasutamine SSH jaoks"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore Via Network"
+msgstr "Taasta võrgust"
 
-#: ../../standalone/drakbackup_.c:1747
-msgid ""
-"Create/Transfer\n"
-"backup keys for SSH"
-msgstr ""
-"Loo/Kanna üle\n"
-"varundusvõtmed SSH jaoks"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Not the correct tape label. Tape is labelled %s."
+msgstr "Lindi nimi pole korrektne. Lint kannab nime %s."
 
-#: ../../standalone/drakbackup_.c:1748
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"  Transfer  \n"
-"Now"
+"Insert the tape with volume label %s\n"
+" in the tape drive device %s"
 msgstr ""
-"  Kanna üle  \n"
-"Nüüd"
+"Sisestage lint nimega %s\n"
+" lindiseadmesse %s"
 
-#: ../../standalone/drakbackup_.c:1749
-msgid ""
-"Other (not drakbackup)\n"
-"keys in place already"
-msgstr ""
-"Muud (mitte drakbackupi)\n"
-"võtmed on juba paigas"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore From Tape"
+msgstr "Taasta lindilt"
 
-#: ../../standalone/drakbackup_.c:1753
-msgid "Please enter the host name or IP."
-msgstr "Sisestage palun masinanimi või IP."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Not the correct CD label. Disk is labelled %s."
+msgstr "CD nimi pole korrektne. Ketta nimi on %s."
 
-#: ../../standalone/drakbackup_.c:1758
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Please enter the directory (or module) to\n"
-" put the backup on this host."
+"Insert the CD with volume label %s\n"
+" in the CD drive under mount point /mnt/cdrom"
 msgstr ""
-"Sisestage palun kataloog (või moodul), kuhu\n"
-" sellel masinal varukoopia salvestada."
-
-#: ../../standalone/drakbackup_.c:1763
-msgid "Please enter your login"
-msgstr "Sisestage palun kasutajatunnus"
-
-#: ../../standalone/drakbackup_.c:1768
-msgid "Please enter your password"
-msgstr "Sisestage palun parool"
+"Sisestage CD nimega %s\n"
+" CD-seadmesse haakepunktis /mnt/cdrom"
 
-#: ../../standalone/drakbackup_.c:1774
-msgid "Remember this password"
-msgstr "Jäta parool meelde"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore From CD"
+msgstr "Taasta CD-lt"
 
-#: ../../standalone/drakbackup_.c:1785
-msgid "Need hostname, username and password!"
-msgstr "Vaja läheb masinanime, kasutajatunnust ja parooli!"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup files not found at %s."
+msgstr "%s ei sisaldanud varukoopiafaile."
 
-#: ../../standalone/drakbackup_.c:1879
-msgid "Use CD/DVDROM to backup"
-msgstr "Varundamine CD/DVDROM-ile"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+"Change\n"
+"Restore Path"
+msgstr ""
+"Muuda\n"
+"taastamise asukohta"
 
-#: ../../standalone/drakbackup_.c:1882
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Please choose your CD/DVD device\n"
-"(Press Enter to propogate settings to other fields.\n"
-"This field isn't necessary, only a tool to fill in the form.)"
+"Restore Selected\n"
+"Files"
 msgstr ""
-"Valige palun CD/DVD-seade.\n"
-"(Vajutage Enter sätete levitamiseks teistele väljadele.\n"
-"See väli ei ole kohustuslik, ainult vahend vormi täitmiseks.)"
+"Taasta valitud\n"
+"failid"
 
-#: ../../standalone/drakbackup_.c:1887
-msgid "Please choose your CD/DVD media size (Mb)"
-msgstr "Valige palun CD/DVD andmekandja suurus (Mb)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+"Restore Selected\n"
+"Catalog Entry"
+msgstr ""
+"Taasta valitud\n"
+"kataloogikirje"
 
-#: ../../standalone/drakbackup_.c:1893
-msgid "Please check for multisession CD"
-msgstr "Märkige palun mitmeseansilise CD korral"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Remove user directories before restore."
+msgstr "Kasutaja kataloogide eemaldamine enne taastamist."
 
-#: ../../standalone/drakbackup_.c:1899
-msgid "Please check if you are using CDRW media"
-msgstr "Märkige palun, kui kasutate CDRW andmekandjat"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Do new backup before restore (only for incremental backups.)"
+msgstr "Uus varundamine enne taastamist (ainult muutvarunduse puhul)"
 
-#: ../../standalone/drakbackup_.c:1905
-msgid "Please check if you want to erase your RW media (1st Session)"
-msgstr ""
-"Märkige palun, kui soovite puhastada oma RW andmekandja (esimene seanss)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "select path to restore (instead of /)"
+msgstr "valige asukoht, kuhu taastada (kui ei ole /)"
 
-#: ../../standalone/drakbackup_.c:1906
-msgid " Erase Now "
-msgstr " Puhasta nüüd! "
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore Other"
+msgstr "Muu taastamine"
 
-#: ../../standalone/drakbackup_.c:1912
-msgid "Please check if you are using a DVDR device"
-msgstr "Märkige palun, kui kasutate DVDR seadet"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore Users"
+msgstr "Kasutajate taastamine"
 
-#: ../../standalone/drakbackup_.c:1918
-msgid "Please check if you are using a DVDRAM device"
-msgstr "Märkige palun, kui kasutate DVDRAM seadet"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore system"
+msgstr "Süsteemi taastamine"
 
-#: ../../standalone/drakbackup_.c:1931
-msgid ""
-"Please enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-"Sisestage palun oma CD-kirjutaja seadmenimi\n"
-" nt: 0,1,0"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Other Media"
+msgstr "Muu andmekandja"
 
-#: ../../standalone/drakbackup_.c:1964
-msgid "No CD device defined!"
-msgstr "CD-seade on määramata!"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Select another media to restore from"
+msgstr "Valige muu andmekandja, millelt taastada"
 
-#: ../../standalone/drakbackup_.c:2012
-msgid "Use tape to backup"
-msgstr "Varundamine lindile"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please enter the directory where backups are stored"
+msgstr "Sisestage palun kataloog, kuhu varukoopiad on salvestatud"
 
-#: ../../standalone/drakbackup_.c:2015
-msgid "Please enter the device name to use for backup"
-msgstr "Sisestaga palun varundamiseks kasutatava seadme nimi"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Restore from Hard Disk."
+msgstr "Taastamine kõvakettalt."
 
-#: ../../standalone/drakbackup_.c:2021
-msgid "Please check if you want to use the non-rewinding device."
-msgstr "Märkige palun, kui soovite kasutada tagasikerimisvõimaluseta seadet."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Secure Connection"
+msgstr "Turvaline ühendus"
 
-#: ../../standalone/drakbackup_.c:2027
-msgid "Please check if you want to erase your tape before the backup."
-msgstr "Märkige palun, kui soovite lindi enne varundamist puhastada."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "FTP Connection"
+msgstr "FTP ühendus"
 
-#: ../../standalone/drakbackup_.c:2033
-msgid "Please check if you want to eject your tape after the backup."
-msgstr "Märkige palun, kui soovite pärast varundamist lindi väljastamist."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use quota for backup files."
+msgstr "Kvootide kasutamine varukoopiafailidel."
 
-#: ../../standalone/drakbackup_.c:2039 ../../standalone/drakbackup_.c:2112
-#: ../../standalone/drakbackup_.c:3068
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
 "Please enter the maximum size\n"
 " allowed for Drakbackup"
@@ -11654,1073 +15454,947 @@ msgstr ""
 "Sisestage palun Drakbackupi\n"
 " suurim lubatud suurus"
 
-#: ../../standalone/drakbackup_.c:2103
-msgid "Please enter the directory to save to:"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please enter the directory to save:"
 msgstr "Sisestage palun kataloog, kuhu salvestada:"
 
-#: ../../standalone/drakbackup_.c:2118 ../../standalone/drakbackup_.c:3074
-msgid "Use quota for backup files."
-msgstr "Kvootide kasutamine varukoopiafailidel."
-
-#: ../../standalone/drakbackup_.c:2180
-msgid "Network"
-msgstr "Võrk"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use Hard Disk to backup"
+msgstr "Varundamine kõvakettale"
 
-#: ../../standalone/drakbackup_.c:2185
-msgid "CDROM / DVDROM"
-msgstr "CDROM / DVDROM"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "please choose the date to restore"
+msgstr "valige palun kuupäev/aeg, kust taastada"
 
-#: ../../standalone/drakbackup_.c:2190
-msgid "HardDrive / NFS"
-msgstr "Kõvaketas / NFS"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup the system files before:"
+msgstr "Varunda süsteemsed failid, mis on loodud enne:"
 
-#: ../../standalone/drakbackup_.c:2195
-msgid "Tape"
-msgstr "Lint"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "User list to restore (only the most recent date per user is important)"
+msgstr "Taastatav kasutajate loend (olulised on ainult kõige uuemad andmed)"
 
-#: ../../standalone/drakbackup_.c:2208 ../../standalone/drakbackup_.c:2212
-#: ../../standalone/drakbackup_.c:2216
-msgid "hourly"
-msgstr "iga tund"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "OK to restore the other files."
+msgstr "Muude failide taastamiseks vajuta 'Olgu'."
 
-#: ../../standalone/drakbackup_.c:2209 ../../standalone/drakbackup_.c:2213
-#: ../../standalone/drakbackup_.c:2216
-msgid "daily"
-msgstr "iga päev"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "         Restore Configuration       "
+msgstr "         Taastamise seadistamine       "
 
-#: ../../standalone/drakbackup_.c:2210 ../../standalone/drakbackup_.c:2214
-#: ../../standalone/drakbackup_.c:2216
-msgid "weekly"
-msgstr "iga nädal"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "          Successfuly Restored on %s       "
+msgstr "         edukalt taastatud %s -l       "
 
-#: ../../standalone/drakbackup_.c:2211 ../../standalone/drakbackup_.c:2215
-#: ../../standalone/drakbackup_.c:2216
-msgid "monthly"
-msgstr "iga kuu"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "          All of your selected data have been          "
+msgstr "          Kõik valitud andmed on           "
 
-#: ../../standalone/drakbackup_.c:2229
-msgid "Use daemon"
-msgstr "Deemoni kasutamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup files are corrupted"
+msgstr "Varukoopia failid on vigased"
 
-#: ../../standalone/drakbackup_.c:2234
-msgid ""
-"Please choose the time \n"
-"interval between each backup"
-msgstr ""
-"Valige palun varundamiste\n"
-"vaheline ajaline intervall"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please uncheck or remove it on next time."
+msgstr "Palun tühistage valik või eemaldage järgmisel korral."
 
-#: ../../standalone/drakbackup_.c:2240
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Please choose the\n"
-"media for backup."
+"List of data corrupted:\n"
+"\n"
 msgstr ""
-"Valige palun varundamiseks\n"
-"kasutatav andmekandja."
+"Vigaste andmete loend:\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:2247
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Please be sure that the cron daemon is included in your services. \n"
+"List of data to restore:\n"
 "\n"
-"Note that currently all 'net' medias also use the hard drive."
 msgstr ""
-"Kontrollige palun, et cron-deemon oleks teenustega kaasatud.\n"
+"Taastatavate andmete loend:\n"
 "\n"
-"Pange tähele, et praegu kasutavad kõvaketast ka kõik 'võrgu'-andmekandjad."
-
-#: ../../standalone/drakbackup_.c:2283
-msgid "Send mail report after each backup to:"
-msgstr "Saada pärast iga varundamist meiliraport aadressile:"
-
-#: ../../standalone/drakbackup_.c:2289
-msgid "Delete Hard Drive tar files after backup to other media."
-msgstr "Kustuta tar-failid kõvakettalt pärast varundamist muule andmekandjale."
-
-#: ../../standalone/drakbackup_.c:2324
-msgid "What"
-msgstr "Mis"
 
-#: ../../standalone/drakbackup_.c:2329
-msgid "Where"
-msgstr "Kus"
-
-#: ../../standalone/drakbackup_.c:2334
-msgid "When"
-msgstr "Millal"
-
-#: ../../standalone/drakbackup_.c:2339
-msgid "More Options"
-msgstr "Rohkem valikuid"
-
-#: ../../standalone/drakbackup_.c:2358 ../../standalone/drakbackup_.c:4444
-msgid "Drakbackup Configuration"
-msgstr "Drakbackupi sätted"
-
-#: ../../standalone/drakbackup_.c:2376
-msgid "Please choose where you want to backup"
-msgstr "Valige palun, kuhu soovite varukoopia salvestada"
-
-#: ../../standalone/drakbackup_.c:2378
-msgid "on Hard Drive"
-msgstr "kõvakettale"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "No configuration, please click Wizard or Advanced.\n"
+msgstr "Seadistus puudub, klõpsake palun nupul Nõustaja või Muud.\n"
 
-#: ../../standalone/drakbackup_.c:2388
-msgid "across Network"
-msgstr "üle võrgu"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\t-Network by webdav.\n"
+msgstr "\t-võrk webdavi vahendusel.\n"
 
-#: ../../standalone/drakbackup_.c:2398
-msgid "on CDROM"
-msgstr "CDROM-ile"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\t-Network by rsync.\n"
+msgstr "\t-võrk rsync vahendusel.\n"
 
-#: ../../standalone/drakbackup_.c:2406
-msgid "on Tape Device"
-msgstr "lindiseadmele"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\t-Network by SSH.\n"
+msgstr "\t-võrk SSH vahendusel.\n"
 
-#: ../../standalone/drakbackup_.c:2449
-msgid "Please choose what you want to backup"
-msgstr "Valige palun, mida soovite varundada"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\t-Network by FTP.\n"
+msgstr "\t-võrk FTP vahendusel.\n"
 
-#: ../../standalone/drakbackup_.c:2450
-msgid "Backup system"
-msgstr "süsteemseid faile"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\t-Tape \n"
+msgstr "\t-lint \n"
 
-#: ../../standalone/drakbackup_.c:2451
-msgid "Backup Users"
-msgstr "kasutajate faile"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\t-CDROM.\n"
+msgstr "\t-CDROM.\n"
 
-#: ../../standalone/drakbackup_.c:2454
-msgid "Select user manually"
-msgstr "Kasutaja valik käsitsi"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\t-Hard drive.\n"
+msgstr "\t-kõvaketas.\n"
 
-#: ../../standalone/drakbackup_.c:2537
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
 "\n"
-"Backup Sources: \n"
+"- Daemon (%s) include:\n"
 msgstr ""
 "\n"
-"Varundusallikad: \n"
+"- deemon (%s) sisaldab:\n"
 
-#: ../../standalone/drakbackup_.c:2538
-msgid ""
-"\n"
-"- System Files:\n"
-msgstr ""
-"\n"
-"- süsteemsed failid:\n"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\tBackups use tar and gzip\n"
+msgstr "\tvarukoopiad tar- ja gzip-vormingus\n"
 
-#: ../../standalone/drakbackup_.c:2540
-msgid ""
-"\n"
-"- User Files:\n"
-msgstr ""
-"\n"
-"- kasutaja failid.\n"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\tBackups use tar and bzip2\n"
+msgstr "\tvarukoopiad tar- ja bzip2-vormingus\n"
 
-#: ../../standalone/drakbackup_.c:2542
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\tDo not include System Files\n"
+msgstr "\tsüsteemsete failide kõrvalejätmine\n"
+
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
 "\n"
-"- Other Files:\n"
+"- Options:\n"
 msgstr ""
 "\n"
-"- muud failid:\n"
+"- valikud:\n"
 
-#: ../../standalone/drakbackup_.c:2544
+#: ../../standalone/drakbackup:1
 #, c-format
 msgid ""
-"\n"
-"- Save on Hard drive on path: %s\n"
+"\t\t user name: %s\n"
+"\t\t on path: %s \n"
 msgstr ""
-"\n"
-"- salvesta kõvakettale asukohta: %s\n"
+"\t\t kasutajatunnus: %s\n"
+"\t\t asukohas: %s \n"
 
-#: ../../standalone/drakbackup_.c:2547
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
 "\n"
-"- Delete hard drive tar files after backup.\n"
+"- Save via %s on host: %s\n"
 msgstr ""
 "\n"
-"- kustuta pärast varundamist kõvakettalt tar-failid.\n"
+"- salvesta %s vahendusel masinale: %s\n"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "\t\tErase=%s"
+msgstr "\t\tPuhasta=%s"
 
-#: ../../standalone/drakbackup_.c:2553
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
 "\n"
-"- Burn to CD"
+"- Save to Tape on device: %s"
 msgstr ""
 "\n"
-"- kirjuta CD-le"
+"- salvesta lindile seadmel: %s"
 
-#: ../../standalone/drakbackup_.c:2554
-msgid "RW"
-msgstr "RW"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid " (multi-session)"
+msgstr " (mitmeseansiline)"
 
-#: ../../standalone/drakbackup_.c:2555
+#: ../../standalone/drakbackup:1
 #, c-format
 msgid " on device: %s"
 msgstr " seadmel: %s"
 
-#: ../../standalone/drakbackup_.c:2556
-msgid " (multi-session)"
-msgstr " (mitmeseansiline)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "RW"
+msgstr "RW"
 
-#: ../../standalone/drakbackup_.c:2557
+#: ../../standalone/drakbackup:1
 #, c-format
 msgid ""
 "\n"
-"- Save to Tape on device: %s"
+"- Burn to CD"
 msgstr ""
 "\n"
-"- salvesta lindile seadmel: %s"
-
-#: ../../standalone/drakbackup_.c:2558
-#, c-format
-msgid "\t\tErase=%s"
-msgstr "\t\tPuhasta=%s"
+"- kirjuta CD-le"
 
-#: ../../standalone/drakbackup_.c:2561
+#: ../../standalone/drakbackup:1
 #, c-format
 msgid ""
 "\n"
-"- Save via %s on host: %s\n"
+"- Delete hard drive tar files after backup.\n"
 msgstr ""
 "\n"
-"- salvesta %s vahendusel masinale: %s\n"
+"- kustuta pärast varundamist kõvakettalt tar-failid.\n"
 
-#: ../../standalone/drakbackup_.c:2562
+#: ../../standalone/drakbackup:1
 #, c-format
 msgid ""
-"\t\t user name: %s\n"
-"\t\t on path: %s \n"
+"\n"
+"- Save on Hard drive on path: %s\n"
 msgstr ""
-"\t\t kasutajatunnus: %s\n"
-"\t\t asukohas: %s \n"
+"\n"
+"- salvesta kõvakettale asukohta: %s\n"
 
-#: ../../standalone/drakbackup_.c:2563
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
 "\n"
-"- Options:\n"
+"- Other Files:\n"
 msgstr ""
 "\n"
-"- valikud:\n"
-
-#: ../../standalone/drakbackup_.c:2564
-msgid "\tDo not include System Files\n"
-msgstr "\tsüsteemsete failide kõrvalejätmine\n"
-
-#: ../../standalone/drakbackup_.c:2567
-msgid "\tBackups use tar and bzip2\n"
-msgstr "\tvarukoopiad tar- ja bzip2-vormingus\n"
-
-#: ../../standalone/drakbackup_.c:2569
-msgid "\tBackups use tar and gzip\n"
-msgstr "\tvarukoopiad tar- ja gzip-vormingus\n"
+"- muud failid:\n"
 
-#: ../../standalone/drakbackup_.c:2572
+#: ../../standalone/drakbackup:1
 #, c-format
 msgid ""
 "\n"
-"- Daemon (%s) include:\n"
+"- User Files:\n"
 msgstr ""
 "\n"
-"- deemon (%s) sisaldab:\n"
-
-#: ../../standalone/drakbackup_.c:2573
-msgid "\t-Hard drive.\n"
-msgstr "\t-kõvaketas.\n"
-
-#: ../../standalone/drakbackup_.c:2574
-msgid "\t-CDROM.\n"
-msgstr "\t-CDROM.\n"
-
-#: ../../standalone/drakbackup_.c:2575
-msgid "\t-Tape \n"
-msgstr "\t-lint \n"
-
-#: ../../standalone/drakbackup_.c:2576
-msgid "\t-Network by FTP.\n"
-msgstr "\t-võrk FTP vahendusel.\n"
-
-#: ../../standalone/drakbackup_.c:2577
-msgid "\t-Network by SSH.\n"
-msgstr "\t-võrk SSH vahendusel.\n"
-
-#: ../../standalone/drakbackup_.c:2578
-msgid "\t-Network by rsync.\n"
-msgstr "\t-võrk rsync vahendusel.\n"
-
-#: ../../standalone/drakbackup_.c:2579
-msgid "\t-Network by webdav.\n"
-msgstr "\t-võrk webdavi vahendusel.\n"
-
-#: ../../standalone/drakbackup_.c:2581
-msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr "Seadistus puudub, palun tehke klõps nupul Nõustaja või Muud.\n"
+"- kasutaja failid.\n"
 
-#: ../../standalone/drakbackup_.c:2587
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"List of data to restore:\n"
 "\n"
+"- System Files:\n"
 msgstr ""
-"Taastatavate andmete loend:\n"
 "\n"
+"- süsteemsed failid:\n"
 
-#: ../../standalone/drakbackup_.c:2754
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"List of data corrupted:\n"
 "\n"
+"Backup Sources: \n"
 msgstr ""
-"Vigaste andmete loend:\n"
 "\n"
+"Varundusallikad: \n"
 
-#: ../../standalone/drakbackup_.c:2756
-msgid "Please uncheck or remove it on next time."
-msgstr "Palun tühistage valik või eemaldage järgmisel korral."
-
-#: ../../standalone/drakbackup_.c:2766
-msgid "Backup files are corrupted"
-msgstr "Varukoopia failid on vigased"
-
-#: ../../standalone/drakbackup_.c:2787
-msgid "          All of your selected data have been          "
-msgstr "          Kõik valitud andmed on           "
-
-#: ../../standalone/drakbackup_.c:2788
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "          Successfuly Restored on %s       "
-msgstr "         edukalt taastatud %s -l       "
-
-#: ../../standalone/drakbackup_.c:2906
-msgid "         Restore Configuration       "
-msgstr "         Taastamise seadistamine       "
-
-#: ../../standalone/drakbackup_.c:2924
-msgid "OK to restore the other files."
-msgstr "Muude failide taastamiseks vajuta 'Olgu'."
-
-#: ../../standalone/drakbackup_.c:2941
-msgid "User list to restore (only the most recent date per user is important)"
-msgstr "Taastatav kasutajate loend (olulised on ainult kõige uuemad andmed)"
-
-#: ../../standalone/drakbackup_.c:3019
-msgid "Backup the system files before:"
-msgstr "Varunda süsteemsed failid, mis on loodud enne:"
-
-#: ../../standalone/drakbackup_.c:3021
-msgid "please choose the date to restore"
-msgstr "valige palun daatum, kust taastada"
+msgid "Select user manually"
+msgstr "Kasutaja valik käsitsi"
 
-#: ../../standalone/drakbackup_.c:3057
-msgid "Use Hard Disk to backup"
-msgstr "Varundamine kõvakettale"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup Users"
+msgstr "kasutajate faile"
 
-#: ../../standalone/drakbackup_.c:3060
-msgid "Please enter the directory to save:"
-msgstr "Sisestage palun kataloog, kuhu salvestada:"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup system"
+msgstr "süsteemseid faile"
 
-#: ../../standalone/drakbackup_.c:3103
-msgid "FTP Connection"
-msgstr "FTP ühendus"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please choose what you want to backup"
+msgstr "Valige palun, mida soovite varundada"
 
-#: ../../standalone/drakbackup_.c:3110
-msgid "Secure Connection"
-msgstr "Turvaline ühendus"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "on Tape Device"
+msgstr "lindiseadmele"
 
-#: ../../standalone/drakbackup_.c:3134
-msgid "Restore from Hard Disk."
-msgstr "Taastamine kõvakettalt."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "on CDROM"
+msgstr "CDROM-ile"
 
-#: ../../standalone/drakbackup_.c:3136
-msgid "Please enter the directory where backups are stored"
-msgstr "Sisestage palun kataloog, kuhu varukoopiad on salvestatud"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "across Network"
+msgstr "üle võrgu"
 
-#: ../../standalone/drakbackup_.c:3204
-msgid "Select another media to restore from"
-msgstr "Valige muu andmekandja, millelt taastada"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "on Hard Drive"
+msgstr "kõvakettale"
 
-#: ../../standalone/drakbackup_.c:3206
-msgid "Other Media"
-msgstr "Muu andmekandja"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please choose where you want to backup"
+msgstr "Valige palun, kuhu soovite varukoopia salvestada"
 
-#: ../../standalone/drakbackup_.c:3211
-msgid "Restore system"
-msgstr "Süsteemi taastamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "More Options"
+msgstr "Rohkem valikuid"
 
-#: ../../standalone/drakbackup_.c:3212
-msgid "Restore Users"
-msgstr "Kasutajate taastamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "When"
+msgstr "Millal"
 
-#: ../../standalone/drakbackup_.c:3213
-msgid "Restore Other"
-msgstr "Muu taastamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Where"
+msgstr "Kus"
 
-#: ../../standalone/drakbackup_.c:3215
-msgid "select path to restore (instead of /)"
-msgstr "valige asukoht, kuhu taastada (kui ei ole /)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "What"
+msgstr "Mis"
 
-#: ../../standalone/drakbackup_.c:3219
-msgid "Do new backup before restore (only for incremental backups.)"
-msgstr "Uus varundamine enne taastamist (ainult muutvarunduse puhul)"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Delete Hard Drive tar files after backup to other media."
+msgstr "Kustuta tar-failid kõvakettalt pärast varundamist muule andmekandjale."
 
-#: ../../standalone/drakbackup_.c:3221
-msgid "Remove user directories before restore."
-msgstr "Kasutaja kataloogide eemaldamine enne taastamist."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Send mail report after each backup to:"
+msgstr "Saada pärast iga varundamist meiliraport aadressile:"
 
-#: ../../standalone/drakbackup_.c:3334
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Restore Selected\n"
-"Catalog Entry"
+"Please be sure that the cron daemon is included in your services. \n"
+"\n"
+"Note that currently all 'net' medias also use the hard drive."
 msgstr ""
-"Taasta valitud\n"
-"kataloogikirje"
+"Kontrollige palun, et cron-deemon oleks teenustega kaasatud.\n"
+"\n"
+"Pange tähele, et praegu kasutavad kõvaketast ka kõik 'võrgu'-andmekandjad."
 
-#: ../../standalone/drakbackup_.c:3344
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Restore Selected\n"
-"Files"
+"Please choose the\n"
+"media for backup."
 msgstr ""
-"Taasta valitud\n"
-"failid"
+"Valige palun varundamiseks\n"
+"kasutatav andmekandja."
 
-#: ../../standalone/drakbackup_.c:3361
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Change\n"
-"Restore Path"
+"Please choose the time \n"
+"interval between each backup"
 msgstr ""
-"Muuda\n"
-"taastamise asukohta"
+"Valige palun varundamiste\n"
+"vaheline ajaline intervall"
 
-#: ../../standalone/drakbackup_.c:3427
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "Backup files not found at %s."
-msgstr "%s ei sisaldanud varukoopiafaile."
+msgid "Use daemon"
+msgstr "Deemoni kasutamine"
 
-#: ../../standalone/drakbackup_.c:3440
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid ""
-"Insert the CD with volume label %s\n"
-" in the CD drive under mount point /mnt/cdrom"
-msgstr ""
-"Sisestage CD nimega %s\n"
-" CD-seadmesse haakepunktis /mnt/cdrom"
+msgid "monthly"
+msgstr "iga kuu"
 
-#: ../../standalone/drakbackup_.c:3440
-msgid "Restore From CD"
-msgstr "Taasta CD-lt"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "weekly"
+msgstr "iga nädal"
 
-#: ../../standalone/drakbackup_.c:3442
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "Not the correct CD label. Disk is labelled %s."
-msgstr "CD nimi pole korrektne. Ketta nimi on %s."
+msgid "daily"
+msgstr "iga päev"
 
-#: ../../standalone/drakbackup_.c:3452
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid ""
-"Insert the tape with volume label %s\n"
-" in the tape drive device %s"
-msgstr ""
-"Sisestage lint nimega %s\n"
-" lindiseadmesse %s"
+msgid "hourly"
+msgstr "iga tund"
 
-#: ../../standalone/drakbackup_.c:3452
-msgid "Restore From Tape"
-msgstr "Taasta lindilt"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "HardDrive / NFS"
+msgstr "Kõvaketas / NFS"
 
-#: ../../standalone/drakbackup_.c:3454
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "Not the correct tape label. Tape is labelled %s."
-msgstr "Lindi nimi pole korrektne. Lint kannab nime %s."
+msgid "CDROM / DVDROM"
+msgstr "CDROM / DVDROM"
 
-#: ../../standalone/drakbackup_.c:3474
-msgid "Restore Via Network"
-msgstr "Taasta võrgust"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please enter the directory to save to:"
+msgstr "Sisestage palun kataloog, kuhu salvestada:"
 
-#: ../../standalone/drakbackup_.c:3474
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "Restore Via Network Protocol: %s"
-msgstr "Taasta võrguprotokolli abil: %s"
+msgid "Please check if you want to eject your tape after the backup."
+msgstr "Märkige palun, kui soovite pärast varundamist lindi väljastamist."
 
-#: ../../standalone/drakbackup_.c:3475
-msgid "Host Name"
-msgstr "Masinanimi"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please check if you want to erase your tape before the backup."
+msgstr "Märkige palun, kui soovite lindi enne varundamist puhastada."
 
-#: ../../standalone/drakbackup_.c:3476
-msgid "Host Path or Module"
-msgstr "Masina kataloog või moodul"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please check if you want to use the non-rewinding device."
+msgstr "Märkige palun, kui soovite kasutada tagasikerimisvõimaluseta seadet."
 
-#: ../../standalone/drakbackup_.c:3483
-msgid "Password required"
-msgstr "Parooli nõudmine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please enter the device name to use for backup"
+msgstr "Sisestage palun varundamiseks kasutatava seadme nimi"
 
-#: ../../standalone/drakbackup_.c:3489
-msgid "Username required"
-msgstr "Kasutajatunnuse nõudmine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use tape to backup"
+msgstr "Varundamine lindile"
 
-#: ../../standalone/drakbackup_.c:3492
-msgid "Hostname required"
-msgstr "Masinanime nõudmine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "No CD device defined!"
+msgstr "CD-seade on määramata!"
 
-#: ../../standalone/drakbackup_.c:3497
-msgid "Path or Module required"
-msgstr "Kataloogi või mooduli nõudmine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+"Please enter your CD Writer device name\n"
+" ex: 0,1,0"
+msgstr ""
+"Sisestage palun oma CD-kirjutaja seadmenimi\n"
+" nt: 0,1,0"
 
-#: ../../standalone/drakbackup_.c:3510
-msgid "Files Restored..."
-msgstr "Taastatud failid..."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please check if you are using a DVDRAM device"
+msgstr "Märkige palun, kui kasutate DVDRAM seadet"
 
-#: ../../standalone/drakbackup_.c:3513
-msgid "Restore Failed..."
-msgstr "Taastamine ebaõnnestus..."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please check if you are using a DVDR device"
+msgstr "Märkige palun, kui kasutate DVDR seadet"
 
-#: ../../standalone/drakbackup_.c:3751
-msgid "Restore all backups"
-msgstr "Taasta kõik varukoopiad"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid " Erase Now "
+msgstr " Puhasta nüüd! "
 
-#: ../../standalone/drakbackup_.c:3760
-msgid "Custom Restore"
-msgstr "Taastamise kohandamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please check if you want to erase your RW media (1st Session)"
+msgstr ""
+"Märkige palun, kui soovite puhastada oma RW andmekandja (esimene seanss)"
 
-#: ../../standalone/drakbackup_.c:3804
-msgid "CD in place - continue."
-msgstr "CD on kohal - jätka."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please check if you are using CDRW media"
+msgstr "Märkige palun, kui kasutate CDRW andmekandjat"
 
-#: ../../standalone/drakbackup_.c:3810
-msgid "Browse to new restore repository."
-msgstr "Lehitse uut taastamishoidlat."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please check for multisession CD"
+msgstr "Märkige palun mitmeseansilise CD korral"
 
-#: ../../standalone/drakbackup_.c:3813
-msgid "Restore From Catalog"
-msgstr "Taastamine kataloogist"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please choose your CD/DVD media size (Mb)"
+msgstr "Valige palun CD/DVD andmekandja suurus (Mb)"
 
-#: ../../standalone/drakbackup_.c:3841
-msgid "Restore Progress"
-msgstr "Taastamise edenemine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+"Please choose your CD/DVD device\n"
+"(Press Enter to propogate settings to other fields.\n"
+"This field isn't necessary, only a tool to fill in the form.)"
+msgstr ""
+"Valige palun CD/DVD-seade.\n"
+"(Vajutage Enter sätete levitamiseks teistele väljadele.\n"
+"See väli ei ole kohustuslik, ainult vahend vormi täitmiseks.)"
 
-#: ../../standalone/drakbackup_.c:3883 ../../standalone/drakbackup_.c:3916
-#: ../../standalone/drakbackup_.c:3942 ../../standalone/drakbackup_.c:3969
-#: ../../standalone/drakbackup_.c:3996 ../../standalone/drakbackup_.c:4056
-#: ../../standalone/drakbackup_.c:4083 ../../standalone/drakbackup_.c:4113
-#: ../../standalone/drakbackup_.c:4139
-msgid "Previous"
-msgstr "Eelmine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use CD/DVDROM to backup"
+msgstr "Varundamine CD/DVDROM-ile"
 
-#: ../../standalone/drakbackup_.c:3887 ../../standalone/drakbackup_.c:3973
-#: ../../standalone/logdrake_.c:203
-msgid "Save"
-msgstr "Salvesta"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Need hostname, username and password!"
+msgstr "Vaja läheb masinanime, kasutajatunnust ja parooli!"
 
-#: ../../standalone/drakbackup_.c:3946
-msgid "Build Backup"
-msgstr "Varukoopia loomine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Remember this password"
+msgstr "Jäta parool meelde"
 
-#: ../../standalone/drakbackup_.c:4000 ../../standalone/drakbackup_.c:4544
-msgid "Restore"
-msgstr "Taastamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please enter your password"
+msgstr "Sisestage palun parool"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please enter your login"
+msgstr "Sisestage palun kasutajatunnus"
 
-#: ../../standalone/drakbackup_.c:4189
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Error during sendmail.\n"
-"  Your report mail was not sent.\n"
-"  Please configure sendmail"
+"Please enter the directory (or module) to\n"
+" put the backup on this host."
 msgstr ""
-"Viga meili saatmisel.\n"
-"  Raportimeili ei õnnestunud saata.\n"
-"  Seadistage palun sendmail"
+"Sisestage palun kataloog (või moodul), kuhu\n"
+" sellel masinal varukoopia salvestada."
 
-#: ../../standalone/drakbackup_.c:4195
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Please enter the host name or IP."
+msgstr "Sisestage palun masinanimi või IP."
+
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Error during sending file via FTP.\n"
-" Please correct your FTP configuration."
+"Other (not drakbackup)\n"
+"keys in place already"
 msgstr ""
-"Viga faili saatmisel FTP kaudu.\n"
-" Palun korrigeerige FTP seadistusi."
+"Muud (mitte drakbackupi)\n"
+"võtmed on juba paigas"
 
-#: ../../standalone/drakbackup_.c:4209
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"The following packages need to be installed:\n"
-" @list_of_rpm_to_install"
+"  Transfer  \n"
+"Now"
 msgstr ""
-"Paigaldada tuleb järgmised paketid:\n"
-" @paigaldamist_vajavate_rpm_pakettide_loend"
-
-#: ../../standalone/drakbackup_.c:4232
-msgid "Please select data to restore..."
-msgstr "Valige palun taastatavad andmed..."
-
-#: ../../standalone/drakbackup_.c:4267
-msgid "Please select media for backup..."
-msgstr "Valige palun varundamiseks andmekandja..."
-
-#: ../../standalone/drakbackup_.c:4275
-msgid "Please select data to backup..."
-msgstr "Valige palun varundamiseks andmed..."
+"  Kanna üle  \n"
+"Nüüd"
 
-#: ../../standalone/drakbackup_.c:4293 ../../standalone/drakbackup_.c:4304
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"No configuration file found \n"
-"please click Wizard or Advanced."
+"Create/Transfer\n"
+"backup keys for SSH"
 msgstr ""
-"Seadistustefaili ei leitud, \n"
-"klõpsake palun nupul 'Nõustaja' või 'Muud'."
+"Loo/Kanna üle\n"
+"varundusvõtmed SSH jaoks"
 
-#: ../../standalone/drakbackup_.c:4308
-msgid "Under Devel ... please wait."
-msgstr "Tegutsen ... palun oodake."
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use Expect for SSH"
+msgstr "Expecti kasutamine SSH jaoks"
 
-#: ../../standalone/drakbackup_.c:4382
-msgid "Backup system files"
-msgstr "Süsteemsete failide varundamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Net Method:"
+msgstr "Võrgumeetod:"
 
-#: ../../standalone/drakbackup_.c:4384
-msgid "Backup user files"
-msgstr "Kasutaja failide varundamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use network connection to backup"
+msgstr "Võrguühenduse kasutamine varundamiseks"
 
-#: ../../standalone/drakbackup_.c:4386
-msgid "Backup other files"
-msgstr "Muude failide varundamine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Users"
+msgstr "Kasutajad"
 
-#: ../../standalone/drakbackup_.c:4388 ../../standalone/drakbackup_.c:4421
-msgid "Total Progress"
-msgstr "Edenemine kokku"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Windows (FAT32)"
+msgstr "Windows (FAT32)"
 
-#: ../../standalone/drakbackup_.c:4412
-msgid "files sending by FTP"
-msgstr "failide saatmine FTP kaudu"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use Incremental Backups  (do not replace old backups)"
+msgstr "Muutvarunduse kasutamine (vanu varukoopiaid ei asendata)"
 
-#: ../../standalone/drakbackup_.c:4416
-msgid "Sending files..."
-msgstr "Failide saatmine..."
+#: ../../standalone/drakbackup:1 ../../standalone/drakfont:1
+#, c-format
+msgid "Remove Selected"
+msgstr "Eemalda valitud"
 
-#: ../../standalone/drakbackup_.c:4500
-msgid "Backup Now from configuration file"
-msgstr "Seadistustefaili varundamine nüüd!"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Do not include the browser cache"
+msgstr "Veebilehitseja mälupuhvri kõrvalejätmine"
 
-#: ../../standalone/drakbackup_.c:4505
-msgid "View Backup Configuration."
-msgstr "Varundamise sätete vaatamine."
+#: ../../standalone/drakbackup:1
+#, 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_.c:4526
-msgid "Wizard Configuration"
-msgstr "Nõustaja sätted"
+#: ../../standalone/drakbackup:1
+#, 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_.c:4531
-msgid "Advanced Configuration"
-msgstr "Muud sätted"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Do not include critical files (passwd, group, fstab)"
+msgstr "Kriitiliste failide kõrvalejätmine (passwd, group, fstab)"
 
-#: ../../standalone/drakbackup_.c:4536
-msgid "Backup Now"
-msgstr "Varunda nüüd!"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Use incremental backup  (do not replace old backups)"
+msgstr "Muutvarunduse kasutamine  (vanu varukoopiaid ei asendata)"
 
-#: ../../standalone/drakbackup_.c:4576
-msgid "Drakbackup"
-msgstr "Drakbackup"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup your System files. (/etc directory)"
+msgstr "Varunda süsteemsed failid (kataloog /etc)"
 
-#: ../../standalone/drakbackup_.c:4624
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"options description:\n"
-"\n"
-" In this step Drakbackup allow you to change:\n"
-"\n"
-" - The compression mode:\n"
-"    \n"
-"      If you check bzip2 compression, you will compress\n"
-"      your data better than gzip (about 2-10 %).\n"
-"      This option is not checked by default because\n"
-"      this compression mode needs more time (about 1000% more).\n"
-" \n"
-" - The update mode:\n"
-"\n"
-"      This option will update your backup, but this\n"
-"      option is not really useful because you need to\n"
-"      decompress your backup before you can update it.\n"
-"      \n"
-" - the .backupignore mode:\n"
-"\n"
-"      Like with cvs, Drakbackup will ignore all references\n"
-"      included in .backupignore files in each directories.\n"
-"      ex: \n"
-"         /*> cat .backupignore*/\n"
-"         *.o\n"
-"         *~\n"
-"         ...\n"
-"      \n"
-"\n"
+"These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
-"valikute kirjeldused:\n"
-"\n"
-" Sellel sammul võimaldab Drakbackup muuta:\n"
-"\n"
-" - Tihendusmeetodit:\n"
-"    \n"
-"      Kui valite tihenduse bzip2, õnnestub teil andmeid\n"
-"      tihendada paremini kui gzip-iga (umbes 2-10 %).\n"
-"      See ei ole vaikimisi märgitud, sest see meetod\n"
-"      nõuab ka palju enam aega (umbes 1000% enam).\n"
-" \n"
-" - Uuendamismeetodit:\n"
-"\n"
-"      See võimalus uuendab Teie varukoopiad, kuid pole\n"
-"      tegelikult eriti mõistlik, sest enne seda, kui uuendada,\n"
-"      tuleb varukoopiad lahti pakkida.\n"
-"      \n"
-" - .backupignore meetodit:\n"
-"\n"
-"      Nagu cvs-i puhul, eirab ka Drakbackup igas kataloogis\n"
-"      kõike seda, mis on kirjas .backupignore failides.\n"
-"      nt: \n"
-"         /*> cat .backupignore*\n"
-"         *.o\n"
-"         *~\n"
-"         ...\n"
-"      \n"
-"\n"
+"Need valikud võivad varundada ja taastada kõik failid kataloogis /etc.\n"
 
-#: ../../standalone/drakbackup_.c:4654
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
 "\n"
-" Some errors during sendmail are caused by \n"
-" a bad configuration of postfix. To solve it you have to\n"
-" set myhostname or mydomain in /etc/postfix/main.cf\n"
-"\n"
+"Please check all options that you need.\n"
 msgstr ""
 "\n"
-" Mõned vead meili saatmisel sendmail-iga on\n"
-" põhjustatud postfixi seadistuste vigadest. Nende\n"
-" kõrvaldamiseks määrake 'myhostname' või\n"
-" 'mydomain' failis /etc/postfix/main.cf\n"
-"\n"
+"Kontrollige palun kõiki vajalikke valikuid.\n"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Select the files or directories and click on 'Add'"
+msgstr "Valige failid või kataloogid ja klõpsake 'Lisa'"
+
+#: ../../standalone/drakbackup:1 ../../standalone/drakfont:1
+#, c-format
+msgid "File Selection"
+msgstr "Failivalik"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Can't create catalog!"
+msgstr "Kataloogi ei õnnestunud luua!"
 
-#: ../../standalone/drakbackup_.c:4662
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid " Error while sending mail. \n"
+msgstr " Viga meili saatmisel. \n"
+
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"options description:\n"
-"\n"
-" - Backup system files:\n"
-"       \n"
-"\tThis option allows you to backup your /etc directory,\n"
-"\twhich contains all configuration files. Please be\n"
-"\tcareful during the restore step to not overwrite:\n"
-"\t\t/etc/passwd \n"
-"\t\t/etc/group \n"
-"\t\t/etc/fstab\n"
-"\n"
-" - Backup User files: \n"
-"\n"
-"\tThis option allows you select all users that you want \n"
-"\tto backup.\n"
-"\tTo preserve disk space, it is recommended that you \n"
-"\tdo not include web browser's cache.\n"
-"\n"
-" - Backup Other files: \n"
-"\n"
-"\tThis option allows you to add more data to save.\n"
-"\tWith the other backup it's not possible at the \n"
-"\tmoment to select incremental backup.\t\t\n"
-" \n"
-" - Incremental Backups:\n"
-"\n"
-"\tThe incremental backup is the most powerful \n"
-"\toption for backup. This option allows you \n"
-"\tto backup all your data the first time, and \n"
-"\tonly the changed afterward.\n"
-"\tThen you will be able, during the restore\n"
-"\tstep, to restore your data from a specified\n"
-"\tdate.\n"
-"\tIf you have not selected this option all\n"
-"\told backups are deleted before each backup.    \n"
 "\n"
+"Drakbackup activities via tape:\n"
 "\n"
 msgstr ""
-"valikute kirjeldus:\n"
-"\n"
-" - Süsteemsete failide varundamine:\n"
-"       \n"
-"\tSee võimalus laseb varundada kataloogi /etc,\n"
-"\tmis sisaldab kõiki Teie seadistustefaile. Olge\n"
-"\tpalun taastamise ajal ettevaatlik ja ärge kirjutage\n"
-"\tüle järgmisi faile:\n"
-"\t\t/etc/passwd \n"
-"\t\t/etc/group \n"
-"\t\t/etc/fstab \n"
-"\n"
-" - Kasutaja failide varundamine: \n"
-"\n"
-"\tSee võimalus laseb valida kõik kasutajad, keda\n"
-"\tsoovite varundada.\n"
-"\tKettaruumi kokkuhoiu huvides on soovitatav mitte\n"
-"\tkaasata veebilehitseja puhvrit.\n"
-"\n"
-" - Muude failide varundamine: \n"
-"\n"
-"\tSee võimalus lubab salvestada veelgi enam\n"
-"\tandmeid, kuid praegu ei ole selle puhul veel\n"
-"\tvõimalik kasutada muutvarundamist.\t\t\n"
-" \n"
-" - Muutvarundamine:\n"
-"\n"
-"\ttMuutvarundamine on kõige võimsam kasutatav\n"
-"\tvalik, mis lubab esmalt varundada kõik andmed\n"
-"\tja seejärel ainult vahepeal muutunud andmed.\n"
-"\tSel moel on võimalik ka taastamise ajal taastada\n"
-"\tkonkreetse daatumiga andmed.\n"
-"\tKui Te ei ole seda võimalust valinud, kustutatakse\n"
-"\tenne iga varundamist vanad varukoopiad.    \n"
 "\n"
+"Drakbackupi tegevus lindi vahendusel:\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4701
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"restore description:\n"
-" \n"
-"Only the most recent date will be used, because with incremental \n"
-"backups it is necessary to restore one by one each older backup.\n"
-"\n"
-"So if you don't want to restore a user please unselect all their\n"
-"check boxes.\n"
-"\n"
-"Otherwise, you are able to select only one of these.\n"
-"\n"
-" - Incremental Backups:\n"
-"\n"
-"\tThe incremental backup is the most powerful \n"
-"\toption to use. This option allows you to \n"
-"\tbackup all of your data the first time, and \n"
-"\tonly the changed data after.\n"
-"\tSo you will be able, during the restore\n"
-"\tstep, to restore your data from a specified\n"
-"\tdate.\n"
-"\tIf you have not selected this option all\n"
-"\told backups are deleted before each backup.    \n"
-"\n"
 "\n"
+"Drakbackup activities via CD:\n"
 "\n"
 msgstr ""
-"taastamise kirjeldus:\n"
-"\n"
-"Kasutatakse ainult kõige värskemaid andmeid, sest muutvarunduse\n"
-"korral on oluline taastada üksteise järel kõik vanemad varukoopiad.\n"
 "\n"
-"Kui Te ei soovi taastada näiteks kasutajat, eemaldage märked\n"
-"kõigist tema kastikestest.\n"
-"\n"
-"Vastasel juhul saate valida ainult järgmiste võimaluste vahel.\n"
+"Drakbackupi tegevus CD vahendusel:\n"
 "\n"
-" - Muutvarukoopiad:\n"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
 "\n"
-"\tMuutvarundamine on kõige võimsam kasutatav\n"
-"\tvalik, mis lubab esmalt varundada kõik andmed\n"
-"\tja seejärel ainult vahepeal muutunud andmed.\n"
-"\tSel moel on võimalik ka taastamise ajal taastada\n"
-"\tkonkreetse daatumiga andmed.\n"
-"\tKui Te ei ole seda võimalust valinud, kustutatakse\n"
-"\tenne iga varundamist vanad varukoopiad.    \n"
+"Drakbackup activities via %s:\n"
 "\n"
+msgstr ""
 "\n"
+"Drakbackupi tegevus %s vahendusel:\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4727
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-" Copyright (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita."
-"fr>"
+"\n"
+" FTP connection problem: It was not possible to send your backup files by "
+"FTP.\n"
 msgstr ""
-" Copyright (C) 2001-2002 MandrakeSoft: DUPONT Sebastien <dupont_s\\@epita.fr>"
+"\n"
+" FTP ühenduse probleem: FTP kaudu pole võimalik saata Teie varukoopiafaile.\n"
 
-#: ../../standalone/drakbackup_.c:4729
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-" updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
+"file list sent by FTP: %s\n"
+" "
 msgstr ""
-" uuendused 2002 MandrakeSoft: Stew Benedict <sbenedict\\@mandrakesoft.com>"
+"FTP kaudu saadetud faililoend: %s\n"
+" "
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "No changes to backup!"
+msgstr "Varukoopiaga võrreldes pole mingeid muutusi!"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Hard Disk Backup files..."
+msgstr "Kõvaketta varundamine..."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup Other files..."
+msgstr "Muude failide varundamine..."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Hard Disk Backup Progress..."
+msgstr "Kõvaketta varundamise edenemine..."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup User files..."
+msgstr "Kasutajafailide varundamine..."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Backup system files..."
+msgstr "Süsteemsete failide varundamine..."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "No tape in %s!"
+msgstr "Seadmes %s puudub lint!"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Permission problem accessing CD."
+msgstr "CD-le ligipääsul tekkis loaprobleem."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "This may take a moment to erase the media."
+msgstr "Andmekandja puhastamine võtab mõni hetk aega."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Not erasable media!"
+msgstr "Seda andmekandjat ei saa puhastada!"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Does not appear to be recordable media!"
+msgstr "See ei paista küll olevat kirjutatav andmekandja!"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "No CDR/DVDR in drive!"
+msgstr "CDR/DVDR ei ole seadmes!"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "WebDAV transfer failed!"
+msgstr "WebDAVi ülekanne ebaõnnestus!"
 
-#: ../../standalone/drakbackup_.c:4732
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "WebDAV remote site already in sync!"
+msgstr "WebDAVi kaugsait on juba sünkroonis!"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Total progess"
+msgstr "Edenemine kokku"
+
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"Description:\n"
-"\n"
-"  Drakbackup is used to backup your system.\n"
-"  During the configuration you can select: \n"
-"\t- System files, \n"
-"\t- Users files, \n"
-"\t- Other files.\n"
-"\tor All your system ...  and Other (like Windows Partitions)\n"
-"\n"
-"  Drakbackup allows you to backup your system on:\n"
-"\t- Harddrive.\n"
-"\t- NFS.\n"
-"\t- CDROM (CDRW), DVDROM (with autoboot, rescue and autoinstall.).\n"
-"\t- FTP.\n"
-"\t- Rsync.\n"
-"\t- Webdav.\n"
-"\t- Tape.\n"
-"\n"
-"  Drakbackup allows you to restore your system to\n"
-"  a user selected directory.\n"
+"Transfer successful\n"
+"You may want to verify you can login to the server with:\n"
 "\n"
-"  Per default all backup will be stored on your\n"
-"  /var/lib/drakbackup directory\n"
+"ssh -i %s %s\\@%s\n"
 "\n"
-"  Configuration file:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+"without being prompted for a password."
+msgstr ""
+"Ülekanne oli edukas\n"
+"Võite kontrollida, kas suudate serverile sisse logida käsuga:\n"
 "\n"
-"Restore Step:\n"
-"  \n"
-"  During the restore step, DrakBackup will remove \n"
-"  your original directory and verify that all \n"
-"  backup files are not corrupted. It is recommended \n"
-"  you do a last backup before restoring.\n"
+"ssh -i %s %s\\@%s\n"
 "\n"
+"ilma et Teilt küsitaks parooli."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "%s not responding"
+msgstr "%s ei vasta"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Can't find %s on %s"
+msgstr "%s leidmine %s -l ebaõnnestus"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Permission denied transferring %s to %s"
+msgstr "%s ülekandmiseks %s -le puudub luba"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Bad password on %s"
+msgstr "Halb parool %s puhul"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "No password prompt on %s at port %s"
+msgstr "Parooli ei pärita masinal %s pordis %s"
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "ERROR: Cannot spawn %s."
+msgstr "VIGA: %s tekitamine ebaõnnestus."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "This may take a moment to generate the keys."
+msgstr "Võtmete genereerimine võtab mõne hetke aega."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
+"%s exists, delete?\n"
 "\n"
+"Warning: If you've already done this process you'll probably\n"
+" need to purge the entry from authorized_keys on the server."
 msgstr ""
-"Kirjeldus:\n"
-"\n"
-"  Drakbackup aitab Teie süsteemist varukoopiaid teha.\n"
-"  Seadistamise ajal saate valida \n"
-"\t- süsteemsed failid, \n"
-"\t- kasutaja failid, \n"
-"\t- muud failid \n"
-"\tvõi kogu süsteemi ...  ja muud (nt Windowsi partitsioonid)\n"
+"%s on olemas, kas kustutada?\n"
 "\n"
-"  Drakbackup võimaldab varundada järgmistele andmekandjatele:\n"
-"\t- kõvaketas.\n"
-"\t- NFS.\n"
-"\t- CDROM (CDRW), DVDROM (automaatse alglaadimise, pääste- \n"
-"ja automaatse paigalduse võimalustega).\n"
-"\t- FTP.\n"
-"\t- rsync.\n"
-"\t- Webdav.\n"
-"\t- lint.\n"
+"Hoiatus: Kui te olete selle protsessi juba sooritanud, tuleks\n"
+" Teil ka kirje kustutada serveril autoriseeritud võtmete seast."
+
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid ""
 "\n"
-"  Drakbackup võimaldab taastada süsteemi\n"
-"  kasutaja määratud kataloogi.\n"
+"                    DrakBackup Report Details\n"
 "\n"
-"  Vaikimisi salvestatakse kõik varukoopiad\n"
-"  kataloogi /var/lib/drakbackup.\n"
 "\n"
-"  Seadistustefail:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+msgstr ""
 "\n"
-"Taastamise käik:\n"
-"  \n"
-"  Taastamise ajal eemaldab Drakbackup Teie\n"
-"  originaalkataloogi ja kontrollib, et ükski varukoopia\n"
-"  ei oleks vigane. Soovitatav on enne taastamist\n"
-"  ette võtta veel üks varundamine.\n"
+"                      DrakBackupi raporti üksikasjad\n"
 "\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4769
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
-"options description:\n"
 "\n"
-"Please be careful when you are using ftp backup, because only \n"
-"backups that are already built are sent to the server.\n"
-"So at the moment, you need to build the backup on your hard \n"
-"drive before sending it to the server.\n"
+"                      DrakBackup Daemon Report\n"
+"\n"
 "\n"
 msgstr ""
-"valikute kirjeldus:\n"
 "\n"
-"Olge palun ettevaatlik, kui kasutate ftp-varundamist, sest serverile\n"
-"saadetakse ainult juba loodud varukoopiad. Seetõttu tuleb esmalt\n"
-"luua varukoopiad kõvakettal ja alles siis need serverile saata.\n"
+"                      DrakBackup deemoni raport\n"
+"\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4778
+#: ../../standalone/drakbackup:1
+#, c-format
 msgid ""
 "\n"
-"Restore Backup Problems:\n"
+"                      DrakBackup Report \n"
 "\n"
-"During the restore step, Drakbackup will verify all your\n"
-"backup files before restoring them.\n"
-"Before the restore, Drakbackup will remove \n"
-"your original directory, and you will loose all your \n"
-"data. It is important to be careful and not modify the \n"
-"backup data files by hand.\n"
 msgstr ""
 "\n"
-"Varukoopia taastamise probleemid:\n"
+"                      DrakBackupi raport \n"
 "\n"
-"Taastamise ajal kontrollib Drakbackup enne taastamist\n"
-"kõiki Teie varukoopiafaile.\n"
-"Enne taastamist eemaldab Drakbackup Teie originaalkataloogi\n"
-"ja Te kaotate kõik oma andmed. Seepärast on oluline olla\n"
-"hoolikas ja mitte muuta varundatud andmefaile käsitsi.\n"
 
-#: ../../standalone/drakboot_.c:50
+#: ../../standalone/drakbackup:1
 #, c-format
-msgid "Installation of %s failed. The following error occured:"
-msgstr "%s paigaldamine ebaõnnestus. Tekkis järgmine viga:"
-
-#: ../../standalone/drakbug_.c:45
-msgid "Mandrake Bug Report Tool"
-msgstr "Mandrake veateate abivahend"
-
-#: ../../standalone/drakbug_.c:50
-msgid "First Time Wizard"
-msgstr "Esimese korra nõustaja"
-
-#: ../../standalone/drakbug_.c:51
-msgid "Synchronization tool"
-msgstr "Sünkroniseerimisvahend"
-
-#: ../../standalone/drakbug_.c:52 ../../standalone/drakbug_.c:66
-#: ../../standalone/drakbug_.c:133 ../../standalone/drakbug_.c:135
-#: ../../standalone/drakbug_.c:139
-msgid "Standalone Tools"
-msgstr "Autonoomsed vahendid"
-
-#: ../../standalone/drakbug_.c:53
-msgid "HardDrake"
-msgstr "HardDrake"
-
-#: ../../standalone/drakbug_.c:54
-msgid "Mandrake Online"
-msgstr "Mandrake Online"
-
-#: ../../standalone/drakbug_.c:55
-msgid "Menudrake"
-msgstr "Menudrake"
-
-#: ../../standalone/drakbug_.c:56
-msgid "Msec"
-msgstr "Msec"
+msgid "INFO"
+msgstr "INFO"
 
-#: ../../standalone/drakbug_.c:57
-msgid "Remote Control"
-msgstr "Kaugjuhtimine"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "FATAL"
+msgstr "SAATUSLIK"
 
-#: ../../standalone/drakbug_.c:58
-msgid "Software Manager"
-msgstr "Tarkvarahaldur"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "WARNING"
+msgstr "HOIATUS"
 
-#: ../../standalone/drakbug_.c:59
-msgid "Urpmi"
-msgstr "Urpmi"
+#: ../../standalone/drakbackup:1
+#, c-format
+msgid "Cron not available yet as non-root"
+msgstr "Cron ei ole veel saadaval mitteadministraatorile"
 
-#: ../../standalone/drakbug_.c:60
-msgid "Windows Migration tool"
-msgstr "Windowsi ümberkolimise vahend"
+#: ../../standalone/drakboot:1
+#, c-format
+msgid "Installation of %s failed. The following error occured:"
+msgstr "%s paigaldamine ebaõnnestus. Tekkis järgmine viga:"
 
-#: ../../standalone/drakbug_.c:61
-msgid "Userdrake"
-msgstr "Userdrake"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "No browser available! Please install one"
+msgstr "Brauserit ei leitud! Palun paigaldage mõni"
 
-#: ../../standalone/drakbug_.c:62
-msgid "Configuration Wizards"
-msgstr "Seadistamise nõustajad"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "connecting to Bugzilla wizard ..."
+msgstr "ühenduse loomine Bugzilla nõustajaga ..."
 
-#: ../../standalone/drakbug_.c:75
-msgid "Application:"
-msgstr "Rakendus:"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Package not installed"
+msgstr "Pakett ei ole paigaldatud"
 
-#: ../../standalone/drakbug_.c:76
-msgid "Package: "
-msgstr "Pakett:"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Not installed"
+msgstr "Pole paigaldatud"
 
-#: ../../standalone/drakbug_.c:77
-msgid "Kernel:"
-msgstr "Kernel:"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Standalone Tools"
+msgstr "Autonoomsed vahendid"
 
-#: ../../standalone/drakbug_.c:78
-msgid "Release: "
-msgstr "Väljalase: "
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Report"
+msgstr "Raport"
 
-#: ../../standalone/drakbug_.c:93
+#: ../../standalone/drakbug:1
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -12739,327 +16413,353 @@ msgstr ""
 "serverile üle.\n"
 "\n"
 
-#: ../../standalone/drakbug_.c:112
-msgid "Report"
-msgstr "Raport"
-
-#: ../../standalone/drakbug_.c:148
-msgid "Not installed"
-msgstr "Pole paigaldatud"
-
-#: ../../standalone/drakbug_.c:160
-msgid "Package not installed"
-msgstr "Pakett ei ole paigaldatud"
-
-#: ../../standalone/drakbug_.c:173
-msgid "connecting to Bugzilla wizard ..."
-msgstr "loon ühendust Bugzilla nõustajaga ..."
-
-#: ../../standalone/drakbug_.c:180
-msgid "No browser available! Please install one"
-msgstr "Brauserit ei leitud! Palun paigaldage mõni"
-
-#: ../../standalone/drakconnect_.c:75
+#: ../../standalone/drakbug:1
 #, c-format
-msgid "Network configuration (%d adapters)"
-msgstr "Võrgusätted (%d liidest)"
-
-#: ../../standalone/drakconnect_.c:83 ../../standalone/drakconnect_.c:591
-msgid "Profile: "
-msgstr "Profiil: "
-
-#: ../../standalone/drakconnect_.c:91
-msgid "Del profile..."
-msgstr "Kustuta profiil..."
+msgid "Release: "
+msgstr "Väljalase: "
 
-#: ../../standalone/drakconnect_.c:97
-msgid "Profile to delete:"
-msgstr "Kustutatav profiil:"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Kernel:"
+msgstr "Kernel:"
 
-#: ../../standalone/drakconnect_.c:125
-msgid "New profile..."
-msgstr "Uus profiil..."
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Package: "
+msgstr "Pakett:"
 
-#: ../../standalone/drakconnect_.c:131
-msgid ""
-"Name of the profile to create (the new profile is created as a copy of the "
-"current one) :"
-msgstr "Loodava profiili nimi (uus profiil luuakse praeguse koopiana) :"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Application:"
+msgstr "Rakendus:"
 
-#: ../../standalone/drakconnect_.c:157
-msgid "Hostname: "
-msgstr "Masinanimi: "
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Configuration Wizards"
+msgstr "Seadistamise nõustajad"
 
-#: ../../standalone/drakconnect_.c:164
-msgid "Internet access"
-msgstr "Internetiühendus"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Userdrake"
+msgstr "Userdrake"
 
-#: ../../standalone/drakconnect_.c:177
-msgid "Type:"
-msgstr "Tüüp: "
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Windows Migration tool"
+msgstr "Windowsi ümberkolimise vahend"
 
-#: ../../standalone/drakconnect_.c:180 ../../standalone/drakconnect_.c:372
-msgid "Gateway:"
-msgstr "Vaikelüüs:"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Urpmi"
+msgstr "Urpmi"
 
-#: ../../standalone/drakconnect_.c:180 ../../standalone/drakconnect_.c:372
-msgid "Interface:"
-msgstr "Liides:"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Software Manager"
+msgstr "Tarkvarahaldur"
 
-#: ../../standalone/drakconnect_.c:191
-msgid "Status:"
-msgstr "Olek:"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Remote Control"
+msgstr "Kaugjuhtimine"
 
-#: ../../standalone/drakconnect_.c:198 ../../standalone/net_monitor_.c:145
-msgid "Wait please"
-msgstr "Palun oodake"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Msec"
+msgstr "Msec"
 
-#: ../../standalone/drakconnect_.c:216
-msgid "Configure Internet Access..."
-msgstr "Internetiühenduse seadistamine..."
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Menudrake"
+msgstr "Menudrake"
 
-#: ../../standalone/drakconnect_.c:223 ../../standalone/drakconnect_.c:445
-msgid "LAN configuration"
-msgstr "LAN sätted"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Mandrake Online"
+msgstr "Mandrake Online"
 
-#: ../../standalone/drakconnect_.c:228
-msgid "Driver"
-msgstr "Draiver"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "HardDrake"
+msgstr "HardDrake"
 
-#: ../../standalone/drakconnect_.c:228
-msgid "Interface"
-msgstr "Liides"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Synchronization tool"
+msgstr "Sünkroniseerimisvahend"
 
-#: ../../standalone/drakconnect_.c:228
-msgid "Protocol"
-msgstr "Protokoll"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "First Time Wizard"
+msgstr "Esimese korra nõustaja"
 
-#: ../../standalone/drakconnect_.c:228
-msgid "State"
-msgstr "Olek"
+#: ../../standalone/drakbug:1
+#, c-format
+msgid "Mandrake Bug Report Tool"
+msgstr "Mandrake veateate abivahend"
 
-#: ../../standalone/drakconnect_.c:240
-msgid "Configure Local Area Network..."
-msgstr "Kohtvõrgu (LAN) seadistamine..."
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "DHCP Client"
+msgstr "DHCP klient"
 
-#: ../../standalone/drakconnect_.c:252
-msgid "Click here to launch the wizard ->"
-msgstr "Klõpsake siia nõustaja käivitamiseks ->"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Ethernet Card"
+msgstr "Võrgukaart"
 
-#: ../../standalone/drakconnect_.c:253
-msgid "Wizard..."
-msgstr "Nõustaja..."
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Gateway"
+msgstr "Vaikelüüs"
 
-#: ../../standalone/drakconnect_.c:279
-msgid "Apply"
-msgstr "Rakenda"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Parameters"
+msgstr "Parameetrid"
 
-#: ../../standalone/drakconnect_.c:380 ../../standalone/drakconnect_.c:403
-#: ../../standalone/net_monitor_.c:457
-msgid "Connected"
-msgstr "Ühendatud"
+#: ../../standalone/drakconnect:1 ../../standalone/net_monitor:1
+#, c-format
+msgid "Connection type: "
+msgstr "Ühenduse tüüp: "
 
-#: ../../standalone/drakconnect_.c:380 ../../standalone/drakconnect_.c:403
-#: ../../standalone/net_monitor_.c:457
-msgid "Not connected"
-msgstr "Ei ole ühendatud"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Profile: "
+msgstr "Profiil: "
 
-#: ../../standalone/drakconnect_.c:381 ../../standalone/drakconnect_.c:404
-msgid "Connect..."
-msgstr "Ühenda..."
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Internet Connection Configuration"
+msgstr "Internetiühenduse seadistamine"
 
-#: ../../standalone/drakconnect_.c:381 ../../standalone/drakconnect_.c:404
-msgid "Disconnect..."
-msgstr "Lahuta..."
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Internet connection configuration"
+msgstr "Internetiühenduse seadistamine"
 
-#: ../../standalone/drakconnect_.c:400
+#: ../../standalone/drakconnect:1
+#, c-format
 msgid ""
-"Warning, another Internet connection has been detected, maybe using your "
-"network"
+"You don't have an Internet connection.\n"
+"Create one first by clicking on 'Configure'"
 msgstr ""
-"Hoiatus, avastati veel üks internetiühendus, mis võib-olla kasutab Teie võrku"
+"Teil ei ole Internetiühendust.\n"
+"Looge see klõpsuga nupul 'Seadista'"
 
-#: ../../standalone/drakconnect_.c:427
+#: ../../standalone/drakconnect:1
+#, c-format
 msgid ""
-"You don't have any configured interface.\n"
-"Configure them first by clicking on 'Configure'"
+"This interface has not been configured yet.\n"
+"Launch the configuration wizard in the main window"
 msgstr ""
-"Ühtegi liidest ei ole seadistatud.\n"
-"Esmalt tuleb need seadistada, klõpsake selleks nupul 'Seadista'"
+"Seda liidest ei ole veel seadistatud.\n"
+"Käivitage peaaknas seadistamise nõustaja"
 
-#: ../../standalone/drakconnect_.c:449
-msgid "LAN Configuration"
-msgstr "LAN sätted"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "activate now"
+msgstr "aktiveeri nüüd"
 
-#: ../../standalone/drakconnect_.c:460
+#: ../../standalone/drakconnect:1
 #, c-format
-msgid "Adapter %s: %s"
-msgstr "Võrgukaart %s: %s"
+msgid "deactivate now"
+msgstr "peata nüüd"
 
-#: ../../standalone/drakconnect_.c:466
-msgid "Boot Protocol"
-msgstr "Laadimisprotokoll"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "DHCP client"
+msgstr "DHCP klient"
 
-#: ../../standalone/drakconnect_.c:467
+#: ../../standalone/drakconnect:1
+#, c-format
 msgid "Started on boot"
 msgstr "Käivitub laadimisel"
 
-#: ../../standalone/drakconnect_.c:468
-msgid "DHCP client"
-msgstr "DHCP klient"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Boot Protocol"
+msgstr "Laadimisprotokoll"
 
-#: ../../standalone/drakconnect_.c:493 ../../standalone/drakconnect_.c:496
-msgid "activate now"
-msgstr "aktiveeri nüüd"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Adapter %s: %s"
+msgstr "Võrgukaart %s: %s"
 
-#: ../../standalone/drakconnect_.c:493 ../../standalone/drakconnect_.c:496
-msgid "deactivate now"
-msgstr "lülita välja nüüd"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "LAN Configuration"
+msgstr "LAN sätted"
 
-#: ../../standalone/drakconnect_.c:499
-msgid ""
-"This interface has not been configured yet.\n"
-"Launch the configuration wizard in the main window"
-msgstr ""
-"Seda liidest ei ole veel seadistatud.\n"
-"Käivitage peaaknas seadistamise nõustaja"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "LAN configuration"
+msgstr "LAN sätted"
 
-#: ../../standalone/drakconnect_.c:556
+#: ../../standalone/drakconnect:1
+#, c-format
 msgid ""
-"You don't have any internet connection.\n"
-"Create one first by clicking on 'Configure'"
+"You don't have any configured interface.\n"
+"Configure them first by clicking on 'Configure'"
 msgstr ""
-"Teil ei ole internetiühendust.\n"
-"Looge see klõpsuga nupul 'Seadista'"
-
-#: ../../standalone/drakconnect_.c:580
-msgid "Internet connection configuration"
-msgstr "Internetiühenduse seadistamine"
+"Ühtegi liidest ei ole seadistatud.\n"
+"Esmalt tuleb need seadistada, klõpsake selleks nupul 'Seadista'"
 
-#: ../../standalone/drakconnect_.c:584
-msgid "Internet Connection Configuration"
-msgstr "Internetiühenduse seadistamine"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Connect..."
+msgstr "Ühenda..."
 
-#: ../../standalone/drakconnect_.c:593 ../../standalone/net_monitor_.c:94
-msgid "Connection type: "
-msgstr "Ühenduse tüüp: "
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Disconnect..."
+msgstr "Lahuta..."
 
-#: ../../standalone/drakconnect_.c:599
-msgid "Parameters"
-msgstr "Parameetrid"
+#: ../../standalone/drakconnect:1 ../../standalone/net_monitor:1
+#, c-format
+msgid "Not connected"
+msgstr "Ei ole ühendatud"
 
-#: ../../standalone/drakconnect_.c:618
-msgid "Gateway"
-msgstr "Vaikelüüs"
+#: ../../standalone/drakconnect:1 ../../standalone/net_monitor:1
+#, c-format
+msgid "Connected"
+msgstr "Ühendatud"
 
-#: ../../standalone/drakconnect_.c:627
-msgid "Ethernet Card"
-msgstr "Võrgukaart"
+#: ../../standalone/drakconnect:1
+#, 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"
 
-#: ../../standalone/drakconnect_.c:628
-msgid "DHCP Client"
-msgstr "DHCP klient"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Interface:"
+msgstr "Liides:"
 
-#: ../../standalone/drakfloppy_.c:39
-msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
-msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Gateway:"
+msgstr "Vaikelüüs:"
 
-#: ../../standalone/drakfloppy_.c:40
-msgid "Module name"
-msgstr "Mooduli nimi"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Apply"
+msgstr "Rakenda"
 
-#: ../../standalone/drakfloppy_.c:40
-msgid "Size"
-msgstr "Suurus"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Click here to launch the wizard ->"
+msgstr "Klõpsake siia nõustaja käivitamiseks ->"
 
-#: ../../standalone/drakfloppy_.c:45
-msgid "drakfloppy"
-msgstr "drakfloppy"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Wizard..."
+msgstr "Nõustaja..."
 
-#: ../../standalone/drakfloppy_.c:63
-msgid "boot disk creation"
-msgstr "alglaadimisketta loomine"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Status:"
+msgstr "Olek:"
 
-#: ../../standalone/drakfloppy_.c:71 ../../standalone/drakfloppy_.c:84
-msgid "default"
-msgstr "tavaline"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Type:"
+msgstr "Tüüp: "
 
-#: ../../standalone/drakfloppy_.c:87
+#: ../../standalone/drakconnect:1
 #, c-format
-msgid "DrakFloppy Error: %s"
-msgstr "DrakFloppy viga: %s"
+msgid "Internet access"
+msgstr "Internetiühendus"
 
-#: ../../standalone/drakfloppy_.c:98
-msgid "kernel version"
-msgstr "kerneli versioon"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Hostname: "
+msgstr "Masinanimi: "
 
-#: ../../standalone/drakfloppy_.c:104
-msgid "General"
-msgstr "Üldine"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Configure Local Area Network..."
+msgstr "Kohtvõrgu (LAN) seadistamine..."
 
-#: ../../standalone/drakfloppy_.c:109
-msgid "Expert Area"
-msgstr "Ekspertidele"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "State"
+msgstr "Olek"
 
-#: ../../standalone/drakfloppy_.c:112
-msgid "mkinitrd optional arguments"
-msgstr "mkinitrd lisaargumendid"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Driver"
+msgstr "Juhtprogramm"
 
-#: ../../standalone/drakfloppy_.c:113
-msgid "Add a module"
-msgstr "Lisa moodul"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Protocol"
+msgstr "Protokoll"
 
-#: ../../standalone/drakfloppy_.c:133
-msgid "force"
-msgstr "sunni peale"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Interface"
+msgstr "Liides"
 
-#: ../../standalone/drakfloppy_.c:134
-msgid "if needed"
-msgstr "kui vaja"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Configure Internet Access..."
+msgstr "Internetiühenduse seadistamine..."
 
-#: ../../standalone/drakfloppy_.c:135
-msgid "omit scsi modules"
-msgstr "scsi moodulite vahelejätt"
+#: ../../standalone/drakconnect:1 ../../standalone/net_monitor:1
+#, c-format
+msgid "Wait please"
+msgstr "Palun oodake"
 
-#: ../../standalone/drakfloppy_.c:136
-msgid "omit raid modules"
-msgstr "raid moodulite vahelejätt"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid ""
+"Name of the profile to create (the new profile is created as a copy of the "
+"current one) :"
+msgstr "Loodava profiili nimi (uus profiil luuakse praeguse koopiana) :"
 
-#: ../../standalone/drakfloppy_.c:172
-msgid "Remove a module"
-msgstr "Eemalda moodul"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "New profile..."
+msgstr "Uus profiil..."
 
-#: ../../standalone/drakfloppy_.c:194
-msgid "Output"
-msgstr "Väljund"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Profile to delete:"
+msgstr "Kustutatav profiil:"
 
-#: ../../standalone/drakfloppy_.c:206
-msgid "Build the disk"
-msgstr "Ketta loomine"
+#: ../../standalone/drakconnect:1
+#, c-format
+msgid "Del profile..."
+msgstr "Kustuta profiil..."
 
-#: ../../standalone/drakfloppy_.c:336
+#: ../../standalone/drakconnect:1
 #, c-format
-msgid "Be sure a media is present for the device %s"
-msgstr "Kontrollige, et andmekandja on seadmes %s"
+msgid "Network configuration (%d adapters)"
+msgstr "Võrgusätted (%d liidest)"
 
-#: ../../standalone/drakfloppy_.c:341
+#: ../../standalone/drakedm:1
 #, c-format
 msgid ""
-"There is no medium or it is write-protected for device %s.\n"
-"Please insert one."
+"X11 Display Manager allows you to graphically log\n"
+"into your system with the X Window System running and supports running\n"
+"several different X sessions on your local machine at the same time."
 msgstr ""
-"Andmekandja puudub seadmes %s või on kirjutuskaitsega.\n"
-"Sisestage palun andmekandja."
+"X11 kuvahaldur võimaldab Teil graafiliselt sisse logida\n"
+"süsteemi, kus töötab X Window System, samuti toetab see korraga \n"
+"mitme X-seansi käivitamist ja neis töötamist."
 
-#: ../../standalone/drakfloppy_.c:344
+#: ../../standalone/drakedm:1
 #, c-format
-msgid "Unable to fork: %s"
-msgstr "Fork ebaõnnestus: %s"
+msgid "Choosing a display manager"
+msgstr "Kuvahalduri valimine"
 
-#: ../../standalone/drakfloppy_.c:349
+#: ../../standalone/drakfloppy:1
 #, c-format
 msgid ""
-"Unable to close properly mkbootdisk: \n"
+"Unable to properly close mkbootdisk: \n"
 " %s \n"
 " %s"
 msgstr ""
@@ -13067,137 +16767,232 @@ msgstr ""
 " %s \n"
 " %s"
 
-#: ../../standalone/drakfont_.c:213
-msgid "Search installed fonts"
-msgstr "Paigaldatud fontide otsimine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Unable to fork: %s"
+msgstr "Fork ebaõnnestus: %s"
 
-#: ../../standalone/drakfont_.c:215
-msgid "Unselect fonts installed"
-msgstr "Paigaldatud fontide valiku tühistamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid ""
+"There is no medium or it is write-protected for device %s.\n"
+"Please insert one."
+msgstr ""
+"Andmekandja puudub seadmes %s või on kirjutuskaitsega.\n"
+"Sisestage palun andmekandja."
 
-#: ../../standalone/drakfont_.c:239
-msgid "parse all fonts"
-msgstr "kõigi fontide analüüs"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Be sure a media is present for the device %s"
+msgstr "Kontrollige, et andmekandja on seadmes %s"
 
-#: ../../standalone/drakfont_.c:242
-msgid "no fonts found"
-msgstr "fonte ei leitud"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Build the disk"
+msgstr "Ketta loomine"
 
-#: ../../standalone/drakfont_.c:251 ../../standalone/drakfont_.c:305
-#: ../../standalone/drakfont_.c:361 ../../standalone/drakfont_.c:454
-#: ../../standalone/drakfont_.c:466 ../../standalone/drakfont_.c:493
-#: ../../standalone/drakfont_.c:514 ../../standalone/drakfont_.c:532
-msgid "done"
-msgstr "tehtud"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Output"
+msgstr "Väljund"
 
-#: ../../standalone/drakfont_.c:257
-msgid "could not find any font in your mounted partitions"
-msgstr "ei suutnud haagitud partitsioonidel leida ühtegi fonti"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Remove a module"
+msgstr "Eemalda moodul"
 
-#: ../../standalone/drakfont_.c:303
-msgid "Reselect correct fonts"
-msgstr "Korrektsete fontide uuestivalimine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "omit raid modules"
+msgstr "raid moodulite vahelejätt"
 
-#: ../../standalone/drakfont_.c:307
-msgid "could not find any font.\n"
-msgstr "ei suutnud fonte leida.\n"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "omit scsi modules"
+msgstr "scsi moodulite vahelejätt"
 
-#: ../../standalone/drakfont_.c:331
-msgid "Search fonts in installed list"
-msgstr "Fontide otsing paigaldatute loendis"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "if needed"
+msgstr "kui vaja"
 
-#: ../../standalone/drakfont_.c:359
-msgid "Fonts copy"
-msgstr "Fontide kopeerimine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "force"
+msgstr "sunni peale"
 
-#: ../../standalone/drakfont_.c:363
-msgid "True Type fonts installation"
-msgstr "TrueType fontide paigaldamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Add a module"
+msgstr "Lisa moodul"
 
-#: ../../standalone/drakfont_.c:371
-msgid "please wait during ttmkfdir..."
-msgstr "palun oodake, käib ttmkdir..."
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "mkinitrd optional arguments"
+msgstr "mkinitrd lisaargumendid"
 
-#: ../../standalone/drakfont_.c:377
-msgid "True Type install done"
-msgstr "TrueType paigaldus tehtud"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Expert Area"
+msgstr "Ekspertidele"
 
-#: ../../standalone/drakfont_.c:386 ../../standalone/drakfont_.c:413
-msgid "Fonts conversion"
-msgstr "Fontide teisendamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "General"
+msgstr "Üldine"
 
-#: ../../standalone/drakfont_.c:392 ../../standalone/drakfont_.c:417
-#: ../../standalone/drakfont_.c:450
-msgid "type1inst building"
-msgstr "type1inst loomine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "kernel version"
+msgstr "kerneli versioon"
 
-#: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:427
-msgid "Ghostscript referencing"
-msgstr "Ghostcsripti määratlused"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "DrakFloppy Error: %s"
+msgstr "DrakFloppy viga: %s"
 
-#: ../../standalone/drakfont_.c:437
-msgid "ttf fonts conversion"
-msgstr "ttf fontide teisendamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "default"
+msgstr "tavaline"
 
-#: ../../standalone/drakfont_.c:444
-msgid "pfm fonts conversion"
-msgstr "pfm fontide teisendamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "boot disk creation"
+msgstr "alglaadimisketta loomine"
 
-#: ../../standalone/drakfont_.c:456
-msgid "Suppress temporary Files"
-msgstr "Ajutiste failide kustutamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "drakfloppy"
+msgstr "drakfloppy"
 
-#: ../../standalone/drakfont_.c:459
-msgid "Restart XFS"
-msgstr "XFS taaskäivitamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Size"
+msgstr "Suurus"
 
-#: ../../standalone/drakfont_.c:512 ../../standalone/drakfont_.c:526
-msgid "Suppress Fonts Files"
-msgstr "Fondifailide kustutamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "Module name"
+msgstr "Mooduli nimi"
 
-#: ../../standalone/drakfont_.c:528
-msgid "xfs restart"
-msgstr "xfs taaskäivitamine"
+#: ../../standalone/drakfloppy:1
+#, c-format
+msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
+msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Post Uninstall"
+msgstr "Eemaldamisjärgsed seadistused"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Remove fonts on your system"
+msgstr "Fontide eemaldamine Teie süsteemist"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Initial tests"
+msgstr "Käivitustestid"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Post Install"
+msgstr "Paigaldusjärgsed seadistused"
 
-#: ../../standalone/drakfont_.c:536 ../../standalone/drakfont_.c:902
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Install & convert Fonts"
+msgstr "Fontide paigaldamine ja teisendamine"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Copy fonts on your system"
+msgstr "Fontide kopeerimine Teie süsteemi"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Remove List"
+msgstr "Eemalda loend"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Selected All"
+msgstr "Kõigi valimine"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Unselected All"
+msgstr "Tühista kõigi valimine"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "here if no."
+msgstr "kui mitte, siis siia."
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "click here if you are sure."
+msgstr "kui olete kindel, klõpsake siia."
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Install List"
+msgstr "Paigaldusloend"
+
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Select the font file or directory and click on 'Add'"
+msgstr "Valige fondifail või kataloog ja klõpsake 'Lisa'"
+
+#: ../../standalone/drakfont:1
+#, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
 "install them on your system.\n"
 "\n"
-"-You can install the fonts using the normal way. In rare cases, bogus fonts "
-"may hang up your X Server."
+"-You can install the fonts the normal way. In rare cases, bogus fonts may "
+"hang up your X Server."
 msgstr ""
 "Enne fontide paigaldamist kontrollige, et Teil on õigus neid oma süsteemis "
-"kasutada ja paigaldaada.\n"
+"kasutada ja paigaldada.\n"
 "\n"
 " Fonte saab paigaldada normaalsel meetodil. Haruharva võivad vigased fondid "
 "panna küll X Serveri hanguma."
 
-#: ../../standalone/drakfont_.c:621
-msgid "Fonts Importation"
-msgstr "Fontide importimine"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Generic Printers"
+msgstr "Tavalised printerid"
 
-#: ../../standalone/drakfont_.c:650
-msgid "Get Windows Fonts"
-msgstr "Windowsi fontide hankimine"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Abiword"
+msgstr "Abiword"
 
-#: ../../standalone/drakfont_.c:658
-msgid "Uninstall Fonts"
-msgstr "Fontide eemaldamine"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "StarOffice"
+msgstr "StarOffice"
 
-#: ../../standalone/drakfont_.c:669
-msgid "Advanced Options"
-msgstr "Muud valikud"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Ghostscript"
+msgstr "Ghostscript"
 
-#: ../../standalone/drakfont_.c:677
-msgid "Font List"
-msgstr "Fontide loend"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Choose the applications that will support the fonts:"
+msgstr "Valige rakendused, millel on fontide tugi:"
 
-#: ../../standalone/drakfont_.c:737
+#: ../../standalone/drakfont:1
+#, c-format
 msgid ""
 "\n"
 " Copyright (C) 2001-2002 by MandrakeSoft \n"
-"\tDUPONT Sebastien sdupont\\@mandrakesoft.com\n"
+"\tDUPONT Sebastien (original version)\n"
+"        CHAUMETTE Damien <dchaumette\\@mandrakesoft.com>\n"
 "\n"
 " This program is free software; you can redistribute it and/or modify\n"
 " it under the terms of the GNU General Public License as published by\n"
@@ -13223,12 +17018,11 @@ msgid ""
 "    -  ttf2pt1:   \n"
 "\t  by Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
 "             Convert ttf font files to afm and pfb fonts\n"
-"\n"
-"\n"
 msgstr ""
 "\n"
 " Copyright (C) 2001-2002: MandrakeSoft \n"
-"\tDUPONT Sebastien sdupont\\@mandrakesoft.com\n"
+"\tDUPONT Sebastien (esialgne versioon)\n"
+"        CHAUMETTE Damien <dchaumette\\@mandrakesoft.com>\n"
 "\n"
 " Käesolev rakendus on vaba tarkvara. Te võite seda edasi levitada\n"
 " ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele, nagu\n"
@@ -13247,10 +17041,10 @@ msgstr ""
 "\n"
 " Täname:\n"
 "    -  pfm2afm:   \n"
-"\tautor: Ken Borgendale:\n"
+"\t autor: Ken Borgendale:\n"
 "\t    teisendab Windowsi .pfm-faili .afm-failiks (Adobe fondimeetrika)\n"
 "    -  type1inst:\n"
-"\tautor: James Macnicol: \n"
+"\t autor: James Macnicol: \n"
 "\t    type1inst tekitab failid fonts.dir fonts.scale ja Fontmap.\n"
 "    -  ttf2pt1:   \n"
 "\t  autorid: Andrew Weeks, Frank Siegert, Thomas Henlich, Sergei Babkin  \n"
@@ -13258,375 +17052,280 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../standalone/drakfont_.c:793
-msgid ""
-"drakfont Future Overview\n"
-"        - Fonts import:\n"
-"                pfb ( Adobe Type 1 binary )\n"
-"                pfa ( Adobe Type 1 ASCII )\n"
-"                ttf ( True-Type  )\n"
-"                pcf.gz\n"
-"                Speedo\n"
-"                and Bitmap (PCF, BDF, and SNF)\n"
-"        - Features\n"
-"                - Install fonts from any directory\n"
-"                - Get windows fonts on any vfat partitions\n"
-"                - Get fonts on any partitions.\n"
-"                - UN-installation of any fonts (even if not installed "
-"through drakfont)\n"
-"        - Support\n"
-"              - Xfs\n"
-"              - ghostscript & printer\n"
-"              - Staroffice & printer\n"
-"              - abiword\n"
-"\t      - netscape\n"
-"              - Koffice, Gnumeric, ... studying\n"
-"              - all fonts supported by printer\n"
-"              - anti-aliases by RENDER in Xfree86 .... \n"
-"\t\t\t\tsupported by KDE.\n"
-"\t\t\t\twill be supported by gnome 1.2.\n"
-"Visual Interface:\n"
-"        Window interface:\n"
-"          - Fontselectiondialog widget\n"
-"          - Command buttons under Fontselectiondialog (like the actual "
-"frontend).\n"
-"        Commands buttons:\n"
-"          - import from windows partition.\n"
-"                import from all fat32 partitions and look for winnt/windows/"
-"font\n"
-"                and import all (delete doublon) but don't import if already "
-"exist.\n"
-"          - import from directory\n"
-"                look for if it exist before for each font and not delete the "
-"original.\n"
-"                (replace all, no, none)\n"
-"                expert options:\n"
-"                        ask the directory, and look for if it exist before\n"
-"                        if it exist ask: (replace all, no, none)\n"
-"          - uninstall with list per font type\n"
-"        Expert additional switch\n"
-"          - option support:   ghostscript, Staroffice, etc...\n"
-"                check-button. (by default all check)\n"
-"          - Printer Application Fonts Support...\n"
-"\n"
-"\n"
-msgstr ""
-"drakfonti tulevikukavatsused\n"
-"        - Fontide importimine:\n"
-"                pfb ( Adobe Type 1 binaarkujul )\n"
-"                pfa ( Adobe Type 1 ASCII kujul )\n"
-"                ttf ( True-Type  )\n"
-"                pcf.gz\n"
-"                Speedo\n"
-"                ja Bitmap (PCF, BDF ja SNF)\n"
-"        - Omadused\n"
-"                - Fontide paigaldamine suvalisest kataloogist\n"
-"                - Windowsi fontide hankimine suvaliselt vfat-partitsioonilt\n"
-"                - Fontide hankimine suvaliselt partitsioonilt\n"
-"                - Suvalise fondi eemaldamine (iseg kui ei ole paigaldatud "
-"drakfonti abil)\n"
-"        - Tugi\n"
-"                - Xfs\n"
-"                - Ghostscript ja printer\n"
-"                - StarOffice ja printer\n"
-"                - Abiword\n"
-"\t      - Netscape\n"
-"                - Koffice, Gnumeric, ... asja uuritakse\n"
-"                - kõik printeri toetatud fondid\n"
-"                - antialias teisenduse vahendusel Xfree86-s ... \n"
-"\t\t\t\tKDE toetusega.\n"
-"\t\t\t\ttulevase GNOME 2.1 toetusega\n"
-"Visuaalne kasutajaliides:\n"
-"        Aknaliides:\n"
-"          - Fondivalimisdialoogi vidin\n"
-"          - käsunupud fondivalimisdialoogis (nagu praeguses "
-"kasutajaliideses).\n"
-"        Käsunupud:\n"
-"          - importimine windowsi partitsioonilt.\n"
-"                importimine kõigilt FAT32 partitsioonidelt ja winnt/window/"
-"font otsimine\n"
-"                ja kõigi importimine (duublite kustutamine), välja arvatud "
-"juhul, kui on juba olemas.\n"
-"          - importimine kataloogist\n"
-"                iga fondi puhul eelnev otsing, kas on juba olemas, ning "
-"originaali mittekustutamine.\n"
-"                (asenda kõik, ei, puudub)\n"
-"                ekspertvalikud:\n"
-"                        küsi kataloogi ja otsi, ega ei ole varem olemas\n"
-"                        kui on olemas, küsida: (asenda kõik, ei, puudub)\n"
-"          - eemaldamine loendist fonditüübi kaupa\n"
-"        Lisaekspertvalikud\n"
-"          - toevalik:   Ghostscript, StarOffice jne...\n"
-"                kontrollinupp. (vaikimis kõigi kontroll)\n"
-"          - printerifontide tugi...\n"
-"\n"
-"\n"
-
-#: ../../standalone/drakfont_.c:862
-msgid "Choose the applications that will support the fonts:"
-msgstr "Valige rakendused, millel on fontide tugi:"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "About"
+msgstr "Misvärk"
 
-#: ../../standalone/drakfont_.c:870
-msgid "Ghostscript"
-msgstr "Ghostscript"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Font List"
+msgstr "Fontide loend"
 
-#: ../../standalone/drakfont_.c:877
-msgid "StarOffice"
-msgstr "StarOffice"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Advanced Options"
+msgstr "Muud valikud"
 
-#: ../../standalone/drakfont_.c:884
-msgid "Abiword"
-msgstr "Abiword"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Uninstall Fonts"
+msgstr "Fontide eemaldamine"
 
-#: ../../standalone/drakfont_.c:891
-msgid "Generic Printers"
-msgstr "Tavalised printerid"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Get Windows Fonts"
+msgstr "Windowsi fontide hankimine"
 
-#: ../../standalone/drakfont_.c:958
-msgid "Select the font file or directory and click on 'Add'"
-msgstr "Valige fondifail või kataloog ja klõpsake 'Lisa'"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Import Fonts"
+msgstr "Fontide importimine"
 
-#: ../../standalone/drakfont_.c:1005
-msgid "Install List"
-msgstr "Paigaldusloend"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "done"
+msgstr "tehtud"
 
-#: ../../standalone/drakfont_.c:1048
-msgid "click here if you are sure."
-msgstr "kui olete kindel, klõpsake siia."
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "xfs restart"
+msgstr "xfs taaskäivitamine"
 
-#: ../../standalone/drakfont_.c:1055
-msgid "here if no."
-msgstr "kui mitte, siis siia."
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Suppress Fonts Files"
+msgstr "Fondifailide kustutamine"
 
-#: ../../standalone/drakfont_.c:1112
-msgid "Unselected All"
-msgstr "Tühista kõigi valimine"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Restart XFS"
+msgstr "XFS taaskäivitamine"
 
-#: ../../standalone/drakfont_.c:1116
-msgid "Selected All"
-msgstr "Kõigi valimine"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Suppress Temporary Files"
+msgstr "Ajutiste failide kustutamine"
 
-#: ../../standalone/drakfont_.c:1120
-msgid "Remove List"
-msgstr "Eemalda loend"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "type1inst building"
+msgstr "type1inst loomine"
 
-#: ../../standalone/drakfont_.c:1142 ../../standalone/drakfont_.c:1175
-msgid "Initials tests"
-msgstr "Käivitustestid"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "pfm fonts conversion"
+msgstr "pfm fontide teisendamine"
 
-#: ../../standalone/drakfont_.c:1145
-msgid "Copy fonts on your system"
-msgstr "Fontide kopeerimine Teie süsteemi"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "ttf fonts conversion"
+msgstr "ttf fontide teisendamine"
 
-#: ../../standalone/drakfont_.c:1149
-msgid "Install & convert Fonts"
-msgstr "Fontide paigaldamine ja teisendamine"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Ghostscript referencing"
+msgstr "Ghostcsripti määratlused"
 
-#: ../../standalone/drakfont_.c:1153
-msgid "Post Install"
-msgstr "Paigaldusjärgsed seadistused"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Fonts conversion"
+msgstr "Fontide teisendamine"
 
-#: ../../standalone/drakfont_.c:1178
-msgid "Remove fonts on your system"
-msgstr "Fontide eemaldamine Teie süsteemist"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "True Type install done"
+msgstr "TrueType paigaldus tehtud"
 
-#: ../../standalone/drakfont_.c:1182
-msgid "Post Uninstall"
-msgstr "Eemaldamisjärgsed seadistused"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "please wait during ttmkfdir..."
+msgstr "palun oodake, käib ttmkdir..."
 
-#: ../../standalone/drakgw_.c:42 ../../standalone/drakgw_.c:182
-msgid "Internet Connection Sharing"
-msgstr "Internetiühenduse jagamine"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "True Type fonts installation"
+msgstr "TrueType fontide paigaldamine"
 
-#: ../../standalone/drakgw_.c:114
-msgid "Sorry, we support only 2.4 kernels."
-msgstr "Vabandust, me toetame ainult 2.4 kerneleid."
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Fonts copy"
+msgstr "Fontide kopeerimine"
 
-#: ../../standalone/drakgw_.c:125
-msgid "Internet Connection Sharing currently enabled"
-msgstr "Internetiühenduse jagamine töötab"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Search for fonts in installed list"
+msgstr "Fontide otsing paigaldatute loendis"
 
-#: ../../standalone/drakgw_.c:126
-msgid ""
-"The setup of Internet connection sharing has already been done.\n"
-"It's currently enabled.\n"
-"\n"
-"What would you like to do?"
-msgstr ""
-"Internetiühenduse jagamine on juba seadistatud\n"
-"ja see on ka praegu aktiivne.\n"
-"\n"
-"Mida soovite ette võtta?"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "could not find any font.\n"
+msgstr "ei suutnud fonte leida.\n"
 
-#: ../../standalone/drakgw_.c:130
-msgid "disable"
-msgstr "keelata"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Reselect correct fonts"
+msgstr "Korrektsete fontide uuestivalimine"
 
-#: ../../standalone/drakgw_.c:130 ../../standalone/drakgw_.c:154
-msgid "dismiss"
-msgstr "tühistada"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "could not find any font in your mounted partitions"
+msgstr "ei suutnud haagitud partitsioonidel leida ühtegi fonti"
 
-#: ../../standalone/drakgw_.c:130 ../../standalone/drakgw_.c:154
-msgid "reconfigure"
-msgstr "uuesti seadistada"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "no fonts found"
+msgstr "fonte ei leitud"
 
-#: ../../standalone/drakgw_.c:133
-msgid "Disabling servers..."
-msgstr "Serverite peatamine..."
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "parse all fonts"
+msgstr "kõigi fontide analüüs"
 
-#: ../../standalone/drakgw_.c:142
-msgid "Internet connection sharing is now disabled."
-msgstr "Internetiühendust nüüd enam ei jagata."
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Unselect fonts installed"
+msgstr "Paigaldatud fontide valiku tühistamine"
 
-#: ../../standalone/drakgw_.c:149
-msgid "Internet Connection Sharing currently disabled"
-msgstr "Internetiühendust hetkel ei jagata"
+#: ../../standalone/drakfont:1
+#, c-format
+msgid "Search installed fonts"
+msgstr "Paigaldatud fontide otsimine"
 
-#: ../../standalone/drakgw_.c:150
+#: ../../standalone/drakgw:1
+#, c-format
 msgid ""
-"The setup of Internet connection sharing has already been done.\n"
-"It's currently disabled.\n"
+"Welcome to the Internet Connection Sharing utility!\n"
 "\n"
-"What would you like to do?"
+"%s\n"
+"\n"
+"Click on Configure to launch the setup wizard."
 msgstr ""
-"Internetiühenduse jagamine on juba seadistatud,\n"
-"aga hetkel on see keelatud.\n"
+"Internetiühenduse jagamise nõustaja\n"
 "\n"
-"Mida soovite ette võtta?"
+"%s\n"
+"\n"
+"Klõpsake nõustaja käivitamiseks nupul 'Seadista'."
 
-#: ../../standalone/drakgw_.c:154
-msgid "enable"
-msgstr "lubada"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Internet Connection Sharing configuration"
+msgstr "Internetiühenduse jagamise seadistamine"
 
-#: ../../standalone/drakgw_.c:161
-msgid "Enabling servers..."
-msgstr "Serverite käivitamine..."
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "No Internet Connection Sharing has ever been configured."
+msgstr "Internetiühenduse jagamist ei ole kunagi seadistatud."
 
-#: ../../standalone/drakgw_.c:166
-msgid "Internet connection sharing is now enabled."
-msgstr "Internetiühenduse jagamine nüüd töötab."
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "The setup has already been done, and it's currently enabled."
+msgstr ""
+"Internetiühenduse jagamine on juba seadistatud ja see on praegu aktiivne."
+
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "The setup has already been done, but it's currently disabled."
+msgstr "Internetiühenduse jagamine on juba seadistatud, aga hetkel keelatud."
 
-#: ../../standalone/drakgw_.c:183
+#: ../../standalone/drakgw:1
+#, c-format
 msgid ""
-"You are about to configure your computer to share its Internet connection.\n"
-"With that feature, other computers on your local network will be able to use "
-"this computer's Internet connection.\n"
-"\n"
-"Make sure you have configured your Network/Internet access using drakconnect "
-"before going any further.\n"
-"\n"
-"Note: you need a dedicated Network Adapter to set up a Local Area Network "
-"(LAN)."
+"Everything has been configured.\n"
+"You may now share Internet connection with other computers on your Local "
+"Area Network, using automatic network configuration (DHCP)."
 msgstr ""
-"Nüüd on Teil võimalik seadistada oma arvutit internetiühendust jagama.\n"
-"Selle võimaluse abil saavad teised Teie kohtvõrgu arvutid kasutada selle "
-"masina internetiühendust.\n"
-"\n"
-"Kontrollige enne jätkamist, et olete seadistanud oma võrgu/internetiühenduse "
-"drakconnecti abil.\n"
-"\n"
-"Märkus: kohtvõrgu (LAN) jaoks on vajalik eraldi võrgukaardi olemasolu."
+"Kõik on seadistatud.\n"
+"Nüüd saate Internetiühendust jagada teistele kohtvõrgu arvutitele, kasutades "
+"neil automaatset konfigureerimist (DHCP)."
 
-#: ../../standalone/drakgw_.c:211
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
 #, c-format
-msgid "Interface %s (using module %s)"
-msgstr "Liides %s (kasutab moodulit %s)"
+msgid "Problems installing package %s"
+msgstr "Probleemid paketi %s paigaldamisel"
 
-#: ../../standalone/drakgw_.c:212
+#: ../../standalone/drakgw:1
 #, c-format
-msgid "Interface %s"
-msgstr "Liides %s"
+msgid "Configuring scripts, installing software, starting servers..."
+msgstr "Häälestan skriptid, paigaldan tarkvara, käivitan serverid..."
 
-#: ../../standalone/drakgw_.c:220
-msgid "No network adapter on your system!"
-msgstr "Teie süsteemis ei ole võrgukaarti!"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Configuring..."
+msgstr "Seadistamine..."
 
-#: ../../standalone/drakgw_.c:221
-msgid ""
-"No ethernet network adapter has been detected on your system. Please run the "
-"hardware configuration tool."
-msgstr ""
-"Ühtki võrgukaarti ei suudetud tuvastada. Palun kasutage selleks riistvara "
-"seadistajat."
+#: ../../standalone/drakgw:1
+#, 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_.c:227
-msgid "Network interface"
-msgstr "Võrguliides"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "The Local Network did not finish with `.0', bailing out."
+msgstr "Kohtvõrgu lõpus ei seisa '0', visatakse minema."
 
-#: ../../standalone/drakgw_.c:228
+#: ../../standalone/drakgw:1
 #, c-format
-msgid ""
-"There is only one configured network adapter on your system:\n"
-"\n"
-"%s\n"
-"\n"
-"I am about to setup your Local Area Network with that adapter."
-msgstr ""
-"Teil on vaid üks seadistatud võrguliides:\n"
-"\n"
-"%s\n"
-"\n"
-"Kohtvõrgu sätted seotakse selle liidesega."
+msgid "Re-configure interface and DHCP server"
+msgstr "Liidese ja DHCP serveri ümberseadistamine"
 
-#: ../../standalone/drakgw_.c:235
-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:1
+#, c-format
+msgid "The maximum lease (in seconds)"
+msgstr "Maksimaalne rendiaeg (sekundites)"
 
-#: ../../standalone/drakgw_.c:261
-msgid "Network interface already configured"
-msgstr "Võrguliides on juba seadistatud"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "The default lease (in seconds)"
+msgstr "Rendiaeg vaikimisi (sekundites)"
 
-#: ../../standalone/drakgw_.c:262
+#: ../../standalone/drakgw:1
 #, c-format
-msgid ""
-"Warning, the network adapter (%s) is already configured.\n"
-"\n"
-"Do you want an automatic re-configuration?\n"
-"\n"
-"You can do it manually but you need to know what you're doing."
-msgstr ""
-"Hoiatus: võrgukaart (%s) on juba seadistatud.\n"
-"\n"
-"Kas soovite ette võtta automaatse ümberseadistamine?\n"
-"\n"
-"Seda saab teha ka käsitsi, aga siis peate kindlasti teadma, mida teete."
+msgid "The DHCP end range"
+msgstr "DHCP vahemiku lõpp"
 
-#: ../../standalone/drakgw_.c:267
-msgid "Automatic reconfiguration"
-msgstr "Automaatne ümberseadistamine"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "The DHCP start range"
+msgstr "DHCP vahemiku algus"
 
-#: ../../standalone/drakgw_.c:267
-msgid "No (experts only)"
-msgstr "Ei (ainult eksperdile)"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "The internal domain name"
+msgstr "Sisemine domeeninimi"
 
-#: ../../standalone/drakgw_.c:268
-msgid "Show current interface configuration"
-msgstr "Liidese praeguste sätete näitamine"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "The DNS Server IP"
+msgstr "Nimeserveri IP"
 
-#: ../../standalone/drakgw_.c:269
-msgid "Current interface configuration"
-msgstr "Liidese praegused sätted"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "(This) DHCP Server IP"
+msgstr "(Selle) DHCP serveri IP"
 
-#: ../../standalone/drakgw_.c:270
+#: ../../standalone/drakgw:1
 #, c-format
 msgid ""
-"Current configuration of `%s':\n"
+"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.\n"
 "\n"
-"Network: %s\n"
-"IP address: %s\n"
-"IP attribution: %s\n"
-"Driver: %s"
 msgstr ""
-"'%s' praegused sätted:\n"
+"DHCP serveri sätted.\n"
 "\n"
-"Võrk: %s\n"
-"IP aadress: %s\n"
-"IP omistamine: %s\n"
-"Draiver: %s"
+"Siin saab valida erinevaid võimalusi DHCP serveri seadistustele.\n"
+"Kui te ei tea mõne valiku tähendust, jätke see puutumata.\n"
+"\n"
+
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Local Network adress"
+msgstr "Kohtvõrgu aadress"
 
-#: ../../standalone/drakgw_.c:283
+#: ../../standalone/drakgw:1
+#, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
 "server; in that case please verify I correctly read the Network that you use "
@@ -13636,8 +17335,8 @@ msgid ""
 "The default DNS entry is the Caching Nameserver configured on the firewall. "
 "You can replace that with your ISP DNS IP, for example.\n"
 "\t\t      \n"
-"Else, I can reconfigure your interface and (re)configure a DHCP server for "
-"you.\n"
+"Otherwise, I can reconfigure your interface and (re)configure a DHCP server "
+"for you.\n"
 "\n"
 msgstr ""
 "Teie praegused sätted on võimalik säilitada ja eeldada, et DHCP server on "
@@ -13652,279 +17351,620 @@ msgstr ""
 "serveri.\n"
 "\n"
 
-#: ../../standalone/drakgw_.c:290
-msgid "Local Network adress"
-msgstr "Kohtvõrgu aadress"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid ""
+"Current configuration of `%s':\n"
+"\n"
+"Network: %s\n"
+"IP address: %s\n"
+"IP attribution: %s\n"
+"Driver: %s"
+msgstr ""
+"'%s' praegused sätted:\n"
+"\n"
+"Võrk: %s\n"
+"IP aadress: %s\n"
+"IP omistamine: %s\n"
+"Juhtprogramm: %s"
+
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Current interface configuration"
+msgstr "Liidese praegused sätted"
+
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Show current interface configuration"
+msgstr "Liidese praeguste sätete näitamine"
 
-#: ../../standalone/drakgw_.c:294
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "No (experts only)"
+msgstr "Ei (ainult eksperdile)"
+
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Automatic reconfiguration"
+msgstr "Automaatne ümberseadistamine"
+
+#: ../../standalone/drakgw:1
+#, c-format
 msgid ""
-"DHCP Server Configuration.\n"
+"Warning, the network adapter (%s) is already configured.\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.\n"
+"Do you want an automatic re-configuration?\n"
 "\n"
+"You can do it manually but you need to know what you're doing."
 msgstr ""
-"DHCP serveri sätted.\n"
+"Hoiatus: võrgukaart (%s) on juba seadistatud.\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.\n"
+"Kas soovite ette võtta automaatse ümberseadistamine?\n"
 "\n"
+"Seda saab teha ka käsitsi, aga siis peate kindlasti teadma, mida teete."
 
-#: ../../standalone/drakgw_.c:300
-msgid "(This) DHCP Server IP"
-msgstr "(Selle) DHCP serveri IP"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Network interface already configured"
+msgstr "Võrguliides on juba seadistatud"
 
-#: ../../standalone/drakgw_.c:301
-msgid "The DNS Server IP"
-msgstr "Nimeserveri IP"
+#: ../../standalone/drakgw:1
+#, 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_.c:302
-msgid "The internal domain name"
-msgstr "Sisemine domeeninimi"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid ""
+"There is only one configured network adapter on your system:\n"
+"\n"
+"%s\n"
+"\n"
+"I am about to setup your Local Area Network with that adapter."
+msgstr ""
+"Teil on vaid üks seadistatud võrguliides:\n"
+"\n"
+"%s\n"
+"\n"
+"Kohtvõrgu sätted seotakse selle liidesega."
 
-#: ../../standalone/drakgw_.c:303
-msgid "The DHCP start range"
-msgstr "DHCP vahemiku algus"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Network interface"
+msgstr "Võrguliides"
 
-#: ../../standalone/drakgw_.c:304
-msgid "The DHCP end range"
-msgstr "DHCP vahemiku lõpp"
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
+msgstr ""
+"Ühtki võrgukaarti ei suudetud tuvastada. Palun kasutage selleks riistvara "
+"seadistajat."
 
-#: ../../standalone/drakgw_.c:305
-msgid "The default lease (in seconds)"
-msgstr "Vaikerendiaeg (sekundites)"
+#: ../../standalone/drakgw:1 ../../standalone/drakpxe:1
+#, c-format
+msgid "No network adapter on your system!"
+msgstr "Teie süsteemis ei ole võrgukaarti!"
 
-#: ../../standalone/drakgw_.c:306
-msgid "The maximum lease (in seconds)"
-msgstr "Maksimaalne rendiaeg (sekundites)"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Interface %s"
+msgstr "Liides %s"
 
-#: ../../standalone/drakgw_.c:307
-msgid "Re-configure interface and DHCP server"
-msgstr "Liidese ja DHCP serveri ümberseadistamine"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Interface %s (using module %s)"
+msgstr "Liides %s (kasutab moodulit %s)"
 
-#: ../../standalone/drakgw_.c:314
-msgid "The Local Network did not finish with `.0', bailing out."
-msgstr "Kohtvõrgu lõpus ei seisa '0', visatakse minema."
+#: ../../standalone/drakgw:1
+#, c-format
+msgid ""
+"You are about to configure your computer to share its Internet connection.\n"
+"With that feature, other computers on your local network will be able to use "
+"this computer's Internet connection.\n"
+"\n"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
+"\n"
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN)."
+msgstr ""
+"Nüüd on Teil võimalik seadistada oma arvutit Internetiühendust jagama.\n"
+"Selle võimaluse abil saavad teised Teie kohtvõrgu arvutid kasutada selle "
+"masina Internetiühendust.\n"
+"\n"
+"Kontrollige enne jätkamist, et olete seadistanud oma võrgu/Internetiühenduse "
+"drakconnecti abil.\n"
+"\n"
+"Märkus: kohtvõrgu (LAN) jaoks on vajalik eraldi võrgukaardi olemasolu."
 
-#: ../../standalone/drakgw_.c:325
+#: ../../standalone/drakgw:1
 #, c-format
-msgid "Potential LAN address conflict found in current config of %s!\n"
-msgstr "Võimalik kohtvõrgu aadressi konflikt %s konfiguratsioonis!\n"
+msgid "Internet Connection Sharing"
+msgstr "Internetiühenduse jagamine"
 
-#: ../../standalone/drakgw_.c:335
-msgid "Configuring..."
-msgstr "Seadistamine..."
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Internet Connection Sharing is now enabled."
+msgstr "Internetiühenduse jagamine nüüd töötab."
 
-#: ../../standalone/drakgw_.c:336
-msgid "Configuring scripts, installing software, starting servers..."
-msgstr "Häälestan skriptid, paigaldan tarkvara, käivitan serverid..."
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Enabling servers..."
+msgstr "Serverite käivitamine..."
 
-#: ../../standalone/drakgw_.c:372
+#: ../../standalone/drakgw:1
 #, c-format
-msgid "Problems installing package %s"
-msgstr "Probleemid paketi %s paigaldamisel"
+msgid "dismiss"
+msgstr "tühistada"
+
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "reconfigure"
+msgstr "uuesti seadistada"
+
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "enable"
+msgstr "lubada"
 
-#: ../../standalone/drakgw_.c:505
+#: ../../standalone/drakgw:1
+#, c-format
 msgid ""
-"Everything has been configured.\n"
-"You may now share Internet connection with other computers on your Local "
-"Area Network, using automatic network configuration (DHCP)."
+"The setup of Internet connection sharing has already been done.\n"
+"It's currently disabled.\n"
+"\n"
+"What would you like to do?"
 msgstr ""
-"Kõik on seadistatud.\n"
-"Nüüd saate internetiühendust jagada teistele kohtvõrgu arvutitele, kasutades "
-"neil automaatset konfigureerimist (DHCP)."
+"Internetiühenduse jagamine on juba seadistatud,\n"
+"aga hetkel on see keelatud.\n"
+"\n"
+"Mida soovite ette võtta?"
 
-#: ../../standalone/drakgw_.c:523
-msgid "The setup has already been done, but it's currently disabled."
-msgstr "Internetiühenduse jagamine on juba seadistatud, aga hetkel keelatud."
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Internetiühendust hetkel ei jagata"
 
-#: ../../standalone/drakgw_.c:524
-msgid "The setup has already been done, and it's currently enabled."
-msgstr ""
-"Internetiühenduse jagamine on juba seadistatud ja see on praegu aktiivne."
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Internet Connection Sharing is now disabled."
+msgstr "Internetiühendust nüüd enam ei jagata."
 
-#: ../../standalone/drakgw_.c:525
-msgid "No Internet Connection Sharing has ever been configured."
-msgstr "Internetiühenduse jagamist ei ole kunagi seadistatud."
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Disabling servers..."
+msgstr "Serverite peatamine..."
 
-#: ../../standalone/drakgw_.c:531
-msgid "Internet connection sharing configuration"
-msgstr "Internetiühenduse jagamise seadistamine"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "disable"
+msgstr "keelata"
 
-#: ../../standalone/drakgw_.c:539
+#: ../../standalone/drakgw:1
 #, c-format
 msgid ""
-"Welcome to the Internet Connection Sharing utility!\n"
-"\n"
-"%s\n"
+"The setup of Internet Connection Sharing has already been done.\n"
+"It's currently enabled.\n"
 "\n"
-"Click on Configure to launch the setup wizard."
+"What would you like to do?"
 msgstr ""
-"Internetiühenduse jagamise nõustaja\n"
-"\n"
-"%s\n"
+"Internetiühenduse jagamine on juba seadistatud\n"
+"ja see on ka praegu aktiivne.\n"
 "\n"
-"Klõpsake nõustaja käivitamiseks nupul 'Seadista'."
+"Mida soovite ette võtta?"
 
-#: ../../standalone/drakperm_.c:36
-msgid "group"
-msgstr "grupp"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Internetiühenduse jagamine töötab"
 
-#: ../../standalone/drakperm_.c:36
-msgid "path"
-msgstr "asukoht"
+#: ../../standalone/drakgw:1
+#, c-format
+msgid "Sorry, we support only 2.4 kernels."
+msgstr "Vabandust, me toetame ainult 2.4 kerneleid."
 
-#: ../../standalone/drakperm_.c:36
-msgid "permissions"
-msgstr "loabitid"
+#: ../../standalone/drakhelp:1
+#, c-format
+msgid ""
+"No browser is installed on your system, Please install one if you want to "
+"browse the help system"
+msgstr ""
+"Teie arvutis ei ole veel brauserit. Palun paigaldage see, kui soovite "
+"abiinfot vaadata"
 
-#: ../../standalone/drakperm_.c:36
-msgid "user"
-msgstr "kasutaja"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "group :"
+msgstr "grupp :"
 
-#: ../../standalone/drakperm_.c:43
-msgid "Up"
-msgstr "Üles"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "user :"
+msgstr "kasutaja :"
 
-#: ../../standalone/drakperm_.c:44
-msgid "delete"
-msgstr "kustuta"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Path selection"
+msgstr "Asukoha valik"
 
-#: ../../standalone/drakperm_.c:45
-msgid "edit"
-msgstr "muuda"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "when checked, owner and group won't be changed"
+msgstr "märkimise korral ei muudeta omanikku ja gruppi"
 
-#: ../../standalone/drakperm_.c:46
-msgid "Down"
-msgstr "Alla"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Use group id for execution"
+msgstr "Käivitamiseks kasutatakse grupi id-d"
 
-#: ../../standalone/drakperm_.c:47
-msgid "add a rule"
-msgstr "lisa reegel"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Use owner id for execution"
+msgstr "Käivitamiseks kasutatakse omaniku id-d"
 
-#: ../../standalone/drakperm_.c:48
+#: ../../standalone/drakperm:1
+#, c-format
+msgid ""
+"Used for directory:\n"
+" only owner of directory or file in this directory can delete it"
+msgstr ""
+"Kasutusel kataloogis:\n"
+" ainult faili või kataloogi omanik saab seda kustutada"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Set-GID"
+msgstr "Set-GID"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Set-UID"
+msgstr "Set-UID"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "sticky-bit"
+msgstr "kleepumisbitt"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Property"
+msgstr "Omadus"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Path"
+msgstr "Asukoht"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Permissions"
+msgstr "Loabitid"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Current user"
+msgstr "Praegune kasutaja"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "browse"
+msgstr "lehitse"
+
+#: ../../standalone/drakperm:1
+#, c-format
 msgid "select perm file to see/edit"
 msgstr "loafaili valik vaatamiseks/muutmiseks"
 
-#: ../../standalone/drakperm_.c:51
+#: ../../standalone/drakperm:1
+#, c-format
 msgid ""
 "Drakperm is used to see files to use in order to fix permissions, owners, "
 "and groups via msec.\n"
 "You can also edit your own rules which will owerwrite the default rules."
 msgstr ""
-"Drakpermi saab kasutada failide vaatamiseks, et mseci abil parandada "
-"loabitte, omanikke ja gruppe.\n"
+"Drakperm on kasutatav failide vaatamiseks, et mseci abil parandada loabitte, "
+"omanikke ja gruppe.\n"
 "Võite ka muuta oma reegleid, mis tühistavad vaikereeglid."
 
-#: ../../standalone/drakperm_.c:56
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Edit current rule"
+msgstr "Muuda praegust reeglit"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "edit"
+msgstr "muuda"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Delete selected rule"
+msgstr "Kustuta valitud reegel"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "delete"
+msgstr "kustuta"
+
+#: ../../standalone/drakperm:1
+#, c-format
 msgid "Add a new rule at the end"
 msgstr "Uue reegli lisamine lõppu"
 
-#: ../../standalone/drakperm_.c:57
-msgid "Edit curent rule"
-msgstr "Muuda praegust reeglit"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "add a rule"
+msgstr "lisa reegel"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Move selected rule down one level"
+msgstr "Valitud reegel üks tase allapoole"
+
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Down"
+msgstr "Alla"
 
-#: ../../standalone/drakperm_.c:58
-msgid "Up selected rule one level"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Move selected rule up one level"
 msgstr "Valitud reegel üks tase ülespoole"
 
-#: ../../standalone/drakperm_.c:59
-msgid "Down selected rule one level"
-msgstr "Valitud reegel üks tase allapoole"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "Up"
+msgstr "Üles"
 
-#: ../../standalone/drakperm_.c:60
-msgid "Delete selected rule"
-msgstr "Kustuta valitud reegel"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "permissions"
+msgstr "loabitid"
 
-#: ../../standalone/drakperm_.c:224
-msgid "browse"
-msgstr "lehitse"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "group"
+msgstr "grupp"
 
-#: ../../standalone/drakperm_.c:231
-msgid "Current user"
-msgstr "Praegune kasutaja"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "user"
+msgstr "kasutaja"
 
-#: ../../standalone/drakperm_.c:236
-msgid "Permissions"
-msgstr "Loabitid"
+#: ../../standalone/drakperm:1
+#, c-format
+msgid "path"
+msgstr "asukoht"
 
-#: ../../standalone/drakperm_.c:237
-msgid "Path"
-msgstr "Asukoht"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Location of auto_install.cfg file"
+msgstr "Faili auto_install.cfg asukoht"
 
-#: ../../standalone/drakperm_.c:238
-msgid "Property"
-msgstr "Omadus"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"Please indicate where the auto_install.cfg file is located.\n"
+"\n"
+"Leave it blank if you do not want to set up automatic installation mode.\n"
+"\n"
+msgstr ""
+"Andke palun faili auto_install.cfg asukoht.\n"
+"\n"
+"Jätke tühjaks, kui Te ei soovi määrata automaatpaigalduse resiimi.\n"
+"\n"
 
-#: ../../standalone/drakperm_.c:240
-msgid "sticky-bit"
-msgstr "kleepumisbitt"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"No CD or DVD image found, please copy the installation program and rpm files."
+msgstr ""
+"CD- ega DVD-laadefaili ei leitud, palun kopeerige paigaldusprogramm ja rpm-"
+"failid."
 
-#: ../../standalone/drakperm_.c:241
-msgid "Set-UID"
-msgstr "Set-UID"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "No image found"
+msgstr "Laadefaili ei leitud!"
 
-#: ../../standalone/drakperm_.c:242
-msgid "Set-GID"
-msgstr "Set-GID"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Installation image directory"
+msgstr "Paigalduslaadefaili kataloog"
 
-#: ../../standalone/drakperm_.c:296
+#: ../../standalone/drakpxe:1
+#, c-format
 msgid ""
-"Used for directory:\n"
-" only owner of directory or file in this directory can delete it"
+"Please indicate where the installation image will be available.\n"
+"\n"
+"If you do not have an existing directory, please copy the CD or DVD "
+"contents.\n"
+"\n"
 msgstr ""
-"Kasutusel kataloogis:\n"
-" ainult faili või kataloogi omanik saab seda kustutada"
+"Andke palun paigalduslaadefaili asukoht.\n"
+"\n"
+"Kui Teil säherdust kataloogi ei ole, kopeerige palun CD või DVD sisu.\n"
+"\n"
 
-#: ../../standalone/drakperm_.c:297
-msgid "Use owner id for execution"
-msgstr "Käivitamiseks kasutatakse omaniku id-d"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "The DHCP end ip"
+msgstr "DHCP vahemiku lõpu ip"
 
-#: ../../standalone/drakperm_.c:298
-msgid "Use group id for execution"
-msgstr "Käivitamiseks kasutatakse grupi id-d"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "The DHCP start ip"
+msgstr "DHCP vahemiku alguse ip"
 
-#: ../../standalone/drakperm_.c:299
-msgid "when checked, owner and group won't be changed"
-msgstr "märkimise korral ei muudeta omanikku ja gruppi"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"The DHCP server will allow other computer to boot using PXE in the given "
+"range of address.\n"
+"\n"
+"The network address is %s using a netmask of %s.\n"
+"\n"
+msgstr ""
+"DHCP server võimaldab teistel arvutitel sooritada alglaadimise PXE "
+"vahendusel antud aadressivahemikus.\n"
+"\n"
+"Võrguaadress on %s, võrgumask %s.\n"
+"\n"
 
-#: ../../standalone/drakperm_.c:304
-msgid "Path selection"
-msgstr "Asukoha valik"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Interface %s (on network %s)"
+msgstr "Liides %s (võrgus %s)"
 
-#: ../../standalone/drakperm_.c:350
-msgid "user :"
-msgstr "kasutaja :"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Please choose which network interface will be used for the dhcp server."
+msgstr "Palun valige, millist võrguliidest soovite dhcp serveri jaoks kasutada"
 
-#: ../../standalone/drakperm_.c:352
-msgid "group :"
-msgstr "grupp :"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid ""
+"You are about to configure your computer to install a PXE server as a DHCP "
+"server\n"
+"and a TFTP server to build an installation server.\n"
+"With that feature, other computers on your local network will be installable "
+"using from this computer.\n"
+"\n"
+"Make sure you have configured your Network/Internet access using drakconnect "
+"before going any further.\n"
+"\n"
+"Note: you need a dedicated Network Adapter to set up a Local Area Network "
+"(LAN)."
+msgstr ""
+"Nüüd on Teil võimalik seadistada oma arvuti paigaldamaks PXE serverit DHCP "
+"serveri \n"
+"ja TFTP serveri rollis, et luua paigaldusserver.\n"
+"Selle võimaluse abil saavad teised Teie kohtvõrgu arvutid kasutada seda "
+"masinat endale süsteemi paigaldamiseks.\n"
+"\n"
+"Kontrollige enne jätkamist, et olete seadistanud oma võrgu/Internetiühenduse "
+"drakconnecti abil.\n"
+"\n"
+"Märkus: kohtvõrgu (LAN) jaoks on vajalik eraldi võrgukaardi olemasolu."
 
-#: ../../standalone/draksound_.c:46
-msgid "No Sound Card detected!"
-msgstr "Helikaarti ei leitud!"
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "Installation Server Configuration"
+msgstr "Paigaldusserveri seadistamine"
+
+#: ../../standalone/drakpxe:1
+#, c-format
+msgid "PXE Server Configuration"
+msgstr "PXE serveri seadistamine"
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid "Please wait, setting security options..."
+msgstr "Palun oodake, sätin turvaparameetrid..."
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid "Please wait, setting security level..."
+msgstr "Palun oodake, sätin turvataseme..."
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid "Periodic Checks"
+msgstr "Perioodiline kontroll"
 
-#: ../../standalone/draksound_.c:47
+#: ../../standalone/draksec:1
+#, c-format
+msgid "System Options"
+msgstr "Süsteemi parameetrid"
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid "Network Options"
+msgstr "Võrguparameetrid"
+
+#: ../../standalone/draksec:1
+#, c-format
 msgid ""
-"No Sound Card has been detected on your machine. Please verify that a Linux-"
-"supported Sound Card is correctly plugged in.\n"
+"The following options can be set to customize your\n"
+"system security. If you need an explanation, look at the help tooltip.\n"
+msgstr ""
+"Süsteemi turvalisuse kohandamiseks saab seadistada\n"
+"järgmisi parameetreid. Seletuste saamiseks vaadake abivihjeid.\n"
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid "Security Administrator:"
+msgstr "Turvaadministraator:"
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid "Security Alerts:"
+msgstr "Turvahoiatused:"
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid "(default value: %s)"
+msgstr "(vaikeväärtus: %s)"
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid "Security Level:"
+msgstr "Turvatase:"
+
+#: ../../standalone/draksec:1
+#, c-format
+msgid ""
+"Standard: This is the standard security recommended for a computer that will "
+"be used to connect\n"
+"               to the Internet as a client.\n"
 "\n"
+"High:       There are already some restrictions, and more automatic checks "
+"are run every night.\n"
 "\n"
-"You can visit our hardware database at:\n"
+"Higher:    The security is now high enough to use the system as a server "
+"which can accept\n"
+"              connections from many clients. If your machine is only a "
+"client on the Internet, you\n"
+"\t      should choose a lower level.\n"
 "\n"
+"Paranoid:  This is similar to the previous level, but the system is entirely "
+"closed and security\n"
+"                features are at their maximum\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"Security Administrator:\n"
+"               If the 'Security Alerts' option is set, security alerts will "
+"be sent to this user (username or\n"
+"\t       email)"
 msgstr ""
-"Teie masinas ei leitud helikaarti. Kontrollige palun, et Linuxi toega "
-"helikaart on korrektselt ühendatud.\n"
+"Standardne: see on tavaline turvatase, mida võib soovitada arvutile, mis on "
+"Internetiga\n"
+"               ühendatud kui klient.\n"
 "\n"
+"Kõrge:       On juba mõningaid piiranguid, igal ööl sooritatakse märksa "
+"rohkem automaatseid kontrollimisi.\n"
 "\n"
-"Meie riistvara andmebaasi saab näha aadressil:\n"
+"Väga kõrge:  Turvalisus on piisav, et süsteemi saaks kasutada serverina, mis "
+"võib vastu võtta\n"
+"               ühendusi paljudelt klientidelt. Kui Teie masin on Internetis "
+"vaid kui klient, oleks mõttekam\n"
+"\t      valida madalam tase.\n"
 "\n"
+"Paranoiline: See sarnaneb eelmisele tasemele, ainult et süsteem on täiesti "
+"suletud ja turvasätted\n"
+"               maksimumi peale keeratud.\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"Turvaadministraator:\n"
+"               Kui valitud on võimalus 'Turvahoiatused', saadetakse "
+"turvahoiatused sellele kasutajale (kasutajanimele\n"
+"\t       või e-posti aadressile)"
 
-#: ../../standalone/draksound_.c:54
+#: ../../standalone/draksound:1
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -13938,230 +17978,256 @@ msgstr ""
 "Märkus: kui Teil on ISA PnP helikaart, tuleb kasutada rakendust sndconfig. "
 "Selleks kirjutage käsureale \"sndconfig\"."
 
-#: ../../standalone/draksplash_.c:21
+#: ../../standalone/draksound:1
+#, c-format
 msgid ""
-"package 'ImageMagick' is required for correct working.\n"
-"Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
+"No Sound Card has been detected on your machine. Please verify that a Linux-"
+"supported Sound Card is correctly plugged in.\n"
+"\n"
+"\n"
+"You can visit our hardware database at:\n"
+"\n"
+"\n"
+"http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"korrektseks töötamiseks on vajalik pakett 'ImageMagick'.\n"
-"Klõpsake \"Olgu\" paketi 'ImageMagick' paigaldamiseks\n"
-"või \"Katkesta\" väljumiseks."
+"Teie masinas ei leitud helikaarti. Kontrollige palun, et Linuxi toega "
+"helikaart on korrektselt ühendatud.\n"
+"\n"
+"\n"
+"Meie riistvara andmebaasi saab näha aadressil:\n"
+"\n"
+"\n"
+"http://www.linux-mandrake.com/en/hardware.php3"
 
-#: ../../standalone/draksplash_.c:67
-msgid "first step creation"
-msgstr "esimene samm loomine"
+#: ../../standalone/draksound:1
+#, c-format
+msgid "No Sound Card detected!"
+msgstr "Helikaarti ei leitud!"
 
-#: ../../standalone/draksplash_.c:70
-msgid "final resolution"
-msgstr "lõplik kuvatihedus"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "%s BootSplash (%s) preview"
+msgstr "%s käivituslogo (%s) eelvaatlus"
 
-#: ../../standalone/draksplash_.c:71 ../../standalone/draksplash_.c:163
-msgid "choose image file"
-msgstr "valige pildifail"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "Generating preview ..."
+msgstr "Eelvaatluse tekitamine ..."
 
-#: ../../standalone/draksplash_.c:72
-msgid "Theme name"
-msgstr "Teema nimi"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "You must choose an image file first!"
+msgstr "Esmalt tuleb valida pildifail!"
 
-#: ../../standalone/draksplash_.c:77
-msgid "Browse"
-msgstr "Lehitse"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "ProgressBar color selection"
+msgstr "Edenemisriba värvi valimine"
 
-#: ../../standalone/draksplash_.c:87 ../../standalone/draksplash_.c:153
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "This theme does not yet have a bootsplash in %s !"
+msgstr "Sellel teemal ei ole veel ühtegi käivituslogo %s !"
+
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "saving Bootsplash theme..."
+msgstr "Käivituslogo teema salvestamine..."
+
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "choose image file"
+msgstr "valige pildifail"
+
+#: ../../standalone/draksplash:1
+#, c-format
 msgid "Configure bootsplash picture"
 msgstr "Käivituslogo pildi seadistamine"
 
-#: ../../standalone/draksplash_.c:90
-msgid ""
-"x coordinate of text box\n"
-"in number of character"
-msgstr ""
-"tekstikasti x-koordinaat\n"
-"arvulises väljenduses"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "Make kernel message quiet by default"
+msgstr "Vaikimisi kerneli sõnumi keelamine"
 
-#: ../../standalone/draksplash_.c:91
-msgid ""
-"y coordinate of text box\n"
-"in number of character"
-msgstr ""
-"tekstikasti y-koordinaat\n"
-"arvulises väljenduses"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "Display logo on Console"
+msgstr "Logo näitamine konsoolil"
 
-#: ../../standalone/draksplash_.c:92
-msgid "text width"
-msgstr "teksti laius"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "Choose color"
+msgstr "Värvi valimine"
 
-#: ../../standalone/draksplash_.c:93
-msgid "text box height"
-msgstr "tekstikasti kõrgus"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "Save theme"
+msgstr "Teema salvestamine"
+
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "Preview"
+msgstr "Eelvaatlus"
+
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "the color of the progress bar"
+msgstr "edenemisriba värv"
 
-#: ../../standalone/draksplash_.c:94
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "the height of the progress bar"
+msgstr "edenemisriba kõrgus"
+
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "the width of the progress bar"
+msgstr "edenemisriba laius"
+
+#: ../../standalone/draksplash:1
+#, c-format
 msgid ""
-"the progress bar x coordinate\n"
+"the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr ""
 "edenemisriba ülemise vasaku\n"
-"nurga x-koordinaat"
+"nurga y-koordinaat"
 
-#: ../../standalone/draksplash_.c:95
+#: ../../standalone/draksplash:1
+#, c-format
 msgid ""
-"the progress bar y coordinate\n"
+"the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr ""
 "edenemisriba ülemise vasaku\n"
-"nurga y-koordinaat"
-
-#: ../../standalone/draksplash_.c:96
-msgid "the width of the progress bar"
-msgstr "edenemisriba laius"
-
-#: ../../standalone/draksplash_.c:97
-msgid "the heigth of the progress bar"
-msgstr "edenemisriba kõrgus"
-
-#: ../../standalone/draksplash_.c:98
-msgid "the color of the progress bar"
-msgstr "edenemisriba värv"
-
-#: ../../standalone/draksplash_.c:113
-msgid "Preview"
-msgstr "Eelvaade"
-
-#: ../../standalone/draksplash_.c:115
-msgid "Save theme"
-msgstr "Teema salvestamine"
+"nurga x-koordinaat"
 
-#: ../../standalone/draksplash_.c:116
-msgid "Choose color"
-msgstr "Värvi valimine"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "text box height"
+msgstr "tekstikasti kõrgus"
 
-#: ../../standalone/draksplash_.c:119
-msgid "Display logo on Console"
-msgstr "Logo näitamine konsoolil"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "text width"
+msgstr "teksti laius"
 
-#: ../../standalone/draksplash_.c:120
-msgid "Make kernel message quiet by default"
-msgstr "Vaikimisi kerneli sõnumi keelamine"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid ""
+"y coordinate of text box\n"
+"in number of characters"
+msgstr ""
+"tekstikasti y-koordinaat\n"
+"arvulises väljenduses"
 
-#: ../../standalone/draksplash_.c:156 ../../standalone/draksplash_.c:321
+#: ../../standalone/draksplash:1
 #, c-format
-msgid "This theme haven't yet any bootsplash in %s !"
-msgstr "Sellel teemal ei ole veel ühtegi käivituslogo %s !"
+msgid ""
+"x coordinate of text box\n"
+"in number of characters"
+msgstr ""
+"tekstikasti x-koordinaat\n"
+"arvulises väljenduses"
 
-#: ../../standalone/draksplash_.c:205
-msgid "saving Bootsplash theme..."
-msgstr "Käivituslogo teema salvestamine..."
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "Browse"
+msgstr "Lehitse"
 
-#: ../../standalone/draksplash_.c:428
-msgid "ProgressBar color selection"
-msgstr "Edenemisriba värvi valimine"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "Theme name"
+msgstr "Teema nimi"
 
-#: ../../standalone/draksplash_.c:449
-msgid "You must choose an image file first!"
-msgstr "Esmalt tuleb valida pildifail!"
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "final resolution"
+msgstr "lõplik kuvatihedus"
 
-#: ../../standalone/draksplash_.c:458
-msgid "Generating preview ..."
-msgstr "Eelvaate tekitamine ..."
+#: ../../standalone/draksplash:1
+#, c-format
+msgid "first step creation"
+msgstr "esimene samm loomine"
 
-#. -PO  First %s is theme name, second %s (in parenthesis) is resolution
-#: ../../standalone/draksplash_.c:506
+#: ../../standalone/draksplash:1
 #, c-format
-msgid "%s BootSplash (%s) preview"
-msgstr "%s käivituslogo (%s) eelvaade"
+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"
+"või \"Katkesta\" väljumiseks."
 
-#: ../../standalone/drakxtv_.c:46
+#: ../../standalone/drakxtv:1
+#, c-format
 msgid ""
-"XawTV isn't installed!\n"
+"No TV Card has been detected on your machine. Please verify that a Linux-"
+"supported Video/TV Card is correctly plugged in.\n"
 "\n"
 "\n"
-"If you do have a TV card but DrakX has neither detected it (no bttv nor "
-"saa7134\n"
-"module in \"/etc/modules\") nor installed xawtv, please send the\n"
-"results of \"lspcidrake -v -f\" to \"install\\@mandrakesoft.com\"\n"
-"with subject \"undetected TV card\".\n"
+"You can visit our hardware database at:\n"
 "\n"
 "\n"
-"You can install it by typing \"urpmi xawtv\" as root, in a console."
+"http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
-"XawTV ei ole paigaldatud!\n"
+"Teie masinal ei leitud TV-kaarti. Kontrollige palun, et Linuxi toega video/"
+"TV-kaart on korrektselt ühendatud.\n"
 "\n"
 "\n"
-"Kui Teil on TV-kaart, kuid DrakX ei avastanud seda (failis \"/etc/modules\"\n"
-"puudub nii moodul bttv kui saa7134) ega paigaldanud ka xawtv-d, saatke\n"
-"palun käsu \"lspcidrake -v -f\" tulemused aadressile \"install"
-"\\@mandrakesoft.com\",\n"
-"märkides subjektireale \"Undetected TV card\".\n"
+"Meie riistvara andmebaasi saate külastada aadressil:\n"
 "\n"
 "\n"
-"Te võite selle paigaldada, andes administraatorina konsoolis käsu\n"
-"\"urpmi xawtv\"."
-
-#: ../../standalone/drakxtv_.c:63
-msgid "Canada (cable)"
-msgstr "Kanada (kaabel)"
-
-#: ../../standalone/drakxtv_.c:63
-msgid "USA (broadcast)"
-msgstr "USA (tele)"
-
-#: ../../standalone/drakxtv_.c:63
-msgid "USA (cable)"
-msgstr "USA (kaabel)"
-
-#: ../../standalone/drakxtv_.c:63
-msgid "USA (cable-hrc)"
-msgstr "USA (kaabel-hrc)"
-
-#: ../../standalone/drakxtv_.c:64
-msgid "China (broadcast)"
-msgstr "Hiina (tele)"
-
-#: ../../standalone/drakxtv_.c:64
-msgid "Japan (broadcast)"
-msgstr "Jaapan (tele)"
-
-#: ../../standalone/drakxtv_.c:64
-msgid "Japan (cable)"
-msgstr "Jaapan (kaabel)"
+"http://www.linux-mandrake.com/en/hardware.php3"
 
-#: ../../standalone/drakxtv_.c:65
-msgid "East Europe"
-msgstr "Ida-Euroopa"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "No TV Card detected!"
+msgstr "TV-kaarti ei leitud!"
 
-#: ../../standalone/drakxtv_.c:65
-msgid "France [SECAM]"
-msgstr "Prantsusmaa [SECAM]"
+#: ../../standalone/drakxtv:1
+#, c-format
+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_.c:65
-msgid "Ireland"
-msgstr "Iirimaa"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "Have a nice day!"
+msgstr "Peatse jällenägemiseni!"
 
-#: ../../standalone/drakxtv_.c:65
-msgid "West Europe"
-msgstr "Lääne-Euroopa"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "XawTV isn't installed!"
+msgstr "XawTV ei ole paigaldatud!"
 
-#: ../../standalone/drakxtv_.c:66
-msgid "Australia"
-msgstr "Austraalia"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "There was an error while scanning for TV channels"
+msgstr "Telekanalite otsingul tekkis viga"
 
-#: ../../standalone/drakxtv_.c:66
-msgid "Newzealand"
-msgstr "Uus-Meremaa"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "Scanning for TV channels"
+msgstr "Telekanalite otsing"
 
-#: ../../standalone/drakxtv_.c:67
-msgid "South Africa"
-msgstr "Lõuna-Aafrika"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "Scanning for TV channels in progress ..."
+msgstr "Telekanalite otsingu edenemine ..."
 
-#: ../../standalone/drakxtv_.c:68
-msgid "Argentina"
-msgstr "Argentina"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "Area:"
+msgstr "Piirkond:"
 
-#: ../../standalone/drakxtv_.c:69
-msgid "Australian Optus cable TV"
-msgstr "Austraalia Optus kaabli-TV"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "TV norm:"
+msgstr "Telesüsteem:"
 
-#: ../../standalone/drakxtv_.c:102
+#: ../../standalone/drakxtv:1
+#, c-format
 msgid ""
 "Please,\n"
 "type in your tv norm and country"
@@ -14169,250 +18235,365 @@ msgstr ""
 "Palun märkige ära\n"
 "oma telesüsteem ja riik"
 
-#: ../../standalone/drakxtv_.c:104
-msgid "TV norm:"
-msgstr "Telesüsteem:"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "Australian Optus cable TV"
+msgstr "Austraalia Optus kaabli-TV"
 
-#: ../../standalone/drakxtv_.c:105
-msgid "Area:"
-msgstr "Piirkond:"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "Newzealand"
+msgstr "Uus-Meremaa"
 
-#: ../../standalone/drakxtv_.c:109
-msgid "Scanning for TV channels in progress ..."
-msgstr "Telekanalite otsingu edenemine ..."
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "France [SECAM]"
+msgstr "Prantsusmaa [SECAM]"
 
-#: ../../standalone/drakxtv_.c:116
-msgid "Scanning for TV channels"
-msgstr "Telekanalite otsing"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "East Europe"
+msgstr "Ida-Euroopa"
 
-#: ../../standalone/drakxtv_.c:120
-msgid "There was an error while scanning for TV channels"
-msgstr "Telekanalite otsingul tekkis viga"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "West Europe"
+msgstr "Lääne-Euroopa"
 
-#: ../../standalone/drakxtv_.c:121
-msgid "XawTV isn't installed!"
-msgstr "XawTV ei ole paigaldatud!"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "China (broadcast)"
+msgstr "Hiina (tele)"
 
-#: ../../standalone/drakxtv_.c:124
-msgid "Have a nice day!"
-msgstr "Peatse jällenägemiseni!"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "Japan (cable)"
+msgstr "Jaapan (kaabel)"
 
-#: ../../standalone/drakxtv_.c:125
-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:1
+#, c-format
+msgid "Japan (broadcast)"
+msgstr "Jaapan (tele)"
 
-#: ../../standalone/drakxtv_.c:147
-msgid "No TV Card detected!"
-msgstr "TV-kaarti ei leitud!"
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "Canada (cable)"
+msgstr "Kanada (kaabel)"
 
-#: ../../standalone/drakxtv_.c:148
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "USA (cable-hrc)"
+msgstr "USA (kaabel-hrc)"
+
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "USA (cable)"
+msgstr "USA (kaabel)"
+
+#: ../../standalone/drakxtv:1
+#, c-format
+msgid "USA (broadcast)"
+msgstr "USA (tele)"
+
+#: ../../standalone/drakxtv:1
+#, c-format
 msgid ""
-"No TV Card has been detected on your machine. Please verify that a Linux-"
-"supported Video/TV Card is correctly plugged in.\n"
+"XawTV isn't installed!\n"
 "\n"
 "\n"
-"You can visit our hardware database at:\n"
+"If you do have a TV card but DrakX has neither detected it (no bttv nor "
+"saa7134\n"
+"module in \"/etc/modules\") nor installed xawtv, please send the\n"
+"results of \"lspcidrake -v -f\" to \"install\\@mandrakesoft.com\"\n"
+"with subject \"undetected TV card\".\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"You can install it by typing \"urpmi xawtv\" as root, in a console."
 msgstr ""
-"Teie masinal ei leitud TV-kaarti. Kontrollige palun, et Linuxi toega video/"
-"TV-kaart on korrektselt ühendatud.\n"
+"XawTV ei ole paigaldatud!\n"
 "\n"
 "\n"
-"Meie riistvara andmebaasi saate külastada aadressil:\n"
+"Kui Teil on TV-kaart, kuid DrakX ei avastanud seda (failis \"/etc/modules\"\n"
+"puudub nii moodul bttv kui saa7134) ega paigaldanud ka xawtv-d, saatke\n"
+"palun käsu \"lspcidrake -v -f\" tulemused aadressile \"install"
+"\\@mandrakesoft.com\",\n"
+"märkides subjektireale \"Undetected TV card\".\n"
 "\n"
 "\n"
-"http://www.linux-mandrake.com/en/hardware.php3"
+"Te võite selle paigaldada, andes administraatorina konsoolis käsu\n"
+"\"urpmi xawtv\"."
 
-#: ../../standalone/harddrake2_.c:17
-msgid "Alternative drivers"
-msgstr "Alternatiivsed draiverid"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/Options"
+msgstr "/Eelistused"
 
-#: ../../standalone/harddrake2_.c:18
-msgid "the list of alternative drivers for this sound card"
-msgstr "selle helikaardi alternatiivsete draiverite loend"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/Autodetect jazz drives"
+msgstr "/JAZZ ketaste automaattuvastus"
 
-#: ../../standalone/harddrake2_.c:20
-msgid "Bus"
-msgstr "Siin"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/Autodetect modems"
+msgstr "/Modemite automaattuvastus"
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/Autodetect printers"
+msgstr "/Printerite automaattuvastus"
 
-#: ../../standalone/harddrake2_.c:21
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "primary"
+msgstr "esmane"
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "secondary"
+msgstr "teisene"
+
+#: ../../standalone/harddrake2:1
+#, 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, ...)"
+"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_.c:22
-msgid "Channel"
-msgstr "Kanal"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Running \"%s\" ..."
+msgstr "\"%s\" käib..."
 
-#: ../../standalone/harddrake2_.c:22
-msgid "EIDE/SCSI channel"
-msgstr "EIDE/SCSI kanal"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Run config tool"
+msgstr "Seadistamisvahendi kävitamine"
 
-#: ../../standalone/harddrake2_.c:23
-msgid "Bogomips"
-msgstr "Bogomipsid"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Configure module"
+msgstr "Mooduli seadistamine"
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Information"
+msgstr "Info"
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Detected hardware"
+msgstr "Tuvastatud riistvara"
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Harddrake2 version "
+msgstr "Harddrake2 versioon "
 
-#: ../../standalone/harddrake2_.c:23
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Detection in progress"
+msgstr "Toimub tuvastamine..."
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Author:"
+msgstr "Autor:"
+
+#: ../../standalone/harddrake2:1
+#, c-format
 msgid ""
-"The GNU/Linux kernel needs to do run a calculation loop at boot time\n"
-"\t to initialize a timer counter.  Its result is stored as bogomips as a way "
-"to \"benchmark\" the cpu."
+"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"Version:"
 msgstr ""
-"GNU/Linuxi kernel peab alglaadimise ajal ajaarvesti lähtestamiseks\n"
-"\tsooritama kalkulatsioonisilmuse.  Selle tulemus salvestatakse "
-"bogomipsides, mis kujutab endast omamoodi CPU \"jõudlustesti\"."
+"See on HardDrake - Mandrake riistvara seadistamisvahend.\n"
+"Versioon:"
 
-#: ../../standalone/harddrake2_.c:26
-msgid "Bus identification"
-msgstr "Siinitunnus"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "About Harddrake"
+msgstr "HardDrake info"
 
-#: ../../standalone/harddrake2_.c:27
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/_About..."
+msgstr "/_Misvärk"
+
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#, c-format
+msgid "/_Help"
+msgstr "/_Abi"
+
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/_Report Bug"
+msgstr "/_Vearaport"
+
+#: ../../standalone/harddrake2:1
+#, c-format
 msgid ""
-"- PCI and USB devices: this list the vendor, device, subvendor and subdevice "
-"PCI/USB ids"
+"Once you've selected a device, you'll be able to see the device information "
+"in fields displayed on the right frame (\"Information\")"
 msgstr ""
-" -PCI- ja USB-seadmed: tootja, seade, allettevõtja ja allseadme PCI/USB id-d"
+"Kui valite seadme, näete selle kohta infot väljadel paremal asuvas paneelis "
+"(\"Info\")"
 
-#: ../../standalone/harddrake2_.c:29
-msgid "Location on the bus"
-msgstr "Asukoht siinil"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Select a device !"
+msgstr "Valige seade !"
 
-#: ../../standalone/harddrake2_.c:30
+#: ../../standalone/harddrake2:1
+#, c-format
 msgid ""
-"- pci devices: this gives the PCI slot, device and function of this card\n"
-"- eide devices: the device is either a slave or a master device\n"
-"- scsi devices: the scsi bus and the scsi device ids"
+"Description of the fields:\n"
+"\n"
 msgstr ""
-" -pci seadmed: näitab PCI pesa, seadet ja kaardi funktsiooni\n"
-"- eide seadmed: seade on kas ülem või allutatu\n"
-"- scsi seadmed: scsi siin ja scsi seadme id-d"
+"Väljade kirjeldus:\n"
+"\n"
 
-#: ../../standalone/harddrake2_.c:33
-msgid "Cache size"
-msgstr "Puhvri suurus"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Harddrake help"
+msgstr "HardDrake abi"
 
-#: ../../standalone/harddrake2_.c:33
-msgid "Size of the (second level) cpu cache"
-msgstr "(Teise taseme) CPU puhvri suurus"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/_Fields description"
+msgstr "/Välja_de kirjeldus"
 
-#: ../../standalone/harddrake2_.c:34
-msgid "Coma bug:"
-msgstr "\"Koomaviga\":"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/Autodetect _jazz drives"
+msgstr "/_JAZZ ketaste automaattuvastus"
 
-#: ../../standalone/harddrake2_.c:34
-msgid "Does this cpu has Cyrix 6x86 Coma bug ?"
-msgstr "Kas sel CPU-l on Cyrix 6x86 \"koomaviga\" ?"
+#: ../../standalone/harddrake2:1 ../../standalone/logdrake:1
+#, c-format
+msgid "/_Options"
+msgstr "/_Eelistused"
 
-#: ../../standalone/harddrake2_.c:35
-msgid "Cpuid family"
-msgstr "Cpuid perekond"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/Autodetect _modems"
+msgstr "/_Modemite automaattuvastus"
 
-#: ../../standalone/harddrake2_.c:35
-msgid "Family of the cpu (eg: 6 for i686 class)"
-msgstr "CPU perekond (nt 6, kui on i686)"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/Autodetect _printers"
+msgstr "/_Printerite automaattuvastus"
 
-#: ../../standalone/harddrake2_.c:36
-msgid "Cpuid level"
-msgstr "Cpuid tase"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "/_Quit"
+msgstr "/_Välju"
 
-#: ../../standalone/harddrake2_.c:36
-msgid "Information level that can be obtained through the cpuid instruction"
-msgstr "Infotase, mida võib saada cpuid instruktsiooni vahendusel"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "the vendor name of the processor"
+msgstr "protsessori tootja nimi"
 
-#: ../../standalone/harddrake2_.c:37
-msgid "Frequency (MHz)"
-msgstr "Sagedus (MHz)"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "the vendor name of the device"
+msgstr "seadme tootja nimi"
 
-#: ../../standalone/harddrake2_.c:37
-msgid ""
-"The cpu frequency in Mhz (Mega herz which in first approximation may be "
-"coarsely assimilated to number of instructions the cpu is able to execute "
-"per second)"
-msgstr ""
-"CPU sagedus megahertsides (seda võib ligilähedaselt samastada operatsioonide "
-"arvuga, mida CPU suudab sekundis sooritada)"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "The type of bus on which the mouse is connected"
+msgstr "Siinitüüp, millega hiir on ühendatud"
 
-#: ../../standalone/harddrake2_.c:38
-msgid "This field describes the device"
-msgstr "See väli kirjeldab seadet"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Stepping of the cpu (sub model (generation) number)"
+msgstr "Protsessori alamtüüp (nn stepping'u number) "
 
-#: ../../standalone/harddrake2_.c:39
-msgid "Old device file"
-msgstr "Vana seadmefail"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Model stepping"
+msgstr "Mudeli alamtüüp"
 
-#: ../../standalone/harddrake2_.c:40
-msgid "old static device name used in dev package"
-msgstr "vana staatiline seadmenimi, mis oli kasutusel paketis dev"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "the number of the processor"
+msgstr "protsessori number"
 
-#: ../../standalone/harddrake2_.c:41
-msgid "New devfs device"
-msgstr "Uus devfs seade"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Processor ID"
+msgstr "Protsessori ID"
 
-#: ../../standalone/harddrake2_.c:42
-msgid "new dinamic device name generated by incore kernel devfs"
-msgstr "uus dünaamiline seadmenimi, mille genereerib kerneli devfs"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "network printer port"
+msgstr "võrguprinteri port"
 
-#: ../../standalone/harddrake2_.c:43
-msgid "Module"
-msgstr "Moodul"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Name"
+msgstr "Nimi"
 
-#: ../../standalone/harddrake2_.c:43
-msgid "the module of the GNU/Linux kernel that handle that device"
-msgstr "GNU/Linuxi kerneli moodul, mis käsitleb seda seadet"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Number of buttons"
+msgstr "Nuppude arv"
 
-#: ../../standalone/harddrake2_.c:44
-msgid "CPU flags reported by the kernel"
-msgstr "CPU lipud kerneli teatel"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Official vendor name of the cpu"
+msgstr "CPU ametlik tootja"
 
-#: ../../standalone/harddrake2_.c:44
-msgid "Flags"
-msgstr "Lipud"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Model name"
+msgstr "Mudeli nimi"
 
-#: ../../standalone/harddrake2_.c:45
-msgid "Fdiv bug"
-msgstr "FDIV viga"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgstr "CPU põlvkond (nt 8, kui on PentiumIII, ...)"
 
-#: ../../standalone/harddrake2_.c:46
-msgid ""
-"Early Intel Pentium chips manufactured have a bug in their floating point "
-"processor which did not achieve the attended precision when performing a "
-"Floating point DIVision (FDIV)"
-msgstr ""
-"Varastel Inteli Pentium-kiipidel oli viga ujukomaprotsessoris, mis ei "
-"saavutanud vajalikku täpsust ujukomajagamist (FDIV) sooritades"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Model"
+msgstr "Mudel"
 
-#: ../../standalone/harddrake2_.c:49
-msgid "Is FPU present"
-msgstr "Kas FPU on olemas"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "hard disk model"
+msgstr "kõvaketta mudel"
 
-#: ../../standalone/harddrake2_.c:49
-msgid "yes means the processor has an arithmetic coprocessor"
-msgstr "jah tähendab, et protsessoril on matemaatika-kaasprotsessor"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "class of hardware device"
+msgstr "riistvaralise seadme klass"
 
-#: ../../standalone/harddrake2_.c:50
-msgid "Does FPU have an irq vector"
-msgstr "KAS FPU-l on irq vektor"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Media class"
+msgstr "Andmekandja klass"
 
-#: ../../standalone/harddrake2_.c:50
-msgid "yes means the arithmetic coprocessor has an exception vector attached"
-msgstr "jah tähendab, et matemaatika-kaasprotsessoril on erandivektor"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Sub generation of the cpu"
+msgstr "CPU alampõlvkond"
 
-#: ../../standalone/harddrake2_.c:51
-msgid "Early pentium were buggy and freezed when decoding the F00F bytecode"
-msgstr ""
-"Varased pentiumid olid vigased ning hangusid F00F baidikoodi dekodeerimisel"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Level"
+msgstr "Tase"
 
-#: ../../standalone/harddrake2_.c:51
-msgid "F00f bug"
-msgstr "F00f viga"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Format of floppies the drive accept"
+msgstr "Flopi vorming, mida seade tunnustab"
 
-#: ../../standalone/harddrake2_.c:52
-msgid "Halt bug"
-msgstr "Seiskamisviga"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Floppy format"
+msgstr "Flopi vorming"
 
-#: ../../standalone/harddrake2_.c:53
+#: ../../standalone/harddrake2:1
+#, c-format
 msgid ""
 "Some of the early i486DX-100 chips cannot reliably return to operating mode "
 "after the \"halt\" instruction is used"
@@ -14420,232 +18601,250 @@ msgstr ""
 "Mõned varasemad i486DX-100 kiibid ei suutnud korralikult naasta tööresiimi, "
 "kui oli kasutatud käsklust \"seiska\" (\"halt\")"
 
-#: ../../standalone/harddrake2_.c:55
-msgid "Floppy format"
-msgstr "Flopi vorming"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Halt bug"
+msgstr "Seiskamisviga"
 
-#: ../../standalone/harddrake2_.c:55
-msgid "Format of floppies the drive accept"
-msgstr "Flopi vorming, mida seade tunnustab"
+#: ../../standalone/harddrake2:1
+#, 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_.c:56
-msgid "Level"
-msgstr "Tase"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "F00f bug"
+msgstr "F00f viga"
 
-#: ../../standalone/harddrake2_.c:56
-msgid "Sub generation of the cpu"
-msgstr "CPU alampõlvkond"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "yes means the arithmetic coprocessor has an exception vector attached"
+msgstr "jah tähendab, et matemaatika-kaasprotsessoril on erandivektor"
 
-#: ../../standalone/harddrake2_.c:57
-msgid "Media class"
-msgstr "Andmekandja klass"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Whether the FPU has an irq vector"
+msgstr "Kas FPU-l on irq vektor"
 
-#: ../../standalone/harddrake2_.c:57
-msgid "class of hardware device"
-msgstr "riistvaralise seadme klass"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "yes means the processor has an arithmetic coprocessor"
+msgstr "jah tähendab, et protsessoril on matemaatika-kaasprotsessor"
 
-#: ../../standalone/harddrake2_.c:58 ../../standalone/harddrake2_.c:59
-msgid "Model"
-msgstr "Mudel"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Is FPU present"
+msgstr "Kas FPU on olemas"
 
-#: ../../standalone/harddrake2_.c:58
-msgid "hard disk model"
-msgstr "kõvaketta mudel"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid ""
+"Early Intel Pentium chips manufactured have a bug in their floating point "
+"processor which did not achieve the required precision when performing a "
+"Floating point DIVision (FDIV)"
+msgstr ""
+"Varastel Inteli Pentium-kiipidel oli viga ujukomaprotsessoris, mis ei "
+"saavutanud vajalikku täpsust ujukomajagamist (FDIV) sooritades"
 
-#: ../../standalone/harddrake2_.c:59
-msgid "Generation of the cpu (eg: 8 for PentiumIII, ...)"
-msgstr "CPU genereerimine (nt 8, kui on PentiumIII, ...)"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Fdiv bug"
+msgstr "FDIV viga"
 
-#: ../../standalone/harddrake2_.c:60
-msgid "Model name"
-msgstr "Mudeli nimi"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "CPU flags reported by the kernel"
+msgstr "CPU lipud kerneli teatel"
 
-#: ../../standalone/harddrake2_.c:60
-msgid "Official vendor name of the cpu"
-msgstr "CPU ametlik tootja"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Flags"
+msgstr "Lipud"
 
-#: ../../standalone/harddrake2_.c:61
-msgid "Number of buttons"
-msgstr "Nuppude arv"
+#: ../../standalone/harddrake2:1
+#, 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_.c:62
-msgid "Name"
-msgstr "Nimi"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Module"
+msgstr "Moodul"
 
-#: ../../standalone/harddrake2_.c:63
-msgid "network printer port"
-msgstr "võrguprinteri port"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "new dynamic device name generated by core kernel devfs"
+msgstr "uus dünaamiline seadmenimi, mille genereerib kerneli devfs"
 
-#: ../../standalone/harddrake2_.c:64
-msgid "Processor ID"
-msgstr "Protsessori ID"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "New devfs device"
+msgstr "Uus devfs seade"
 
-#: ../../standalone/harddrake2_.c:64
-msgid "the number of the processor"
-msgstr "protsessori number"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "old static device name used in dev package"
+msgstr "vana staatiline seadmenimi, mis oli kasutusel paketis dev"
 
-#: ../../standalone/harddrake2_.c:65
-msgid "Model stepping"
-msgstr "Mudeli alamtüüp"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Old device file"
+msgstr "Vana seadmefail"
 
-#: ../../standalone/harddrake2_.c:65
-msgid "Stepping of the cpu (sub model (generation) number)"
-msgstr "Protsessori alamtüüp (nn stepping'u number) "
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "This field describes the device"
+msgstr "See väli kirjeldab seadet"
 
-#: ../../standalone/harddrake2_.c:66
-msgid "The type of bus on which the mouse is connected"
-msgstr "Siinitüüp, millega hiir on ühendatud"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid ""
+"The cpu frequency in Mhz (Mega herz which in first approximation may be "
+"coarsely assimilated to number of instructions the cpu is able to execute "
+"per second)"
+msgstr ""
+"CPU sagedus megahertsides (seda võib ligilähedaselt samastada operatsioonide "
+"arvuga, mida CPU suudab sekundis sooritada)"
 
-#: ../../standalone/harddrake2_.c:67
-msgid "the vendor name of the device"
-msgstr "seadme tootja nimi"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Frequency (MHz)"
+msgstr "Sagedus (MHz)"
 
-#: ../../standalone/harddrake2_.c:68
-msgid "the vendor name of the processor"
-msgstr "protsessori tootja nimi"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Information level that can be obtained through the cpuid instruction"
+msgstr "Infotase, mida võib saada cpuid instruktsiooni vahendusel"
 
-#: ../../standalone/harddrake2_.c:82
-msgid "/_Quit"
-msgstr "/_Välju"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Cpuid level"
+msgstr "Cpuid tase"
 
-#: ../../standalone/harddrake2_.c:83
-msgid "/Autodetect _printers"
-msgstr "/_Printerite automaattuvastus"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Family of the cpu (eg: 6 for i686 class)"
+msgstr "CPU perekond (nt 6, kui on i686)"
 
-#: ../../standalone/harddrake2_.c:83 ../../standalone/harddrake2_.c:85
-#: ../../standalone/logdrake_.c:81
-msgid "/_Options"
-msgstr "/_Eelistused"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Cpuid family"
+msgstr "Cpuid perekond"
 
-#: ../../standalone/harddrake2_.c:85
-msgid "/Autodetect _modems"
-msgstr "/_Modemite automaattuvastus"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Whether this cpu has the Cyrix 6x86 Coma bug"
+msgstr "Kas sel CPU-l on Cyrix 6x86 \"koomaviga\" ?"
 
-#: ../../standalone/harddrake2_.c:87 ../../standalone/harddrake2_.c:89
-#: ../../standalone/harddrake2_.c:100 ../../standalone/harddrake2_.c:102
-#: ../../standalone/logdrake_.c:83
-msgid "/_Help"
-msgstr "/_Abi"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Coma bug"
+msgstr "\"Koomaviga\""
 
-#: ../../standalone/harddrake2_.c:89
-msgid "/_Help..."
-msgstr "/_Abi..."
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Size of the (second level) cpu cache"
+msgstr "(Teise taseme) CPU puhvri suurus"
 
-#: ../../standalone/harddrake2_.c:92
-msgid "Harddrake help"
-msgstr "Harddrake abi"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Cache size"
+msgstr "Puhvri suurus"
 
-#: ../../standalone/harddrake2_.c:93
+#: ../../standalone/harddrake2:1
+#, c-format
 msgid ""
-"Description of the fields:\n"
-"\n"
+"- pci devices: this gives the PCI slot, device and function of this card\n"
+"- eide devices: the device is either a slave or a master device\n"
+"- scsi devices: the scsi bus and the scsi device ids"
 msgstr ""
-"Väljade kirjeldus:\n"
-"\n"
+" -pci seadmed: näitab PCI pesa, seadet ja kaardi funktsiooni\n"
+"- eide seadmed: seade on kas ülem või allutatu\n"
+"- scsi seadmed: scsi siin ja scsi seadme id-d"
 
-#: ../../standalone/harddrake2_.c:96
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Location on the bus"
+msgstr "Asukoht siinil"
+
+#: ../../standalone/harddrake2:1
+#, c-format
 msgid ""
-"Once you've selected a device, you'll be able to see explanations on fields "
-"displayed on the right frame (\"Information\")"
+"- PCI and USB devices: this lists the vendor, device, subvendor and "
+"subdevice PCI/USB ids"
 msgstr ""
-"Kui valite seadme, näete iga välja kohta seletusi paremal paneeli (\"Info\")"
-
-#: ../../standalone/harddrake2_.c:96
-msgid "Select a device !"
-msgstr "Valige seade !"
+"- PCI- ja USB-seadmed: tootja, seade, allettevõtja ja allseadme PCI/USB id-d"
 
-#: ../../standalone/harddrake2_.c:100
-msgid "/_Report Bug"
-msgstr "/_Vearaport"
-
-#: ../../standalone/harddrake2_.c:102
-msgid "/_About..."
-msgstr "/_Misvärk"
-
-#: ../../standalone/harddrake2_.c:104
-msgid "About Harddrake"
-msgstr "Harddrake info"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Bus identification"
+msgstr "Siinitunnus"
 
-#: ../../standalone/harddrake2_.c:105
+#: ../../standalone/harddrake2:1
+#, c-format
 msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
-"Version:"
+"The GNU/Linux kernel needs to run a calculation loop at boot time to "
+"initialize a timer counter.  Its result is stored as bogomips as a way to "
+"\"benchmark\" the cpu."
 msgstr ""
-"See on HardDrake - Mandrake riistvara seadistamisvahend.\n"
-"Versioon:"
-
-#: ../../standalone/harddrake2_.c:106
-msgid "Author:"
-msgstr "Autor:"
-
-#: ../../standalone/harddrake2_.c:113
-msgid "Detection in progress"
-msgstr "Toimub tuvastamine..."
-
-#: ../../standalone/harddrake2_.c:119
-msgid "Harddrake2 version "
-msgstr "Harddrake2 versioon "
+"GNU/Linuxi kernel peab alglaadimise ajal ajaarvesti lähtestamiseks sooritama "
+"kalkulatsioonisilmuse.  Selle tulemus salvestatakse bogomipsides, mis "
+"kujutab endast omamoodi CPU \"jõudlustesti\"."
 
-#: ../../standalone/harddrake2_.c:126
-msgid "Detected hardware"
-msgstr "Tuvastatud riistvara"
-
-#: ../../standalone/harddrake2_.c:129
-msgid "Information"
-msgstr "Info"
-
-#: ../../standalone/harddrake2_.c:131
-msgid "Configure module"
-msgstr "Mooduli seadistamine"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Bogomips"
+msgstr "Bogomipsid"
 
-#: ../../standalone/harddrake2_.c:137
-msgid "Run config tool"
-msgstr "Seadistamisvahendi kävitamine"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI kanal"
 
-#: ../../standalone/harddrake2_.c:143
+#: ../../standalone/harddrake2:1
 #, c-format
-msgid "Running \"%s\" ..."
-msgstr "\"%s\" käib..."
+msgid "Channel"
+msgstr "Kanal"
 
-#: ../../standalone/harddrake2_.c:159
+#: ../../standalone/harddrake2:1
+#, c-format
 msgid ""
-"Click on a device in the left tree in order to get its information displayed "
-"here."
-msgstr "Klõps seadmel vasakus paneelis näitab siin selle kohta käivat infot."
-
-#: ../../standalone/harddrake2_.c:231
-msgid "primary"
-msgstr "primaarne"
+"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_.c:231
-msgid "secondary"
-msgstr "sekundaarne"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Bus"
+msgstr "Siin"
 
-#: ../../standalone/harddrake2_.c:260
-msgid "/Autodetect modems"
-msgstr "/Modemite automaattuvastus"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "the list of alternative drivers for this sound card"
+msgstr "selle helikaardi alternatiivsete juhtprogrammide loend"
 
-#: ../../standalone/harddrake2_.c:260
-msgid "/Autodetect printers"
-msgstr "/Printerite automaattuvastus"
+#: ../../standalone/harddrake2:1
+#, c-format
+msgid "Alternative drivers"
+msgstr "Alternatiivsed juhtprogrammid"
 
-#: ../../standalone/harddrake2_.c:261
-msgid "/Options"
-msgstr "/Eelistused"
+#: ../../standalone/keyboarddrake:1
+#, c-format
+msgid "Do you want the BackSpace to return Delete in console?"
+msgstr "Kas soovite konsoolil kasutada BackSpace-i kui Delete?"
 
-#: ../../standalone/keyboarddrake_.c:26
+#: ../../standalone/keyboarddrake:1
+#, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "Palun valige klaviatuuriasetus."
 
-#: ../../standalone/keyboarddrake_.c:35
-msgid "Do you want the BackSpace to return Delete in console?"
-msgstr "Kas soovite konsoolil kasutada BackSpace-i kui Delete?"
-
-#: ../../standalone/livedrake_.c:18
-msgid "Change Cd-Rom"
-msgstr "Vahetage CD-ROM"
+#: ../../standalone/livedrake:1
+#, c-format
+msgid "Unable to start live upgrade !!!\n"
+msgstr "Ei saa kiiruuendust alustada !!!\n"
 
-#: ../../standalone/livedrake_.c:19
+#: ../../standalone/livedrake:1
+#, c-format
 msgid ""
 "Please insert the Installation Cd-Rom in your drive and press Ok when done.\n"
 "If you don't have it, press Cancel to avoid live upgrade."
@@ -14653,255 +18852,299 @@ msgstr ""
 "Palun sisestage paigaldus-CD lugejasse ja vajutage <Olgu>.\n"
 "Kui teil säherdust ei ole, vajutage <Katkesta>, et kiiruuendust vältida."
 
-#: ../../standalone/livedrake_.c:29
-msgid "Unable to start live upgrade !!!\n"
-msgstr "Ei saa kiiruuendust alustada !!!\n"
+#: ../../standalone/livedrake:1
+#, c-format
+msgid "Change Cd-Rom"
+msgstr "Vahetage CD-ROM"
 
-#: ../../standalone/localedrake_.c:34
+#: ../../standalone/localedrake:1
+#, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr "Muudatus on tehtud, aga selle rakendamiseks tuleb välja logida"
 
-#: ../../standalone/logdrake_.c:56 ../../ugtk.pm_.c:284 ../../ugtk2.pm_.c:350
-msgid "logdrake"
-msgstr "logdrake"
-
-#: ../../standalone/logdrake_.c:68
-msgid "Show only for the selected day"
-msgstr "Ainult valitud päeval näitamine"
-
-#: ../../standalone/logdrake_.c:75
-msgid "/File/_New"
-msgstr "/Fail/_Uus"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Save as.."
+msgstr "Salvesta kui..."
 
-#: ../../standalone/logdrake_.c:75
-msgid "<control>N"
-msgstr "<control>N"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Please enter your email address below "
+msgstr "Sisestage palun siia oma e-posti aadress"
 
-#: ../../standalone/logdrake_.c:76
-msgid "/File/_Open"
-msgstr "/Fail/_Ava"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "alert configuration"
+msgstr "hoiatuse sätted"
 
-#: ../../standalone/logdrake_.c:76
-msgid "<control>O"
-msgstr "<control>O"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "You will receive an alert if the load is higher than this value"
+msgstr "Saate hoiatuse, kui koormus on siin määratust suurem"
 
-#: ../../standalone/logdrake_.c:77
-msgid "/File/_Save"
-msgstr "/Fail/_Salvesta"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "load setting"
+msgstr "koormuse sätted"
 
-#: ../../standalone/logdrake_.c:77
-msgid "<control>S"
-msgstr "<control>S"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid ""
+"You will receive an alert if one of the selected services is no longer "
+"running"
+msgstr "Saate hoiatuse, kui üks valitud teenustest enam ei tööta"
 
-#: ../../standalone/logdrake_.c:78
-msgid "/File/Save _As"
-msgstr "/Fail/Salvesta _Kui"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "service setting"
+msgstr "teenuse sätted"
 
-#: ../../standalone/logdrake_.c:79
-msgid "/File/-"
-msgstr "/Fail/-"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Xinetd Service"
+msgstr "Xinetd teenus"
 
-#: ../../standalone/logdrake_.c:82
-msgid "/Options/Test"
-msgstr "/Eelistused/Test"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Webmin Service"
+msgstr "Webmin teenus"
 
-#: ../../standalone/logdrake_.c:84
-msgid "/Help/_About..."
-msgstr "/Abi/_Misvärk"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "SSH Server"
+msgstr "SSH server"
 
-#: ../../standalone/logdrake_.c:145
-msgid "User"
-msgstr "Kasutaja"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Samba Server"
+msgstr "Samba server"
 
-#: ../../standalone/logdrake_.c:146
-msgid "Messages"
-msgstr "Sõnumid"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Postfix Mail Server"
+msgstr "Postfix meiliserver"
 
-#: ../../standalone/logdrake_.c:147
-msgid "Syslog"
-msgstr "Syslog"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Ftp Server"
+msgstr "Ftp server"
 
-#: ../../standalone/logdrake_.c:148
-msgid "Mandrake Tools Explanations"
-msgstr "Mandrake vahendite seletused"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Domain Name Resolver"
+msgstr "Domeeninimede lahendaja"
 
-#: ../../standalone/logdrake_.c:151
-msgid "search"
-msgstr "otsing"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Apache World Wide Web Server"
+msgstr "Apache veebiserver"
 
-#: ../../standalone/logdrake_.c:161
-msgid "A tool to monitor your logs"
-msgstr "Vahend logide jälgimiseks"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid ""
+"Welcome to the mail configuration utility.\n"
+"\n"
+"Here, you'll be able to set up the alert system.\n"
+msgstr ""
+"Meili seadistamise vahend.\n"
+"\n"
+"Siin saab seadistada hoiatussüsteemi.\n"
 
-#: ../../standalone/logdrake_.c:162 ../../standalone/net_monitor_.c:91
-msgid "Settings"
-msgstr "Sätted"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Mail alert configuration"
+msgstr "Meilihoiatuse sätted"
 
-#: ../../standalone/logdrake_.c:167
-msgid "matching"
-msgstr "sobib"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Mail alert"
+msgstr "Meilihoiatus"
 
-#: ../../standalone/logdrake_.c:168
-msgid "but not matching"
-msgstr "aga ei sobi"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "please wait, parsing file: %s"
+msgstr "palun oodake, analüüsin faili: %s"
 
-#: ../../standalone/logdrake_.c:172
-msgid "Choose file"
-msgstr "Faili valimine"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Content of the file"
+msgstr "Faili sisu"
 
-#: ../../standalone/logdrake_.c:181
+#: ../../standalone/logdrake:1
+#, c-format
 msgid "Calendar"
 msgstr "Kalender"
 
-#: ../../standalone/logdrake_.c:191
-msgid "Content of the file"
-msgstr "Faili sisu"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Choose file"
+msgstr "Faili valimine"
 
-#: ../../standalone/logdrake_.c:195 ../../standalone/logdrake_.c:375
-msgid "Mail alert"
-msgstr "Meilihoiatus"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "but not matching"
+msgstr "aga ei sobi"
 
-#: ../../standalone/logdrake_.c:245
+#: ../../standalone/logdrake:1
 #, c-format
-msgid "please wait, parsing file: %s"
-msgstr "palun oodake, analüüsin faili: %s"
+msgid "matching"
+msgstr "sobib"
 
-#: ../../standalone/logdrake_.c:392
-msgid "Mail alert configuration"
-msgstr "Meilihoiatuse sätted"
+#: ../../standalone/logdrake:1 ../../standalone/net_monitor:1
+#, c-format
+msgid "Settings"
+msgstr "Sätted"
 
-#: ../../standalone/logdrake_.c:393
-msgid ""
-"Welcome to the mail configuration utility.\n"
-"\n"
-"Here, you'll be able to set up the alert system.\n"
-msgstr ""
-"Meili seadistamise vahend.\n"
-"\n"
-"Siin saab seadistada hoiatussüsteemi.\n"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "A tool to monitor your logs"
+msgstr "Vahend logide jälgimiseks"
 
-#: ../../standalone/logdrake_.c:400
-msgid "Apache World Wide Web Server"
-msgstr "Apache veebiserver"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "search"
+msgstr "otsing"
 
-#: ../../standalone/logdrake_.c:401
-msgid "Domain Name Resolver"
-msgstr "Domeeninimede lahendaja"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Mandrake Tools Explanation"
+msgstr "Mandrake vahendite seletused"
 
-#: ../../standalone/logdrake_.c:402
-msgid "Ftp Server"
-msgstr "Ftp server"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Syslog"
+msgstr "Syslog"
 
-#: ../../standalone/logdrake_.c:403
-msgid "Postfix Mail Server"
-msgstr "Postfix meiliserver"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Messages"
+msgstr "Sõnumid"
 
-#: ../../standalone/logdrake_.c:404
-msgid "Samba Server"
-msgstr "Samba server"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "User"
+msgstr "Kasutaja"
 
-#: ../../standalone/logdrake_.c:405
-msgid "SSH Server"
-msgstr "SSH server"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/Help/_About..."
+msgstr "/Abi/_Misvärk"
 
-#: ../../standalone/logdrake_.c:406
-msgid "Webmin Service"
-msgstr "Webmin teenus"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/Options/Test"
+msgstr "/Eelistused/Test"
 
-#: ../../standalone/logdrake_.c:407
-msgid "Xinetd Service"
-msgstr "Xinetd teenus"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/File/-"
+msgstr "/Fail/-"
 
-#: ../../standalone/logdrake_.c:414
-msgid "service setting"
-msgstr "teenuse sätted"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/File/Save _As"
+msgstr "/Fail/Salvesta _Kui"
 
-#: ../../standalone/logdrake_.c:415
-msgid ""
-"You will receive an alert if one of the selected services is no more running"
-msgstr "Saate hoiatuse, kui üks valitud teenustest enam ei tööta"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "<control>S"
+msgstr "<control>S"
 
-#: ../../standalone/logdrake_.c:428
-msgid "load setting"
-msgstr "koormuse sätted"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/File/_Save"
+msgstr "/Fail/_Salvesta"
 
-#: ../../standalone/logdrake_.c:429
-msgid "You will receive an alert if the load is higher than this value"
-msgstr "Saate hoiatuse, kui koormus on siin määratust suurem"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "<control>O"
+msgstr "<control>O"
 
-#: ../../standalone/logdrake_.c:444
-msgid "alert configuration"
-msgstr "hoiatuse sätted"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/File/_Open"
+msgstr "/Fail/_Ava"
 
-#: ../../standalone/logdrake_.c:445
-msgid "Please enter your email address below "
-msgstr "Sisestage palun siia oma e-posti aadress"
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "<control>N"
+msgstr "<control>N"
 
-#: ../../standalone/logdrake_.c:486
-msgid "Save as.."
-msgstr "Salvesta kui..."
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "/File/_New"
+msgstr "/Fail/_Uus"
 
-#: ../../standalone/mousedrake_.c:37
-msgid "Please, choose the type of your mouse."
-msgstr "Palun valige hiire tüüp."
+#: ../../standalone/logdrake:1
+#, c-format
+msgid "Show only for the selected day"
+msgstr "Ainult valitud päeval näitamine"
 
-#: ../../standalone/mousedrake_.c:50
+#: ../../standalone/mousedrake:1
+#, c-format
 msgid "Emulate third button?"
 msgstr "Kas emuleerida keskmist hiirenuppu?"
 
-#: ../../standalone/net_monitor_.c:53 ../../standalone/net_monitor_.c:87
-msgid "Network Monitoring"
-msgstr "Võrgu jälgimine"
-
-#: ../../standalone/net_monitor_.c:96
-msgid "Profile "
-msgstr "Profiil "
-
-#: ../../standalone/net_monitor_.c:99
-msgid "Statistics"
-msgstr "Statistika"
+#: ../../standalone/mousedrake:1
+#, c-format
+msgid "Please choose your mouse type."
+msgstr "Palun valige hiire tüüp."
 
-#: ../../standalone/net_monitor_.c:103
-msgid "Sending Speed:"
-msgstr "Saatmise kiirus:"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Connect %s"
+msgstr "%s ühenduse loomine"
 
-#: ../../standalone/net_monitor_.c:104
-msgid "Receiving Speed:"
-msgstr "Saamise kiirus:"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Disconnect %s"
+msgstr "%s ühenduse katkestamine"
 
-#: ../../standalone/net_monitor_.c:106
-msgid "Connection Time: "
-msgstr "Ühenduse kestvus: "
+#: ../../standalone/net_monitor:1
+#, 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"
 
-#: ../../standalone/net_monitor_.c:113
-msgid "Logs"
-msgstr "Logifailid"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "received"
+msgstr "saadud"
 
-#: ../../standalone/net_monitor_.c:147
-msgid "Wait please, testing your connection..."
-msgstr "Oodake palun, testime Teie ühendust..."
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "transmitted"
+msgstr "üle kantud"
 
-#: ../../standalone/net_monitor_.c:178 ../../standalone/net_monitor_.c:191
-msgid "Connecting to Internet "
-msgstr "Loo internetiühendus"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "received: "
+msgstr "saadud: "
 
-#: ../../standalone/net_monitor_.c:178 ../../standalone/net_monitor_.c:191
-msgid "Disconnecting from Internet "
-msgstr "Katkesta internetiühendus"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "sent: "
+msgstr "saadetud: "
 
-#: ../../standalone/net_monitor_.c:222
-msgid "Disconnection from Internet failed."
-msgstr "Internetiühenduse katkestamine ebaõnnestus."
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Local measure"
+msgstr "Kohalikud andmed"
 
-#: ../../standalone/net_monitor_.c:223
-msgid "Disconnection from Internet complete."
-msgstr "Internetiühendus on katkestatud."
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "average"
+msgstr "keskmine"
 
-#: ../../standalone/net_monitor_.c:225
-msgid "Connection complete."
-msgstr "Ühendus on loodud."
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Color configuration"
+msgstr "Värvisätted"
 
-#: ../../standalone/net_monitor_.c:226
+#: ../../standalone/net_monitor:1
+#, c-format
 msgid ""
 "Connection failed.\n"
 "Verify your configuration in the Mandrake Control Center."
@@ -14909,740 +19152,564 @@ msgstr ""
 "Ühenduse loomine ebaõnnestus.\n"
 "Kontrollige palun sätteid Mandrake juhtimiskeskuse abil."
 
-#: ../../standalone/net_monitor_.c:330
-msgid "Color configuration"
-msgstr "Värvisätted"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Connection complete."
+msgstr "Ühendus on loodud."
 
-#: ../../standalone/net_monitor_.c:383 ../../standalone/net_monitor_.c:403
-msgid "sent: "
-msgstr "saadetud: "
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Disconnection from the Internet complete."
+msgstr "Internetiühendus on katkestatud."
 
-#: ../../standalone/net_monitor_.c:390 ../../standalone/net_monitor_.c:407
-msgid "received: "
-msgstr "saadud: "
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Disconnection from the Internet failed."
+msgstr "Internetiühenduse katkestamine ebaõnnestus."
 
-#: ../../standalone/net_monitor_.c:397
-msgid "average"
-msgstr "keskmine"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Connecting to the Internet "
+msgstr "Internetiühenduse loomine"
 
-#: ../../standalone/net_monitor_.c:400
-msgid "Local measure"
-msgstr "Kohalikud andmed"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Disconnecting from the Internet "
+msgstr "Internetiühenduse katkestamine"
 
-#: ../../standalone/net_monitor_.c:432
-msgid "transmitted"
-msgstr "üle kantud"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Wait please, testing your connection..."
+msgstr "Oodake palun, testime Teie ühendust..."
 
-#: ../../standalone/net_monitor_.c:433
-msgid "received"
-msgstr "saadud"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Logs"
+msgstr "Logifailid"
 
-#: ../../standalone/net_monitor_.c:453
-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"
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Connection Time: "
+msgstr "Ühenduse kestvus: "
 
-#: ../../standalone/net_monitor_.c:459
+#: ../../standalone/net_monitor:1
 #, c-format
-msgid "Connect %s"
-msgstr "%s ühenduse loomine"
+msgid "Receiving Speed:"
+msgstr "Saamise kiirus:"
 
-#: ../../standalone/net_monitor_.c:459
+#: ../../standalone/net_monitor:1
 #, c-format
-msgid "Disconnect %s"
-msgstr "%s ühenduse katkestamine"
+msgid "Sending Speed:"
+msgstr "Saatmise kiirus:"
 
-#: ../../standalone/printerdrake_.c:47
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Statistics"
+msgstr "Statistika"
+
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Profile "
+msgstr "Profiil "
+
+#: ../../standalone/net_monitor:1
+#, c-format
+msgid "Network Monitoring"
+msgstr "Võrgu jälgimine"
+
+#: ../../standalone/printerdrake:1
+#, c-format
 msgid "Reading printer data ..."
 msgstr "Printeri andmete lugemine ..."
 
-#: ../../standalone/scannerdrake_.c:39
-msgid "Detecting devices ..."
-msgstr "Seadmete tuvastamine ..."
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Name/IP address of host:"
+msgstr "Masina nimi/IP aadress:"
 
-#: ../../standalone/scannerdrake_.c:39
-msgid "Test ports"
-msgstr "Proovin porte"
+#: ../../standalone/scannerdrake:1
+#, 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_.c:51 ../../standalone/scannerdrake_.c:66
-#: ../../standalone/scannerdrake_.c:79
+#: ../../standalone/scannerdrake:1
 #, c-format
-msgid "The %s is not supported by this version of Mandrake Linux."
-msgstr "Mandrake Linuxi praegusel versioonil puudub %s tugi."
+msgid "Scannerdrake"
+msgstr "Scannerdrake"
 
-#: ../../standalone/scannerdrake_.c:54
+#: ../../standalone/scannerdrake:1
 #, c-format
-msgid "%s found on %s, configure it?"
-msgstr "%s leiti asukohas %s, kas soovite seda seadistada?"
+msgid "You must enter a host name or an IP address.\n"
+msgstr "Sisestage palun masinanimi või IP aadress.\n"
 
-#: ../../standalone/scannerdrake_.c:57
+#: ../../standalone/scannerdrake:1
 #, c-format
-msgid "%s is not in the scanner database, configure it manually?"
-msgstr "%s puudub skännerite andmebaasis, kas seadistada see käsitsi?"
+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_.c:63
-msgid "Select a scanner"
-msgstr "Valige skänner"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Sharing of local scanners"
+msgstr "Skännerite jagamine"
 
-#: ../../standalone/scannerdrake_.c:91
+#: ../../standalone/scannerdrake:1
 #, c-format
-msgid "This %s scanner is unsupported"
-msgstr "Sel %s skänneril puudub tugi"
+msgid "This machine"
+msgstr "See masin"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Remove selected host"
+msgstr "Eemalda valitud masin"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Edit selected host"
+msgstr "Muuda valitud masinat"
 
-#: ../../standalone/scannerdrake_.c:105
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Add host"
+msgstr "Lisa masin"
+
+#: ../../standalone/scannerdrake:1
+#, 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:1
+#, c-format
+msgid "Usage of remote scanners"
+msgstr "Võrguskänneri kasutamine"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "All remote machines"
+msgstr "Kõik kaugmasinad"
+
+#: ../../standalone/scannerdrake:1
 #, c-format
 msgid ""
-"Scannerdrake was not able to detect your %s scanner.\n"
-"Please select the device where your scanner is plugged"
+"These are the machines on which the locally connected scanner(s) should be "
+"available:"
 msgstr ""
-"Scannerdrake ei suutnud leida Teie %s skännerit.\n"
-"Valige palun seade, kuhu skänner on ühendatud"
+"Nende masinate jaoks on selle arvuti küljes olevad skännerid kättesaadavaks  "
+"tehtud:"
 
-#: ../../standalone/scannerdrake_.c:107
-msgid "choose device"
-msgstr "valige seade"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Use the scanners on hosts: "
+msgstr "Skännerite kasutamine masinatel:"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Use scanners on remote computers"
+msgstr "Skännerite kasutamine kaugmasinatel"
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Scanner sharing to hosts: "
+msgstr "Skänneri jagamine masinatele:"
+
+#: ../../standalone/scannerdrake:1
+#, 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_.c:113
+#: ../../standalone/scannerdrake:1
 #, c-format
 msgid ""
-"This %s scanner must be configured by printerdrake.\n"
-"You can launch printerdrake from the Mandrake Control Center in Hardware "
-"section."
+"You can also decide here whether scanners on remote machines should be made "
+"available on this machine."
 msgstr ""
-"See %s skänner tuleb seadistada printerdrake abil.\n"
-"Printerdrake saab käivitada Mandrake juhtimiskeskuse riistvara sektsioonist."
+"Samuti saate otsustada, kas võrguskännerid peaksid olema automaatselt siin "
+"arvutis kättesaadavad"
 
-#: ../../standalone/scannerdrake_.c:118
+#: ../../standalone/scannerdrake:1
 #, c-format
 msgid ""
-"Your %s scanner has been configured.\n"
-"You may now scan documents using ``XSane'' from Multimedia/Graphics in the "
+"Here you can choose whether the scanners connected to this machine should be "
+"accessable by remote machines and by which remote machines."
+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."
+
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid ""
+"Your %s has been configured.\n"
+"You may now scan documents using \"XSane\" from Multimedia/Graphics in the "
 "applications menu."
 msgstr ""
 "Teie %s skänner on seadistatud.\n"
-"Nüüd võite skaneerida dokumente, kasutades selleks rakendust ``XSane'', "
+"Nüüd võite skaneerida dokumente, kasutades selleks rakendust \"XSane\", "
 "mille leiate rakenduste menüüs rubriigist Multimeedia/Graafika."
 
-#: ../../standalone/service_harddrake_.c:44
+#: ../../standalone/scannerdrake:1
 #, c-format
-msgid "Some devices in the \"%s\" hardware class were removed:\n"
-msgstr "Mõned seadmed riistvaraklassis \"%s\" eemaldati:\n"
-
-#: ../../standalone/service_harddrake_.c:48
-msgid "Some devices were added:\n"
-msgstr "Mõned seadmed lisati:\n"
-
-#: ../../standalone/service_harddrake_.c:64
-msgid "Hardware probing in progress"
-msgstr "Toimub tuvastamine.."
-
-#: ../../steps.pm_.c:14
-msgid "Choose your language"
-msgstr "Valige sobiv keel"
+msgid ""
+"The %s must be configured by printerdrake.\n"
+"You can launch printerdrake from the Mandrake Control Center in Hardware "
+"section."
+msgstr ""
+"See %s skänner tuleb seadistada printerdrake abil.\n"
+"Printerdrake saab käivitada Mandrake juhtimiskeskuse riistvara sektsioonist."
 
-#: ../../steps.pm_.c:15
-msgid "Select installation class"
-msgstr "Valige paigaldusmeetod"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "choose device"
+msgstr "valige seade"
 
-#: ../../steps.pm_.c:16
-msgid "Hard drive detection"
-msgstr "Kõvaketta leidmine"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Please select the device where your %s is attached"
+msgstr "Valige palun seade, kuhu %s on ühendatud"
 
-#: ../../steps.pm_.c:17
-msgid "Configure mouse"
-msgstr "Hiire seadmine"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "The %s is unsupported"
+msgstr "Sel %s skänneril puudub tugi"
 
-#: ../../steps.pm_.c:18
-msgid "Choose your keyboard"
-msgstr "Klaviatuuri valik"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "The %s is not known by this version of Scannerdrake."
+msgstr "%s on Scannerdrake praegusele versioonile tundmatu."
 
-#: ../../steps.pm_.c:19
-msgid "Security"
-msgstr "Turvalisus"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "The %s is not supported by this version of Mandrake Linux."
+msgstr "Mandrake Linuxi praegusel versioonil puudub %s tugi."
 
-#: ../../steps.pm_.c:20
-msgid "Setup filesystems"
-msgstr "Failisüsteemid"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Re-generating list of configured scanners ..."
+msgstr "Seadistatud skännerite nimekirja taasloomine..."
 
-#: ../../steps.pm_.c:21
-msgid "Format partitions"
-msgstr "Vormindamine"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Searching for new scanners ..."
+msgstr "Uute skännerite otsimine..."
 
-#: ../../steps.pm_.c:22
-msgid "Choose packages to install"
-msgstr "Pakettide valik"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Searching for configured scanners ..."
+msgstr "Seadistatud skännerite otsimine..."
 
-#: ../../steps.pm_.c:23
-msgid "Install system"
-msgstr "Süsteemi paigaldus"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Scanner sharing"
+msgstr "Skänneri jagamine"
 
-#: ../../steps.pm_.c:25
-msgid "Add a user"
-msgstr "Tavakasutaja"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Add a scanner manually"
+msgstr "Skänneri lisamine käsitsi"
 
-#: ../../steps.pm_.c:26
-msgid "Configure networking"
-msgstr "Võrgusätted"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Search for new scanners"
+msgstr "Uute skännerite otsimine..."
 
-#: ../../steps.pm_.c:28
-msgid "Configure services"
-msgstr "Teenuste sätted"
+#: ../../standalone/scannerdrake:1
+#, 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"
 
-#: ../../steps.pm_.c:29
-msgid "Install bootloader"
-msgstr "Alglaaduri sätted"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid ""
+"The following scanner\n"
+"\n"
+"%s\n"
+"is available on your system.\n"
+msgstr ""
+"Teie süsteemiga on ühendatud\n"
+"\n"
+"%s\n"
+"skänner.\n"
 
-#: ../../steps.pm_.c:31
-msgid "Create a bootdisk"
-msgstr "Alglaadimisflopi loomine"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid ""
+"The following scanners\n"
+"\n"
+"%s\n"
+"are available on your system.\n"
+msgstr ""
+"Teie süsteemiga on ühendatud\n"
+"\n"
+"%s\n"
+"skännerid.\n"
 
-#: ../../steps.pm_.c:33
-msgid "Configure X"
-msgstr "X-i seadistamine"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "Select a scanner"
+msgstr "Valige skänner"
 
-#: ../../steps.pm_.c:34
-msgid "Install system updates"
-msgstr "Uuenduste paigaldus"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "%s is not in the scanner database, configure it manually?"
+msgstr "%s puudub skännerite andmebaasis, kas seadistada see käsitsi?"
 
-#: ../../steps.pm_.c:35
-msgid "Exit install"
-msgstr "Välju programmist"
+#: ../../standalone/scannerdrake:1
+#, c-format
+msgid "%s found on %s, configure it automatically?"
+msgstr "%s leiti asukohas %s, kas seadistada see automaatselt?"
 
-#: ../../ugtk.pm_.c:636
-msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+#: ../../standalone/service_harddrake:1
+#, c-format
+msgid "Hardware probing in progress"
+msgstr "Toimub tuvastamine.."
 
-#: ../../ugtk2.pm_.c:711
-msgid "utopia 25"
-msgstr "utopia 25"
+#: ../../standalone/service_harddrake:1
+#, c-format
+msgid "Some devices were added:\n"
+msgstr "Mõned seadmed lisati:\n"
 
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Veeb/FTP"
+#: ../../standalone/service_harddrake:1
+#, c-format
+msgid "Some devices in the \"%s\" hardware class were removed:\n"
+msgstr "Mõned seadmed riistvaraklassis \"%s\" eemaldati:\n"
 
 #: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Võrguarvuti (klient)"
+msgid "Office Workstation"
+msgstr "Kontori tööjaam"
 
 #: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontoriprogrammid: tekstitöötlus (kword, abiword), tabeltöötlus (kspread, "
+"gnumeric), PDF vaatajad jne"
 
 #: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Kontor"
+msgid "Workstation"
+msgstr "Tööjaam"
 
 #: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome tööjaam"
+msgid "Game station"
+msgstr "Mänguvahend"
 
 #: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Suhtlus Palm Piloti või Visoriga"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
 
 #: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Tööjaam"
+msgid "Multimedia station"
+msgstr "Multimeedia tööjaam"
 
 #: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Tulemüür/marsruuter"
+msgid "Sound and video playing/editing programs"
+msgstr "Heli ja video mängimine ja redigeerimine"
 
 #: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Nimeserver ja NIS"
+msgid "Internet station"
+msgstr "Interneti tööjaam"
 
 #: ../../share/compssUsers:999
 msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
 msgstr ""
-"Kontoriprogrammid: tekstitöötlus (kword, abiword), tabeltöötlus (kspread, "
-"gnumeric), PDF vaatajad jne"
+"Komplekt rakendusi meili ja uudiste lugemiseks (pine, mutt, tin...) ning "
+"veebi lehitsemiseks"
 
 #: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Helivahendid: mp3- ja midi-mängijad, mikserid jms"
+msgid "Network Computer (client)"
+msgstr "Võrguarvuti (klient)"
 
 #: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Võõraste rakenduste toetus"
+msgid "Clients for different protocols including ssh"
+msgstr "Mitme protokolli, sealhulgas ssh kliendid"
 
 #: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Raamatud ja Howto-d Linuxi ja vabavara kohta"
+msgid "Configuration"
+msgstr "Seadistamine"
 
 #: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE tööjaam"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Vahendid süsteemi lihtsamaks administreerimiseks"
 
 #: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, WindowMaker, Enlightenment, Fvwm jt"
+msgid "Scientific Workstation"
+msgstr "Teadustööjaam"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimeedia - Video"
+msgid "Console Tools"
+msgstr "Konsoolivahendid"
 
 #: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Meili, uudiste, veebi, jututamise ja failiülekande vahendid"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktorid, shellid, terminalid, failihaldus"
 
 #: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Andmebaasid"
+msgid "KDE Workstation"
+msgstr "KDE tööjaam"
 
 #: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgreSQL või MySQL andmebaasiserver"
+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"
 
 #: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Vahendid süsteemi lihtsamaks administreerimiseks"
+msgid "Graphical Environment"
+msgstr "Graafiline keskkond"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimeedia - Heli"
+msgid "Gnome Workstation"
+msgstr "Gnome tööjaam"
 
 #: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentatsioon"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
 
 #: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsoolivahendid"
+msgid "Other Graphical Desktops"
+msgstr "Muud graafilised töölauad"
 
 #: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Postfix meiliserver, uudisteserver Inn"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, WindowMaker, Enlightenment, Fvwm jt"
 
 #: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Interneti tööjaam"
+msgid "Development"
+msgstr "Arendus"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimeedia tööjaam"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
 
 #: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Seadistamine"
+msgid "Documentation"
+msgstr "Dokumentatsioon"
 
 #: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Veel graafilisi töölaudu (Gnome, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Raamatud ja Howto-d Linuxi ja vabavara kohta"
 
 #: ../../share/compssUsers:999
-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"
+msgid "LSB"
+msgstr "LSB"
 
 #: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Graafiline keskkond"
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Võõraste rakenduste toetus"
 
 #: ../../share/compssUsers:999
-msgid "Development"
-msgstr "Arendus"
+msgid "Web/FTP"
+msgstr "Veeb/FTP"
 
 #: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
-msgstr "Apache ja Proftpd"
+msgstr "Apache ja Pro-ftpd"
 
 #: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Vahendid CD-de kirjutamiseks"
+msgid "Mail/Groupware/News"
+msgstr "Meil/grupitöö/uudised"
 
 #: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Kontori tööjaam"
+msgid "Postfix mail server, Inn news server"
+msgstr "Postfix meiliserver, uudisteserver Inn"
 
 #: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, WindowMaker, Enlightenment, Fvwm jne"
+msgid "Database"
+msgstr "Andmebaasid"
 
 #: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Graafikarakendused, näiteks Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL või MySQL andmebaasiserver"
+
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Tulemüür/marsruuter"
+
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internetiasjad"
 
 #: ../../share/compssUsers:999
 msgid "DNS/NIS "
 msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
+msgid "Domain Name and Network Information Server"
+msgstr "Nimeserver ja NIS"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer server"
 msgstr "Võrguserver"
 
 #: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Meil/grupitöö/uudised"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
 
 #: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Mänguvahend"
+msgid "Office"
+msgstr "Kontor"
 
 #: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videode mängimine ja redigeerimine"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Meili, uudiste, veebi, jututamise ja failiülekande vahendid"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Graphics"
 msgstr "Multimeedia - Graafika"
 
 #: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
-
-#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Komplekt rakendusi meili ja uudiste lugemiseks (pine, mutt, tin...) ning "
-"veebi lehitsemiseks"
-
-#: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Isiklikud rahaasjad"
+msgid "Graphics programs such as The Gimp"
+msgstr "Graafikarakendused, näiteks Gimp"
 
 #: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
+msgid "Multimedia - Sound"
+msgstr "Multimeedia - Heli"
 
 #: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Mitme protokolli, sealhulgas ssh kliendid"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Helivahendid: mp3- ja midi-mängijad, mikserid jms"
 
 #: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - Video"
+msgstr "Multimeedia - Video"
 
 #: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internetiasjad"
+msgid "Video players and editors"
+msgstr "Videode mängimine ja redigeerimine"
 
 #: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Heli ja video mängimine ja redigeerimine"
+msgid "Multimedia - CD Burning"
+msgstr "Multimeedia - CD kirjutamine"
 
 #: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Muud graafilised töölauad"
+msgid "Tools to create and burn CD's"
+msgstr "Vahendid CD-de kirjutamiseks"
 
 #: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Redaktorid, shellid, terminalid, failihaldus"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Veel graafilisi töölaudu (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Isiklike rahaasjade rakendused, näiteks gnucash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, WindowMaker, Enlightenment, Fvwm jne"
 
 #: ../../share/compssUsers:999
 msgid "Personal Information Management"
 msgstr "Isikliku info haldamine"
 
 #: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimeedia - CD kirjutamine"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Suhtlus Palm Piloti või Visoriga"
 
 #: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Teadustööjaam"
+msgid "Personal Finance"
+msgstr "Isiklikud rahaasjad"
 
-#~ msgid "can not open /etc/inittab for reading: %s"
-#~ msgstr "ei saa lugeda faili /etc/inittab: %s"
-
-#~ msgid "cpu number "
-#~ msgstr "protsessori number"
-
-#~ msgid ""
-#~ "You now have the opportunity to download encryption software.\n"
-#~ "\n"
-#~ "WARNING:\n"
-#~ "\n"
-#~ "Due to different general requirements applicable to these software and "
-#~ "imposed\n"
-#~ "by various jurisdictions, customer and/or end user of theses software "
-#~ "should\n"
-#~ "ensure that the laws of his/their jurisdiction allow him/them to "
-#~ "download, stock\n"
-#~ "and/or use these software.\n"
-#~ "\n"
-#~ "In addition customer and/or end user shall particularly be aware to not "
-#~ "infringe\n"
-#~ "the laws of his/their jurisdiction. Should customer and/or end user not\n"
-#~ "respect the provision of these applicable laws, he/they will incure "
-#~ "serious\n"
-#~ "sanctions.\n"
-#~ "\n"
-#~ "In no event shall Mandrakesoft nor its manufacturers and/or suppliers be "
-#~ "liable\n"
-#~ "for special, indirect or incidental damages whatsoever (including, but "
-#~ "not\n"
-#~ "limited to loss of profits, business interruption, loss of commercial "
-#~ "data and\n"
-#~ "other pecuniary losses, and eventual liabilities and indemnification to "
-#~ "be paid\n"
-#~ "pursuant to a court decision) arising out of use, possession, or the "
-#~ "sole\n"
-#~ "downloading of these software, to which customer and/or end user could\n"
-#~ "eventually have access after having sign up the present agreement.\n"
-#~ "\n"
-#~ "\n"
-#~ "For any queries relating to these agreement, please contact \n"
-#~ "Mandrakesoft, Inc.\n"
-#~ "2400 N. Lincoln Avenue Suite 243\n"
-#~ "Altadena California 91001\n"
-#~ "USA"
-#~ msgstr ""
-#~ "Nüüd on Teil võimalik oma süsteemi laadida krüptotarkvara.\n"
-#~ "\n"
-#~ "HOIATUS:\n"
-#~ "\n"
-#~ "Lähtuvalt erinevatest sellisele tarkvarale kohaldavatest nõuetest ja \n"
-#~ "mõjutatuna eri jurisdiktsioonide normidest peavad kliendid ja/või \n"
-#~ "lõppkasutajad olema kindlad, et nende asukohamaa jurisdiktsiooni \n"
-#~ "õiguslikud aktid lubavad neil alla laadida, säilitada ja/või kasutada \n"
-#~ "krüptograafiliste algoritmide realisatsioone sisaldavat tarkvara.\n"
-#~ "\n"
-#~ "Lisaks sellele peavad kliendid ja/või lõppkasutajad jälgima asukohamaa\n"
-#~ "juriidiliste normide täitmist. Kui klient ja/või lõppkasutaja rikub "
-#~ "kehtivaid\n"
-#~ "õigusnorme, kohaldatakse karistus vastavalt asukohamaa seadustele.\n"
-#~ "\n"
-#~ "Mitte mingil juhul ei kanna Mandrakesoft S.A. ega tarkvara tarnija\n"
-#~ "vastutust ei otseselt ega kaudselt tekkinud kahjude eest (kaasa arvatud,\n"
-#~ "kuid mitte ainult, saamatajäänud tulu, äritegevuse katkestamine, äriinfo\n"
-#~ "kaotsiminek ja muud rahalised kaotused ning võimalikud kohtu poolt välja\n"
-#~ "mõistetud hüvitused), mis tulenevad tarkvara, mis on kasutatav pärast\n"
-#~ "käesoleva lepingu tingimustega nõustumist, alla laadimisest, hoidmisest\n"
-#~ "või kasutamisest.\n"
-#~ "\n"
-#~ "Kõigi lepinguga seotud küsimuste asjus pöörduge palun aadressil:\n"
-#~ "Mandrakesoft, Inc.\n"
-#~ "2400 N. Lincoln Avenue Suite 243\n"
-#~ "Altadena California 91001\n"
-#~ "USA"
-
-#~ msgid "Proxy configuration"
-#~ msgstr "Vahendajate sätted"
-
-#~ msgid ""
-#~ "Welcome to the proxy configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be able to set up your http and ftp proxies\n"
-#~ "with or without login and password\n"
-#~ msgstr ""
-#~ "See on vahendajate sätete abivahend.\n"
-#~ "\n"
-#~ "Siin saate seadistada oma http- ja ftp-vahendajad\n"
-#~ "kas kasutajatunnust ja parooli kasutades või ilma selleta\n"
-
-#~ msgid ""
-#~ "Please fill in the http proxy informations\n"
-#~ "Leave it blank if you don't want an http proxy"
-#~ msgstr ""
-#~ "Täitke palun http-vahendaja info\n"
-#~ "Jätke tühjaks, kui Te ei soovi http-vahendajat"
-
-#~ msgid "URL"
-#~ msgstr "URL"
-
-#~ msgid "port"
-#~ msgstr "port"
-
-#~ msgid "Url should begin with 'http:'"
-#~ msgstr "URLi alguses peab olema 'http:'"
-
-#~ msgid "The port part should be numeric"
-#~ msgstr "Pordi number peab olema ikkagi number"
-
-#~ msgid ""
-#~ "Please fill in the ftp proxy informations\n"
-#~ "Leave it blank if you don't want an ftp proxy"
-#~ msgstr ""
-#~ "Täitke palun ftp-vahendaja info\n"
-#~ "Jätke tühjaks, kui Te ei soovi ftp-vahendajat"
-
-#~ msgid ""
-#~ "Please enter proxy login and password, if any.\n"
-#~ "Leave it blank if you don't want login/passwd"
-#~ msgstr ""
-#~ "Sisestage palun vajadusel vahendaja kasutajatunnus ja parool.\n"
-#~ "Jätke tühjaks, kui Te ei soovi kasutajatunnust/parooli"
-
-#~ msgid "login"
-#~ msgstr "kasutajatunnus"
-
-#~ msgid "password"
-#~ msgstr "parool"
-
-#~ msgid "re-type password"
-#~ msgstr "parool teist korda"
-
-#~ msgid "The passwords don't match. Try again!"
-#~ msgstr "Paroolid ei klapi. Proovige uuesti!"
-
-#~ msgid "Can't write file %s"
-#~ msgstr "Ei saa kirjutada faili %s"
-
-#~ msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
-#~ msgstr "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
-
-#~ msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-#~ msgstr "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-
-#~ msgid ""
-#~ "Warning, another internet connexion has been detected, maybe using your "
-#~ "network"
-#~ msgstr ""
-#~ "Hoiatus, avastati veel üks internetiühendus, mis võib-olla kasutab Teie "
-#~ "võrku"
-
-#~ msgid "no help implemented yet.\n"
-#~ msgstr "see ei ole (veel) kasutatav.\n"
-
-#~ msgid "Please click on a medium"
-#~ msgstr "Palun valige andmekandja"
-
-#~ msgid "Removing LPRng..."
-#~ msgstr "LPRng eemaldamine..."
-
-#~ msgid "Removing LPD..."
-#~ msgstr "LPD eemaldamine..."
-
-#~ msgid ""
-#~ "Description:\n"
-#~ "\n"
-#~ "  Drakbackup is used to backup your system.\n"
-#~ "  During the configuration you can select \n"
-#~ "\t- System files, \n"
-#~ "\t- Users files, \n"
-#~ "\t- Other files.\n"
-#~ "\tor All your system ...  and Other (like Windows Partitions)\n"
-#~ "\n"
-#~ "  Drakbackup allows you to backup your system on:\n"
-#~ "\t- Harddrive.\n"
-#~ "\t- NFS.\n"
-#~ "\t- CDROM (CDRW), DVDROM (with autoboot, rescue and autoinstall.).\n"
-#~ "\t- FTP.\n"
-#~ "\t- Rsync.\n"
-#~ "\t- Webdav.\n"
-#~ "\t- Tape.\n"
-#~ "\n"
-#~ "  Drakbackup allows you to restore your system to\n"
-#~ "  a user selected directory.\n"
-#~ "\n"
-#~ "  Per default all backup will be stored on your\n"
-#~ "  /var/lib/drakbackup directory\n"
-#~ "\n"
-#~ "  Configuration file:\n"
-#~ "\t/etc/drakconf/drakbackup/drakbakup.conf\n"
-#~ "\n"
-#~ "Restore Step:\n"
-#~ "  \n"
-#~ "  During the restore step, Drakbackup will remove\n"
-#~ "  your original directory and verify that all\n"
-#~ "  backup files are not corrupted. It is recommended\n"
-#~ "  you do a last backup before restoring.\n"
-#~ " \n"
-#~ "\n"
-#~ msgstr ""
-#~ "Kirjeldus:\n"
-#~ "\n"
-#~ "  Drakbackup aitab Teie süsteemist varukoopiaid teha.\n"
-#~ "  Seadistamise ajal saate valida \n"
-#~ "\t- süsteemsed failid, \n"
-#~ "\t- kasutaja failid, \n"
-#~ "\t- muud failid \n"
-#~ "\tvõi kogu süsteemi ...  ja muud (nt Windowsi partitsioonid)\n"
-#~ "\n"
-#~ "  Drakbackup võimaldab varundada järgmistele andmekandjatele:\n"
-#~ "\t- kõvaketas.\n"
-#~ "\t- NFS.\n"
-#~ "\t- CDROM (CDRW), DVDROM (automaatse alglaadimise, pääste- \n"
-#~ "ja automaatse paigalduse võimalustega).\n"
-#~ "\t- FTP.\n"
-#~ "\t- rsync.\n"
-#~ "\t- Webdav.\n"
-#~ "\t- lint.\n"
-#~ "\n"
-#~ "  Drakbackup võimaldab taastada süsteemi kasutaja\n"
-#~ "  määratud kataloogi.\n"
-#~ "\n"
-#~ "  Vaikimisi salvestatakse kõik varukoopiad\n"
-#~ "  kataloogi /var/lib/drakbackup.\n"
-#~ "\n"
-#~ "  Seadistustefail:\n"
-#~ "\t/etc/drakconf/drakbackup/drakbakup.conf\n"
-#~ "\n"
-#~ "Taastamise käik:\n"
-#~ "  \n"
-#~ "  Taastamise ajal eemaldab Drakbackup Teie\n"
-#~ "  originaalkataloogi ja kontrollib, et ükski varukoopia\n"
-#~ "  ei oleks vigane. Soovitatav on enne taastamist\n"
-#~ "  ette võtta veel üks varundamine.\n"
-#~ " \n"
-#~ "\n"
-
-#~ msgid ""
-#~ "drakbug version %s\n"
-#~ "Copyright (C) 2002 MandrakeSoft.\n"
-#~ "This is free software and may be redistributed under the terms of the GNU "
-#~ "GPL.\n"
-#~ "\n"
-#~ "usage: drakbug [OPTIONS] [PROGRAM_NAME]\n"
-#~ "\n"
-#~ "OPTIONS:\n"
-#~ msgstr ""
-#~ "drakbug versioon %s\n"
-#~ "Copyright (C) 2002 MandrakeSoft.\n"
-#~ "Käesolev rakendus on vaba tarkvara. Te võite seda edasi levitada\n"
-#~ " ja/või muuta vastavalt GNU Üldise Avaliku Litsentsi tingimustele.\n"
-#~ "\n"
-#~ "kasutamine: drakbug [VÕTMED] [RAKENDUSE_NIMI]\n"
-#~ "\n"
-#~ "VÕTMED:\n"
-
-#~ msgid "  --help            - print this help message.\n"
-#~ msgstr "  --help            - näitab seda abiteadet.\n"
-
-#~ msgid "  --report          - program should be one of mandrake tools\n"
-#~ msgstr ""
-#~ "  -report          - rakendus peaks olema üks mandrake vahenditest\n"
-
-#~ msgid "  --incident        - program should be one of mandrake tools\n"
-#~ msgstr ""
-#~ "  --incident        - rakendus peaks olema üks mandrake vahenditest\n"
-
-#~ msgid "usage: drakfloppy\n"
-#~ msgstr "kasutamine: drakfloppy\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Usage: harddrake [-h|--help] [--test]\n"
-#~ msgstr ""
-#~ "\n"
-#~ "kasutamine: harddrake [-h|--help] [--test]\n"
-
-#~ msgid "usage: keyboarddrake [--expert] [keyboard]\n"
-#~ msgstr "kasutamine: keyboarddrake [--expert] [keyboard]\n"
-
-#~ msgid "detected on interface %s"
-#~ msgstr "leiti liidesel %s"
-
-#~ msgid "Probing %s class\n"
-#~ msgstr "%s klassi proovimine\n"
-
-#~ msgid "Periodic Checks 2"
-#~ msgstr "Perioodiline kontroll 2"
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finances, such as gnucash"
+msgstr "Isiklike rahaasjade rakendused, näiteks gnucash"