updated po file

author: Pablo Saratxaga <pablo@mandriva.com> 2002-12-06 19:58:27 +0000
committer: Pablo Saratxaga <pablo@mandriva.com> 2002-12-06 19:58:27 +0000
commit: 56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2 (patch)
tree: a45ed0d08d1183f12467a51c92172ec3aa365f35 /perl-install/share
parent: 9d2f74d9efc493079e7db4eb62eff738e52f5140 (diff)
download: drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.tar
drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.tar.gz
drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.tar.bz2
drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.tar.xz
drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.zip
2 files changed, 11071 insertions, 7655 deletions
diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index 3a62efee5..0166da739 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -1,17 +1,18 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Riho Kurg <rx@linux.ee>, 1999-2001.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX VERSION\n"
-"POT-Creation-Date: 2002-09-20 11:43+0200\n"
-"PO-Revision-Date: 1999-10-28 19:54+0200\n"
-"Last-Translator: Riho Kurg <rx@linux.ee>\n"
-"Language-Team: Estonian <et@li.org>\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"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\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"
@@ -47,7 +48,7 @@ msgstr "32 MB"
 
 #: ../../Xconfig/card.pm_.c:24
 msgid "64 MB or more"
-msgstr "64 MB v�i rohkem"
+msgstr "64 MB või rohkem"
 
 #: ../../Xconfig/card.pm_.c:203
 msgid "Choose a X server"
@@ -67,66 +68,66 @@ msgid ""
 "Your system support multiple head configuration.\n"
 "What do you want to do?"
 msgstr ""
-"S�steemis on v�imalik kasutada mitut monitori.\n"
+"Süsteemis on võimalik kasutada mitut monitori.\n"
 "Mida Te soovite teha?"
 
-#: ../../Xconfig/card.pm_.c:286
+#: ../../Xconfig/card.pm_.c:288
 msgid "Select the memory size of your graphics card"
-msgstr "Valige graafikam�lu suurus"
+msgstr "Valige graafikamälu suurus"
 
-#: ../../Xconfig/card.pm_.c:347
+#: ../../Xconfig/card.pm_.c:349
 msgid "XFree configuration"
-msgstr "XFree s�tted"
+msgstr "XFree sätted"
 
-#: ../../Xconfig/card.pm_.c:349
+#: ../../Xconfig/card.pm_.c:351
 msgid "Which configuration of XFree do you want to have?"
-msgstr "Millise XFree konfiguratsiooni soovite kasutada?"
+msgstr "Millist XFree seadistust soovite kasutada?"
 
-#: ../../Xconfig/card.pm_.c:381
+#: ../../Xconfig/card.pm_.c:383
 msgid "Configure all heads independently"
-msgstr "Seadista k�ik monitorid s�ltumatult"
+msgstr "Seadista kõik monitorid sõltumatult"
 
-#: ../../Xconfig/card.pm_.c:382
+#: ../../Xconfig/card.pm_.c:384
 msgid "Use Xinerama extension"
 msgstr "Kasuta Xinerama laiendusi"
 
-#: ../../Xconfig/card.pm_.c:387
-#, fuzzy, c-format
+#: ../../Xconfig/card.pm_.c:389
+#, c-format
 msgid "Configure only card \"%s\"%s"
-msgstr "Seadista ainult kaart \"%s\" (%s)"
+msgstr "Seadista ainult kaart \"%s\"%s"
 
-#: ../../Xconfig/card.pm_.c:399 ../../Xconfig/card.pm_.c:400
+#: ../../Xconfig/card.pm_.c:401 ../../Xconfig/card.pm_.c:402
 #: ../../Xconfig/various.pm_.c:23
 #, c-format
 msgid "XFree %s"
-msgstr "XFree86 %s"
+msgstr "XFree %s"
 
-#: ../../Xconfig/card.pm_.c:411 ../../Xconfig/card.pm_.c:437
+#: ../../Xconfig/card.pm_.c:413 ../../Xconfig/card.pm_.c:439
 #: ../../Xconfig/various.pm_.c:23
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s koos 3D graafikakiirendi toega"
 
-#: ../../Xconfig/card.pm_.c:414
+#: ../../Xconfig/card.pm_.c:416
 #, 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."
 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."
+"XFree %s toetab Teie videokaarti ja võib omada paremat 2D tuge."
 
-#: ../../Xconfig/card.pm_.c:416 ../../Xconfig/card.pm_.c:439
+#: ../../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."
 
-#: ../../Xconfig/card.pm_.c:424 ../../Xconfig/card.pm_.c:445
+#: ../../Xconfig/card.pm_.c:426 ../../Xconfig/card.pm_.c:447
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s koos EKSPERIMENTAALSE 3D kiirendi toega"
 
-#: ../../Xconfig/card.pm_.c:427
+#: ../../Xconfig/card.pm_.c:429
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -134,29 +135,28 @@ msgid ""
 "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"
+"SEE ON AGA EKSPERIMENTAALNE JA VÕIB OLLA EBASTABIILNE.\n"
 "Teie kaarti toetab ka XFree %s, millel on ehk parem 2D tugi."
 
-#: ../../Xconfig/card.pm_.c:430 ../../Xconfig/card.pm_.c:447
+#: ../../Xconfig/card.pm_.c:432 ../../Xconfig/card.pm_.c:449
 #, 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."
+"SEE ON AGA EKSPERIMENTAALNE JA VÕIB OLLA EBASTABIILNE."
 
-#: ../../Xconfig/card.pm_.c:453
+#: ../../Xconfig/card.pm_.c:455
 msgid "Xpmac (installation display driver)"
-msgstr ""
+msgstr "Xpmac (paigalduse kuvadraiver)"
 
 #: ../../Xconfig/main.pm_.c:76 ../../Xconfig/main.pm_.c:77
-#: ../../Xconfig/monitor.pm_.c:96 ../../any.pm_.c:978
+#: ../../Xconfig/monitor.pm_.c:96 ../../any.pm_.c:961
 msgid "Custom"
 msgstr "Isetehtud"
 
 #: ../../Xconfig/main.pm_.c:102
-#, fuzzy
 msgid "Graphic Card"
 msgstr "Graafikakaart"
 
@@ -164,38 +164,39 @@ msgstr "Graafikakaart"
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfig/main.pm_.c:108 ../../Xconfig/resolution_and_depth.pm_.c:209
+#: ../../Xconfig/main.pm_.c:108 ../../Xconfig/resolution_and_depth.pm_.c:210
 msgid "Resolution"
 msgstr "Kuvatihedus"
 
 #: ../../Xconfig/main.pm_.c:113
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:67
-#: ../../diskdrake/interactive.pm_.c:385 ../../diskdrake/removable.pm_.c:25
-#: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:86
+#: ../../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:268
-#: ../../install_gtk.pm_.c:79 ../../install_steps_gtk.pm_.c:275
+#: ../../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:354 ../../interactive/http.pm_.c:104
-#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
+#: ../../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:166
-#: ../../standalone/drakbackup_.c:3974 ../../standalone/drakbackup_.c:4069
-#: ../../standalone/drakbackup_.c:4088
+#: ../../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 "OK"
+msgstr "Olgu"
 
 #: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3207
-#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:225
+#: ../../printer/printerdrake.pm_.c:2970 ../../standalone/draksplash_.c:114
+#: ../../standalone/harddrake2_.c:152 ../../standalone/logdrake_.c:204
 msgid "Quit"
-msgstr "V�lju"
+msgstr "Välju"
 
 #: ../../Xconfig/main.pm_.c:145
 #, c-format
@@ -205,8 +206,8 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"S�ilita muutused?\n"
-"Olemasolevad s�tted:\n"
+"Kas säilitada muudatused?\n"
+"Olemasolevad sätted:\n"
 "\n"
 "%s"
 
@@ -216,20 +217,20 @@ msgstr "Valige monitor"
 
 #: ../../Xconfig/monitor.pm_.c:97
 msgid "Plug'n Play"
-msgstr ""
+msgstr "Plug'n Play"
 
 #: ../../Xconfig/monitor.pm_.c:98 ../../mouse.pm_.c:46
 msgid "Generic"
 msgstr "Tavaline"
 
-#: ../../Xconfig/monitor.pm_.c:99 ../../harddrake/ui.pm_.c:37
-#, fuzzy
+#: ../../Xconfig/monitor.pm_.c:99 ../../standalone/harddrake2_.c:67
+#: ../../standalone/harddrake2_.c:68
 msgid "Vendor"
-msgstr "Tagasi"
+msgstr "Tootja"
 
 #: ../../Xconfig/monitor.pm_.c:109
 msgid "Plug'n Play probing failed. Please choose a precise monitor"
-msgstr ""
+msgstr "Plug'n Play test ebaõnnestus. Palun valige monitor täpsemalt"
 
 #: ../../Xconfig/monitor.pm_.c:114
 msgid ""
@@ -244,12 +245,13 @@ msgid ""
 "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"
+"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."
+"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"
@@ -261,71 +263,72 @@ msgstr "Ekraaniuuendussagedus"
 
 #: ../../Xconfig/resolution_and_depth.pm_.c:12
 msgid "256 colors (8 bits)"
-msgstr "256 v�rvi (8 bitti)"
+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)"
+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)"
+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)"
+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)"
+msgstr "4 miljardit värvi (32 bitti)"
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:129
+#: ../../Xconfig/resolution_and_depth.pm_.c:130
 msgid "Resolutions"
 msgstr "Kuvatihedused"
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:254
+#: ../../Xconfig/resolution_and_depth.pm_.c:255
 msgid "Choose the resolution and the color depth"
-msgstr "Valige kuvatihedus ja v�rvis�gavus"
+msgstr "Valige kuvatihedus ja värvisügavus"
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:255
+#: ../../Xconfig/resolution_and_depth.pm_.c:256
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Graafikakaart: %s"
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:268 ../../any.pm_.c:1019
-#: ../../bootlook.pm_.c:344 ../../diskdrake/smbnfs_gtk.pm_.c:87
-#: ../../install_steps_gtk.pm_.c:406 ../../install_steps_gtk.pm_.c:464
-#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:354
-#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195
+#: ../../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:42 ../../printerdrake.pm_.c:2169
-#: ../../security/main.pm_.c:216 ../../standalone/drakautoinst_.c:203
-#: ../../standalone/drakbackup_.c:3928 ../../standalone/drakbackup_.c:3961
-#: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
-#: ../../standalone/drakbackup_.c:4041 ../../standalone/drakbackup_.c:4101
-#: ../../standalone/drakbackup_.c:4128 ../../standalone/drakbackup_.c:4158
-#: ../../standalone/drakbackup_.c:4184 ../../standalone/drakconnect_.c:115
-#: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
-#: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
-#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:560 ../../standalone/logdrake_.c:225
-#: ../../ugtk.pm_.c:296
+#: ../../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:30
+#: ../../Xconfig/test.pm_.c:29
 msgid "Test of the configuration"
 msgstr "Proovime seadistusi"
 
-#: ../../Xconfig/test.pm_.c:31
+#: ../../Xconfig/test.pm_.c:30
 msgid "Do you want to test the configuration?"
 msgstr "Kas soovite seadistusi proovida?"
 
-#: ../../Xconfig/test.pm_.c:31
-#, fuzzy
+#: ../../Xconfig/test.pm_.c:30
 msgid "Warning: testing this graphic card may freeze your computer"
-msgstr "Hoiatus: testimine v�ib Teie arvuti peatada"
+msgstr "Hoiatus: selle graafikakaardi test võib Teie arvuti peatada"
 
 #: ../../Xconfig/various.pm_.c:29
 #, c-format
@@ -335,7 +338,7 @@ msgstr "Klaviatuuriasetus: %s\n"
 #: ../../Xconfig/various.pm_.c:30
 #, c-format
 msgid "Mouse type: %s\n"
-msgstr "Hiire t��p: %s\n"
+msgstr "Hiire tüüp: %s\n"
 
 #: ../../Xconfig/various.pm_.c:31
 #, c-format
@@ -365,12 +368,12 @@ msgstr "Graafikakaart: %s\n"
 #: ../../Xconfig/various.pm_.c:36
 #, c-format
 msgid "Graphics memory: %s kB\n"
-msgstr "Videom�lu: %s kB\n"
+msgstr "Videomälu: %s kB\n"
 
 #: ../../Xconfig/various.pm_.c:38
 #, c-format
 msgid "Color depth: %s\n"
-msgstr "V�rvis�gavus: %s\n"
+msgstr "Värvisügavus: %s\n"
 
 #: ../../Xconfig/various.pm_.c:39
 #, c-format
@@ -389,7 +392,7 @@ msgstr "XFree86 juhtprogramm: %s\n"
 
 #: ../../Xconfig/various.pm_.c:61
 msgid "Graphical interface at startup"
-msgstr "X stardib n��d"
+msgstr "X käivitub koos süsteemiga"
 
 #: ../../Xconfig/various.pm_.c:62
 msgid ""
@@ -397,7 +400,7 @@ msgid ""
 "(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"
+"Teie arvutis on võimalik käivitada X juba alglaadimisel.\n"
 "Kas soovite nii teha?"
 
 #: ../../Xconfig/various.pm_.c:73
@@ -411,168 +414,174 @@ msgid ""
 "\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"
+"Ühendage arvuti televiisoriga enne alglaadimist ja valige laademenüüst\n"
+" \"TVout\" \n"
+"\n"
+"Kas soovite seda kasutama hakata?"
 
 #: ../../Xconfig/various.pm_.c:85
-#, fuzzy
 msgid "What norm is your TV using?"
-msgstr "Millist ISDN �hendust kasutate?"
+msgstr "Millist TV-standardit Te kasutate?"
 
-#: ../../any.pm_.c:108 ../../any.pm_.c:133
+#: ../../any.pm_.c:107 ../../any.pm_.c:132
 msgid "First sector of boot partition"
 msgstr "Partitsiooni algusesse"
 
-#: ../../any.pm_.c:108 ../../any.pm_.c:133 ../../any.pm_.c:210
+#: ../../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:112
+#: ../../any.pm_.c:111
 msgid "SILO Installation"
-msgstr "SILO installimine"
+msgstr "SILO paigaldamine"
 
-#: ../../any.pm_.c:113 ../../any.pm_.c:126
+#: ../../any.pm_.c:112 ../../any.pm_.c:125
 msgid "Where do you want to install the bootloader?"
-msgstr "Kuhu soovite alglaaduri installida"
+msgstr "Kuhu soovite alglaaduri paigaldada?"
 
-#: ../../any.pm_.c:125
+#: ../../any.pm_.c:124
 msgid "LILO/grub Installation"
-msgstr "LILO/grub installimine"
+msgstr "LILO/grub paigaldamine"
 
-#: ../../any.pm_.c:137 ../../any.pm_.c:151
+#: ../../any.pm_.c:136 ../../any.pm_.c:150
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:139
+#: ../../any.pm_.c:138
 msgid "LILO with text menu"
 msgstr "LILO tekstiresiimis"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:151
+#: ../../any.pm_.c:139 ../../any.pm_.c:150
 msgid "LILO with graphical menu"
 msgstr "LILO graafikaresiimis"
 
-#: ../../any.pm_.c:143
+#: ../../any.pm_.c:142
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:147
+#: ../../any.pm_.c:146
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr "Laadimine DOS/Windowsist (loadlin)"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:151
+#: ../../any.pm_.c:148 ../../any.pm_.c:150
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:159 ../../any.pm_.c:190
+#: ../../any.pm_.c:158 ../../any.pm_.c:189
 msgid "Bootloader main options"
-msgstr "Alglaaduri peas�tted"
+msgstr "Alglaaduri peasätted"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:191
+#: ../../any.pm_.c:159 ../../any.pm_.c:190
 msgid "Bootloader to use"
 msgstr "Eelistatav alglaadur"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:161
 msgid "Bootloader installation"
-msgstr "Alglaaduri peas�tted"
+msgstr "Alglaaduri paigaldus"
 
-#: ../../any.pm_.c:164 ../../any.pm_.c:193
+#: ../../any.pm_.c:163 ../../any.pm_.c:192
 msgid "Boot device"
 msgstr "Alglaadimisseade"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:164
 msgid "Compact"
 msgstr "Kompaktne"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:164
 msgid "compact"
 msgstr "kompaktne"
 
-#: ../../any.pm_.c:166 ../../any.pm_.c:291
+#: ../../any.pm_.c:165 ../../any.pm_.c:289
 msgid "Video mode"
 msgstr "Graafikamood"
 
-#: ../../any.pm_.c:168
+#: ../../any.pm_.c:167
 msgid "Delay before booting default image"
 msgstr "Ooteaeg alglaadimisel"
 
-#: ../../any.pm_.c:170 ../../any.pm_.c:789
+#: ../../any.pm_.c:169 ../../any.pm_.c:772
 #: ../../diskdrake/smbnfs_gtk.pm_.c:179
-#: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
-#: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
-#: ../../standalone/drakconnect_.c:649
+#: ../../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"
+msgstr "Salasõna"
 
-#: ../../any.pm_.c:171 ../../any.pm_.c:790
-#: ../../install_steps_interactive.pm_.c:1098
+#: ../../any.pm_.c:170 ../../any.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:1078
 msgid "Password (again)"
-msgstr "Salas�na (uuesti)"
+msgstr "Salasõna (uuesti)"
 
-#: ../../any.pm_.c:172
+#: ../../any.pm_.c:171
 msgid "Restrict command line options"
-msgstr "Piira k�surea suvandeid"
+msgstr "Piira käsurea suvandeid"
 
-#: ../../any.pm_.c:172
+#: ../../any.pm_.c:171
 msgid "restrict"
 msgstr "piiratud"
 
-#: ../../any.pm_.c:174
+#: ../../any.pm_.c:173
 msgid "Clean /tmp at each boot"
 msgstr "Puhasta /tmp igal laadimisel"
 
-#: ../../any.pm_.c:175
+#: ../../any.pm_.c:174
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
-msgstr "Kui vaja, t�psusta RAM suurust (leitud %d MB)"
+msgstr "Kui vaja, täpsusta RAM suurust (leitud %d MB)"
 
-#: ../../any.pm_.c:177
+#: ../../any.pm_.c:176
 msgid "Enable multi profiles"
-msgstr "V�imalda mitut profiili"
+msgstr "Võimalda mitut profiili"
 
-#: ../../any.pm_.c:181
+#: ../../any.pm_.c:180
 msgid "Give the ram size in MB"
-msgstr "Anna m�lu suurus megabaitides"
+msgstr "Anna mälu suurus megabaitides"
 
-#: ../../any.pm_.c:183
+#: ../../any.pm_.c:182
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
-msgstr "S�te ``Piira k�surea suvandeid'' on ilma salas�nata mittekasutatav"
+msgstr "Säte ``Piira käsurea suvandeid'' ei ole kasutatav ilma salasõnata"
 
-#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../diskdrake/interactive.pm_.c:1195
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../any.pm_.c:183 ../../any.pm_.c:748
+#: ../../diskdrake/interactive.pm_.c:1204
+#: ../../install_steps_interactive.pm_.c:1072
 msgid "Please try again"
 msgstr "Palun proovige veel"
 
-#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../any.pm_.c:183 ../../any.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:1072
 msgid "The passwords do not match"
-msgstr "Salas�nad ei klapi"
+msgstr "Salasõnad ei klapi"
 
-#: ../../any.pm_.c:192
+#: ../../any.pm_.c:191
 msgid "Init Message"
 msgstr "Initsialiseerimisteade"
 
-#: ../../any.pm_.c:194
+#: ../../any.pm_.c:193
 msgid "Open Firmware Delay"
 msgstr "Open Firmware viivitus"
 
-#: ../../any.pm_.c:195
+#: ../../any.pm_.c:194
 msgid "Kernel Boot Timeout"
 msgstr "Ajapiirang kerneli laadimisel"
 
-#: ../../any.pm_.c:196
+#: ../../any.pm_.c:195
 msgid "Enable CD Boot?"
 msgstr "CD-lt laadimine lubatud?"
 
-#: ../../any.pm_.c:197
+#: ../../any.pm_.c:196
 msgid "Enable OF Boot?"
 msgstr "OF laadimine lubatud?"
 
-#: ../../any.pm_.c:198
+#: ../../any.pm_.c:197
 msgid "Default OS?"
 msgstr "Vaikimisi OS?"
 
-#: ../../any.pm_.c:232
+#: ../../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: "
@@ -580,187 +589,194 @@ msgid ""
 "\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_.c:248
+#: ../../any.pm_.c:247
 msgid ""
 "Here are the entries on your boot menu so far.\n"
 "You can add some more or change the existing ones."
 msgstr ""
 "Praegu on kasutusel sellised kirjed.\n"
-"Te v�ite neid lisada ning olemasolevaid muuta."
+"Te võite neid lisada ning olemasolevaid muuta."
 
-#: ../../any.pm_.c:258 ../../standalone/drakbackup_.c:1560
-#: ../../standalone/drakbackup_.c:1673 ../../standalone/drakfont_.c:1011
-#: ../../standalone/drakfont_.c:1054
+#: ../../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:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
-#: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
+#: ../../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
-#: ../../printerdrake.pm_.c:3207 ../../standalone/drakbackup_.c:2774
+#: ../../printer/printerdrake.pm_.c:2970 ../../standalone/drakbackup_.c:2726
 msgid "Done"
 msgstr "Tehtud"
 
-#: ../../any.pm_.c:258
-#, fuzzy
+#: ../../any.pm_.c:257
 msgid "Modify"
-msgstr "Modifitseeri RAIDi"
+msgstr "Muuda"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:265
 msgid "Which type of entry do you want to add?"
-msgstr "Millisele sektorile soovite seda t�sta?"
+msgstr "Millisele sektorile soovite seda tõsta?"
 
-#: ../../any.pm_.c:267 ../../standalone/drakbackup_.c:1707
+#: ../../any.pm_.c:266 ../../standalone/drakbackup_.c:1674
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:266
 msgid "Other OS (SunOS...)"
 msgstr "Muu OS (SunOS...)"
 
-#: ../../any.pm_.c:268
+#: ../../any.pm_.c:267
 msgid "Other OS (MacOS...)"
 msgstr "Muu OS (MacOS...)"
 
-#: ../../any.pm_.c:268
+#: ../../any.pm_.c:267
 msgid "Other OS (windows...)"
 msgstr "Muu OS (windows...)"
 
-#: ../../any.pm_.c:287
+#: ../../any.pm_.c:285
 msgid "Image"
 msgstr "Laadefail"
 
-#: ../../any.pm_.c:288 ../../any.pm_.c:299
+#: ../../any.pm_.c:286 ../../any.pm_.c:297
 msgid "Root"
 msgstr "Juur"
 
-#: ../../any.pm_.c:289 ../../any.pm_.c:317
+#: ../../any.pm_.c:287 ../../any.pm_.c:315
 msgid "Append"
-msgstr "Lisada"
+msgstr "Lisand"
 
-#: ../../any.pm_.c:293
+#: ../../any.pm_.c:291
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:292
 msgid "Read-write"
 msgstr "Read-write"
 
-#: ../../any.pm_.c:301
+#: ../../any.pm_.c:299
 msgid "Table"
 msgstr "Tabel"
 
-#: ../../any.pm_.c:302
+#: ../../any.pm_.c:300
 msgid "Unsafe"
 msgstr "Ebaturvaline"
 
-#: ../../any.pm_.c:309 ../../any.pm_.c:314 ../../any.pm_.c:316
+#: ../../any.pm_.c:307 ../../any.pm_.c:312 ../../any.pm_.c:314
 msgid "Label"
-msgstr "T�his"
+msgstr "Pealdis"
 
-#: ../../any.pm_.c:311 ../../any.pm_.c:321 ../../harddrake/v4l.pm_.c:200
+#: ../../any.pm_.c:309 ../../any.pm_.c:319 ../../harddrake/v4l.pm_.c:215
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: ../../any.pm_.c:318
+#: ../../any.pm_.c:316
 msgid "Initrd-size"
 msgstr "Initrd suurus"
 
-#: ../../any.pm_.c:320
+#: ../../any.pm_.c:318
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: ../../any.pm_.c:328
+#: ../../any.pm_.c:326
 msgid "Remove entry"
 msgstr "Eemalda kirje"
 
-#: ../../any.pm_.c:331
+#: ../../any.pm_.c:329
 msgid "Empty label not allowed"
-msgstr "T�hi kirjet�his ei ole lubatud"
+msgstr "Tühi kirjetähis ei ole lubatud"
 
-#: ../../any.pm_.c:332
+#: ../../any.pm_.c:330
 msgid "You must specify a kernel image"
-msgstr ""
+msgstr "Teil peab olema kerneli laadepilt"
 
-#: ../../any.pm_.c:332
-#, fuzzy
+#: ../../any.pm_.c:330
 msgid "You must specify a root partition"
-msgstr "Teil peab olema saaleala"
+msgstr "Teil peab olema juurpartitsioon"
 
-#: ../../any.pm_.c:333
+#: ../../any.pm_.c:331
 msgid "This label is already used"
-msgstr "Selline t�his on juba kasutusel"
+msgstr "Selline pealdis on juba kasutusel"
 
-#: ../../any.pm_.c:657
+#: ../../any.pm_.c:640
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Leiti %s %s liidest"
 
-#: ../../any.pm_.c:658
+#: ../../any.pm_.c:641
 msgid "Do you have another one?"
 msgstr "On Teil veel kaarte?"
 
-#: ../../any.pm_.c:659
+#: ../../any.pm_.c:642
 #, c-format
 msgid "Do you have any %s interfaces?"
-msgstr "Kas Teil on ikka m�ni %s liides?"
+msgstr "Kas Teil on ikka mõni %s liides?"
 
-#: ../../any.pm_.c:661 ../../any.pm_.c:824 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:286
+#: ../../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:661 ../../any.pm_.c:823 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:286
+#: ../../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:662
+#: ../../any.pm_.c:645
 msgid "See hardware info"
 msgstr "Info riistvara kohta"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:678
+#: ../../any.pm_.c:662
 #, c-format
 msgid "Installing driver for %s card %s"
-msgstr "Installime juhtprogrammil %s kaardile %s"
+msgstr "Paigaldame juhtprogrammi %s kaardile %s"
 
-#: ../../any.pm_.c:679
+#: ../../any.pm_.c:663
 #, c-format
 msgid "(module %s)"
 msgstr "(moodul %s)"
 
-#: ../../any.pm_.c:690
+#: ../../any.pm_.c:674
 #, 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'"
 
-#: ../../any.pm_.c:696
+#: ../../any.pm_.c:680
 #, 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\""
+"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:698
+#: ../../any.pm_.c:682
 msgid "Module options:"
 msgstr "Mooduli parameetrid:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:710
+#: ../../any.pm_.c:694
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Millist %s juhtprogrammi peaksime proovima?"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:703
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -771,84 +787,85 @@ msgid ""
 "should\n"
 "not cause any damage."
 msgstr ""
-"M�nedel juhtudel vajab %s juhtprogramm t��ks lisainformatsiooni\n"
+"Mõnedel juhtudel vajab %s juhtprogramm tööks lisainformatsiooni,\n"
 "kuigi tavaliselt saab ka ilma hakkama. Kas soovite eraldi parameetreid\n"
-"m��ratleda 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."
+"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:723
+#: ../../any.pm_.c:707
 msgid "Autoprobe"
 msgstr "Proovida niisama"
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:707
 msgid "Specify options"
-msgstr "M��rake parameetrid"
+msgstr "Määrata parameetrid"
 
-#: ../../any.pm_.c:735
+#: ../../any.pm_.c:719
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
 "Do you want to try again with other parameters?"
 msgstr ""
-"Moodule %s laadimine ei �nnestunud.\n"
+"Mooduli %s laadimine ei õnnestunud.\n"
 "Kas soovite proovida parameetreid muuta?"
 
-#: ../../any.pm_.c:751
+#: ../../any.pm_.c:734
 msgid "access to X programs"
-msgstr ""
+msgstr "ligipääs X-i rakendustele"
 
-#: ../../any.pm_.c:752
+#: ../../any.pm_.c:735
 msgid "access to rpm tools"
-msgstr ""
+msgstr "ligipääs rpm vahenditele"
 
-#: ../../any.pm_.c:753
+#: ../../any.pm_.c:736
 msgid "allow \"su\""
-msgstr ""
+msgstr "\"su\" lubamine"
 
-#: ../../any.pm_.c:754
+#: ../../any.pm_.c:737
 msgid "access to administrative files"
-msgstr ""
+msgstr "ligipääs administreerimisfailidele"
 
-#: ../../any.pm_.c:755
+#: ../../any.pm_.c:738
 msgid "access to network tools"
-msgstr ""
+msgstr "ligipääs võrgutöövahenditele"
 
-#: ../../any.pm_.c:756
+#: ../../any.pm_.c:739
 msgid "access to compilation tools"
-msgstr ""
+msgstr "ligipääs kompileerimisvahenditele"
 
-#: ../../any.pm_.c:761
+#: ../../any.pm_.c:744
 #, c-format
 msgid "(already added %s)"
 msgstr "(juba lisatud %s)"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:749
 msgid "This password is too simple"
-msgstr "Salas�na on liiga lihtne"
+msgstr "Salasõna on liiga lihtne"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:750
 msgid "Please give a user name"
 msgstr "Palun andke kasutajatunnus"
 
-#: ../../any.pm_.c:768
+#: ../../any.pm_.c:751
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
-msgstr "Kasutajatunnus tohib sisaldada ainult v�ikesi t�hti, numbreid, - ja _"
+msgstr ""
+"Kasutajatunnus tohib sisaldada ainult väikesi tähti, numbreid ning märke '-' "
+"ja '_'"
 
-#: ../../any.pm_.c:769
-#, fuzzy
+#: ../../any.pm_.c:752
 msgid "The user name is too long"
-msgstr "See kasutajatunnus on juba lisatud"
+msgstr "See kasutajatunnus on liiga pikk"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:753
 msgid "This user name is already added"
 msgstr "See kasutajatunnus on juba lisatud"
 
-#: ../../any.pm_.c:774
+#: ../../any.pm_.c:757
 msgid "Add user"
 msgstr "Lisa kasutaja"
 
-#: ../../any.pm_.c:775
+#: ../../any.pm_.c:758
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -857,91 +874,90 @@ msgstr ""
 "Sisesta kasutaja\n"
 "%s"
 
-#: ../../any.pm_.c:776
+#: ../../any.pm_.c:759
 msgid "Accept user"
-msgstr "Kasutaja �ige"
+msgstr "Kasutaja õige"
 
-#: ../../any.pm_.c:787
+#: ../../any.pm_.c:770
 msgid "Real name"
-msgstr "P�risnimi"
+msgstr "Pärisnimi"
 
-#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:864
-#: ../../printerdrake.pm_.c:979
+#: ../../any.pm_.c:771 ../../printer/printerdrake.pm_.c:802
+#: ../../printer/printerdrake.pm_.c:915
 msgid "User name"
 msgstr "Kasutajatunnus"
 
-#: ../../any.pm_.c:791
+#: ../../any.pm_.c:774
 msgid "Shell"
-msgstr "K�surida"
+msgstr "Käsurida"
 
-#: ../../any.pm_.c:793
+#: ../../any.pm_.c:776
 msgid "Icon"
 msgstr "Ikoon"
 
-#: ../../any.pm_.c:820
+#: ../../any.pm_.c:803
 msgid "Autologin"
 msgstr "Vaikimisi sisenemine"
 
-#: ../../any.pm_.c:821
-#, fuzzy
+#: ../../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"
-"Kui Te seda ei soovi, valige <Katkesta>"
+"Kas soovite seda võimalust kasutada?"
 
-#: ../../any.pm_.c:825
+#: ../../any.pm_.c:808
 msgid "Choose the default user:"
-msgstr "Valige uus vaikimisi kasutaja :"
+msgstr "Valige vaikimisi kasutaja:"
 
-#: ../../any.pm_.c:826
+#: ../../any.pm_.c:809
 msgid "Choose the window manager to run:"
-msgstr "Valige palun k�ivitatav aknahaldur:"
+msgstr "Valige palun käivitatav aknahaldur:"
 
-#: ../../any.pm_.c:841
-#, fuzzy
+#: ../../any.pm_.c:824
 msgid "Please choose a language to use."
-msgstr "Palun valige kasutatav keel"
+msgstr "Palun valige kasutatav keel."
 
-#: ../../any.pm_.c:843
+#: ../../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 "Teisi keeli saab valida p�rast installimist"
+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_.c:857 ../../install_steps_interactive.pm_.c:690
-#: ../../standalone/drakxtv_.c:73
+#: ../../any.pm_.c:840 ../../install_steps_interactive.pm_.c:697
+#: ../../standalone/drakxtv_.c:70
 msgid "All"
-msgstr "K�ik"
+msgstr "Kõik"
 
-#: ../../any.pm_.c:978
-#, fuzzy
+#: ../../any.pm_.c:961
 msgid "Allow all users"
-msgstr "Tavakasutaja"
+msgstr "Lubatud kõigile kasutajatele"
 
-#: ../../any.pm_.c:978
-#, fuzzy
+#: ../../any.pm_.c:961
 msgid "No sharing"
-msgstr "CUPS k�ivitatakse"
+msgstr "Jagamiseta"
 
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:66
-#, fuzzy, c-format
+#: ../../any.pm_.c:971 ../../install_any.pm_.c:1207 ../../standalone.pm_.c:185
+#, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
-msgstr "Valige paketid mida soovite installida"
+msgstr "Pakett %s tuleks kindlasti paigaldada. Kas soovite seda teha?"
 
-#: ../../any.pm_.c:991
+#: ../../any.pm_.c:973
 msgid ""
 "You can export using NFS or Samba. Please select which you'd like to use."
-msgstr ""
+msgstr "Eksportida saab NFS või Samba abil. Palun valige, kumba kasutada."
 
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:71
+#: ../../any.pm_.c:981 ../../install_any.pm_.c:1212 ../../standalone.pm_.c:190
 #, c-format
 msgid "Mandatory package %s is missing"
-msgstr ""
+msgstr "Puudub kohustuslik pakett %s"
 
-#: ../../any.pm_.c:1005
+#: ../../any.pm_.c:987
 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 "
@@ -949,75 +965,81 @@ msgid ""
 "\n"
 "\"Custom\" permit a per-user granularity.\n"
 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"
+"\n"
+"\"Isetehtud\" lubab määrata seda kasutajate kaupa.\n"
 
-#: ../../any.pm_.c:1019
+#: ../../any.pm_.c:1001
 msgid "Launch userdrake"
-msgstr ""
+msgstr "Userdrake käivitamine"
 
-#: ../../any.pm_.c:1021
+#: ../../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:1072
+#: ../../any.pm_.c:1053 ../../security/level.pm_.c:7
 msgid "Welcome To Crackers"
-msgstr "Tere tulemast, kr�kkerid"
+msgstr "Tere tulemast, kräkkerid"
 
-#: ../../any.pm_.c:1073
+#: ../../any.pm_.c:1054 ../../security/level.pm_.c:8
 msgid "Poor"
-msgstr "V�hene"
+msgstr "Vähene"
 
-#: ../../any.pm_.c:1074 ../../mouse.pm_.c:31
+#: ../../any.pm_.c:1055 ../../mouse.pm_.c:31 ../../security/level.pm_.c:9
 msgid "Standard"
-msgstr "Tavahiir"
+msgstr "Standardne"
 
-#: ../../any.pm_.c:1075
+#: ../../any.pm_.c:1056 ../../security/level.pm_.c:10
 msgid "High"
-msgstr "K�rge"
+msgstr "Kõrge"
 
-#: ../../any.pm_.c:1076
-#, fuzzy
+#: ../../any.pm_.c:1057 ../../security/level.pm_.c:11
 msgid "Higher"
-msgstr "K�rge"
+msgstr "Veel kõrgem"
 
-#: ../../any.pm_.c:1077
+#: ../../any.pm_.c:1058 ../../security/level.pm_.c:12
 msgid "Paranoid"
 msgstr "Paranoiline"
 
-#: ../../any.pm_.c:1080
+#: ../../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 ""
-"Seda tase muudab k�ll s�steemi lihtsalt kasutatavaks, kui v�ga\n"
-"haavatavaks: ligip��supiirangute puudumise t�ttu ei peaks arvutit �hendama\n"
+"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_.c:1083
+#: ../../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."
+"Salasõnad on nüüd kasutusel, kuid võrku ühendamine ei ole siiski soovitav."
 
-#: ../../any.pm_.c:1084
-#, fuzzy
+#: ../../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."
+"See on sobilik turvatase arvutile, mis ühendatakse Internetti kui klient."
 
-#: ../../any.pm_.c:1085
+#: ../../any.pm_.c:1066
 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."
 
-#: ../../any.pm_.c:1086
-#, fuzzy
+#: ../../any.pm_.c:1067
 msgid ""
 "With this security level, the use of this system as a server becomes "
 "possible.\n"
@@ -1025,60 +1047,61 @@ msgid ""
 "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."
+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."
 
-#: ../../any.pm_.c:1089
-#, fuzzy
+#: ../../any.pm_.c:1070
 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."
+"Süsteem on täielikult suletud. Võrgust kasutamine on võimalik ainult\n"
+"spetsiaalselt loodud juurdepääsuteid kasutades."
 
-#: ../../any.pm_.c:1095
-#, fuzzy
+#: ../../any.pm_.c:1076
 msgid "DrakSec Basic Options"
-msgstr "Eelistused"
+msgstr "DrakSeci põhiseadistused"
 
-#: ../../any.pm_.c:1096
-#, fuzzy
+#: ../../any.pm_.c:1077
 msgid "Please choose the desired security level"
-msgstr "Valige turvatase"
+msgstr "Palun valige meelepärane turvatase"
 
-#: ../../any.pm_.c:1099
-#, fuzzy
+#: ../../any.pm_.c:1080
 msgid "Security level"
-msgstr "Turvataseme seadmine"
+msgstr "Turvatase"
 
-#: ../../any.pm_.c:1101
-#, fuzzy
+#: ../../any.pm_.c:1082
 msgid "Use libsafe for servers"
-msgstr "Valige X server"
+msgstr "Serveritel kasutatakse libsafe'i"
 
-#: ../../any.pm_.c:1102
+#: ../../any.pm_.c:1083
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
-msgstr ""
+msgstr "Teek, mis kaitseb puhvri ületäite ja vormingustringide rünnaku vastu."
 
-#: ../../any.pm_.c:1103
+#: ../../any.pm_.c:1084
 msgid "Security Administrator (login or email)"
-msgstr ""
+msgstr "Turvaadministraator (kasutajatunnus või e-posti aadress)"
 
-#: ../../any.pm_.c:1192
+#: ../../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)"
 
 # 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:429
+#: ../../bootloader.pm_.c:436
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -1103,232 +1126,223 @@ 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:989
+#: ../../bootloader.pm_.c:983
 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:992
+#: ../../bootloader.pm_.c:986
 #, 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:995
+#: ../../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:998
+#: ../../bootloader.pm_.c:992
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "suvandeid enne laadimist ja 'c' veel enam."
 
 #. -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:1001
+#: ../../bootloader.pm_.c:995
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr "Valik laetakse automaatselt %d sekundi jooksul"
 
-#: ../../bootloader.pm_.c:1005
+#: ../../bootloader.pm_.c:999
 msgid "not enough room in /boot"
-msgstr "/boot on liiga t�is"
+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:1105
+#: ../../bootloader.pm_.c:1099
 msgid "Desktop"
-msgstr "T��laud"
+msgstr "Töölaud"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:1107
+#: ../../bootloader.pm_.c:1101
 msgid "Start Menu"
-msgstr "Startmen��"
+msgstr "Startmenüü"
 
-#: ../../bootloader.pm_.c:1126
-#, fuzzy, c-format
+#: ../../bootloader.pm_.c:1120
+#, c-format
 msgid "You can't install the bootloader on a %s partition\n"
-msgstr "Kuhu soovite alglaaduri installida"
+msgstr "Alglaadurit ei ole võimalik paigaldada %s partitsioonile\n"
 
-#: ../../bootlook.pm_.c:46 ../../standalone/drakperm_.c:15
-#: ../../standalone/draksplash_.c:26
-msgid "no help implemented yet.\n"
-msgstr "selle kohta (veel) abi ei saa.\n"
-
-#: ../../bootlook.pm_.c:62
+#: ../../bootlook.pm_.c:53
 msgid "Boot Style Configuration"
 msgstr "Alglaaduri stiil"
 
-#: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:62
-#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:82
-#: ../../standalone/logdrake_.c:102
+#: ../../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:80 ../../standalone/drakfloppy_.c:83
-#: ../../standalone/logdrake_.c:108
+#: ../../bootlook.pm_.c:71 ../../standalone/drakfloppy_.c:55
+#: ../../standalone/logdrake_.c:80
 msgid "/File/_Quit"
-msgstr "/Fail/_V�lju"
+msgstr "/Fail/_Välju"
 
-#: ../../bootlook.pm_.c:80 ../../harddrake/ui.pm_.c:63
-#: ../../standalone/drakfloppy_.c:83 ../../standalone/logdrake_.c:108
+#: ../../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:91
+#: ../../bootlook.pm_.c:82
 msgid "NewStyle Categorizing Monitor"
-msgstr "NewStyle kategoriseeritud j�lgimine"
+msgstr "NewStyle kategoriseeritud jälgimine"
 
-#: ../../bootlook.pm_.c:92
+#: ../../bootlook.pm_.c:83
 msgid "NewStyle Monitor"
-msgstr "NewStyle j�lgimine"
+msgstr "NewStyle jälgimine"
 
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:84
 msgid "Traditional Monitor"
-msgstr "Tavaline j�lgimine"
+msgstr "Tavaline jälgimine"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:85
 msgid "Traditional Gtk+ Monitor"
-msgstr "Traditsiooniline Gtk+ j�lgimine"
+msgstr "Traditsiooniline Gtk+ jälgimine"
 
-#: ../../bootlook.pm_.c:95
+#: ../../bootlook.pm_.c:86
 msgid "Launch Aurora at boot time"
-msgstr "K�ivita alglaadimisel Aurora"
+msgstr "Käivita alglaadimisel Aurora"
 
-#: ../../bootlook.pm_.c:98
-#, fuzzy
+#: ../../bootlook.pm_.c:89
 msgid "Lilo/grub mode"
-msgstr "Valimisviis"
+msgstr "Lilo/grub resiim"
 
-#: ../../bootlook.pm_.c:98
-#, fuzzy
+#: ../../bootlook.pm_.c:89
 msgid "Yaboot mode"
-msgstr "Alglaadimismood"
+msgstr "Yaboot resiim"
 
-#: ../../bootlook.pm_.c:146
-#, fuzzy
+#: ../../bootlook.pm_.c:138
 msgid "Install themes"
-msgstr "S�steemi installimine"
+msgstr "Teemade paigaldamine"
 
-#: ../../bootlook.pm_.c:147
+#: ../../bootlook.pm_.c:139
 msgid ""
 "Display theme\n"
 "under console"
 msgstr ""
+"Teema näitamine\n"
+"konsoolis"
 
-#: ../../bootlook.pm_.c:148
-#, fuzzy
+#: ../../bootlook.pm_.c:140
 msgid "Create new theme"
-msgstr "Looge uus partitsioon"
+msgstr "Uue teema loomine"
 
-#: ../../bootlook.pm_.c:192
+#: ../../bootlook.pm_.c:184
 #, c-format
 msgid "Backup %s to %s.old"
-msgstr ""
+msgstr "Tee %s -st varukoopia %s.old"
 
-#: ../../bootlook.pm_.c:195
+#: ../../bootlook.pm_.c:187
 #, c-format
 msgid "Copy %s to %s"
-msgstr ""
-
-#: ../../bootlook.pm_.c:200 ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232
-#: ../../bootlook.pm_.c:242 ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
-#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
-#: ../../diskdrake/interactive.pm_.c:213 ../../diskdrake/interactive.pm_.c:344
-#: ../../diskdrake/interactive.pm_.c:359 ../../diskdrake/interactive.pm_.c:473
-#: ../../diskdrake/interactive.pm_.c:478 ../../diskdrake/smbnfs_gtk.pm_.c:45
+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:34
+#: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:21
 msgid "Error"
 msgstr "Viga"
 
-#: ../../bootlook.pm_.c:200
+#: ../../bootlook.pm_.c:192
 msgid "Lilo message not found"
-msgstr ""
+msgstr "Lilo sõnumit ei leitud"
 
-#: ../../bootlook.pm_.c:230
+#: ../../bootlook.pm_.c:222
 msgid "Can't write /etc/sysconfig/bootsplash."
-msgstr ""
+msgstr "/etc/sysconfig/bootsplash kirjutamine ebaõnnestus."
 
-#: ../../bootlook.pm_.c:230
-#, fuzzy, c-format
+#: ../../bootlook.pm_.c:222
+#, c-format
 msgid "Write %s"
-msgstr "XFree86 %s"
+msgstr "Kirjuta %s"
 
-#: ../../bootlook.pm_.c:232
+#: ../../bootlook.pm_.c:224
 msgid ""
 "Can't write /etc/sysconfig/bootsplash\n"
 "File not found."
 msgstr ""
+"/etc/sysconfig/bootsplash kirjutamine ebaõnnestus\n"
+"Faili ei leitud."
 
-#: ../../bootlook.pm_.c:243
+#: ../../bootlook.pm_.c:235
 #, c-format
 msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
-msgstr ""
+msgstr "Mkinitrd -f /boot/initrd-%s.img %s käivitamine ebaõnnestus."
 
-#: ../../bootlook.pm_.c:246
+#: ../../bootlook.pm_.c:238
 #, c-format
 msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
-msgstr ""
+msgstr "Loo initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
 
-#: ../../bootlook.pm_.c:252
+#: ../../bootlook.pm_.c:244
 msgid ""
 "Can't relaunch LiLo!\n"
 "Launch \"lilo\" as root in command line to complete LiLo theme installation."
 msgstr ""
+"LiLo taaskäivitamine ebaõnnestus!\n"
+"Käivitage \"lilo\" administraatorinia käsurealt LiLo teema paigaldamise "
+"lõpetamiseks."
 
-#: ../../bootlook.pm_.c:256
+#: ../../bootlook.pm_.c:248
 msgid "Relaunch 'lilo'"
-msgstr ""
+msgstr "Taaskäivita 'lilo'"
 
-#: ../../bootlook.pm_.c:258 ../../standalone/draksplash_.c:165
-#: ../../standalone/draksplash_.c:329 ../../standalone/draksplash_.c:456
-#, fuzzy
+#: ../../bootlook.pm_.c:250 ../../standalone/draksplash_.c:156
+#: ../../standalone/draksplash_.c:321 ../../standalone/draksplash_.c:449
 msgid "Notice"
-msgstr "pintsaklips"
+msgstr "Märguanne"
 
-#: ../../bootlook.pm_.c:259
+#: ../../bootlook.pm_.c:251
 msgid "LiLo and Bootsplash themes installation successfull"
-msgstr ""
+msgstr "LiLo ja käivituslogo teemade paigaldus õnnestus"
 
-#: ../../bootlook.pm_.c:259
-#, fuzzy
+#: ../../bootlook.pm_.c:251
 msgid "Theme installation failed!"
-msgstr "Valige paigaldusmeetod"
+msgstr "Teema paigaldamine ebaõnnestus!"
 
-#: ../../bootlook.pm_.c:267
-#, fuzzy, c-format
+#: ../../bootlook.pm_.c:259
+#, c-format
 msgid ""
 "You are currently using %s as your boot manager.\n"
 "Click on Configure to launch the setup wizard."
 msgstr ""
-"Interneti�henduse jagamise Abimees!\n"
-"\n"
-"%s\n"
-"\n"
-"Valige Abimehe k�ivitamiseks ``OK''"
+"Praegu on Teil alglaadimise haldurina kasutusel %s.\n"
+"Valige seadistamisnõustaja käivitamiseks 'Seadista'."
 
-#: ../../bootlook.pm_.c:269 ../../standalone/drakbackup_.c:2429
-#: ../../standalone/drakbackup_.c:2439 ../../standalone/drakbackup_.c:2449
-#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:554
+#: ../../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_.c:276
-#, fuzzy
+#: ../../bootlook.pm_.c:268
 msgid "Splash selection"
-msgstr "Salvest paketivalik"
+msgstr "Käivituslogo valik"
 
-#: ../../bootlook.pm_.c:279
-#, fuzzy
+#: ../../bootlook.pm_.c:271
 msgid "Themes"
-msgstr "Puu"
+msgstr "Teemad"
 
-#: ../../bootlook.pm_.c:281
+#: ../../bootlook.pm_.c:273
 msgid ""
 "\n"
 "Select theme for\n"
@@ -1336,148 +1350,141 @@ msgid ""
 "you can choose\n"
 "them separatly"
 msgstr ""
+"\n"
+"Valige teema lilole\n"
+"ja käivituslogole,\n"
+"neid võib valida\n"
+"ka eraldi"
 
-#: ../../bootlook.pm_.c:284
+#: ../../bootlook.pm_.c:276
 msgid "Lilo screen"
-msgstr ""
+msgstr "Lilo ekraan"
 
-#: ../../bootlook.pm_.c:289
+#: ../../bootlook.pm_.c:281
 msgid "Bootsplash"
-msgstr ""
+msgstr "Käivituslogo"
 
-#: ../../bootlook.pm_.c:324
+#: ../../bootlook.pm_.c:316
 msgid "System mode"
-msgstr "T��mood"
+msgstr "Töömood"
 
-#: ../../bootlook.pm_.c:326
+#: ../../bootlook.pm_.c:318
 msgid "Launch the graphical environment when your system starts"
-msgstr "K�ivita X-Windows alglaadimisel"
+msgstr "Käivita X-Windows alglaadimisel"
 
-#: ../../bootlook.pm_.c:331
+#: ../../bootlook.pm_.c:323
 msgid "No, I don't want autologin"
 msgstr "Ei taha automaatselt siseneda"
 
-#: ../../bootlook.pm_.c:333
+#: ../../bootlook.pm_.c:325
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 "Jah, soovin automaatset sisselogimist sellele (kasutajale, keskkonnale)"
 
-#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:97
-#: ../../standalone/drakTermServ_.c:173 ../../standalone/drakTermServ_.c:300
-#: ../../standalone/drakTermServ_.c:405 ../../standalone/drakbackup_.c:4193
-#: ../../standalone/drakbackup_.c:4956 ../../standalone/drakconnect_.c:108
-#: ../../standalone/drakconnect_.c:140 ../../standalone/drakconnect_.c:296
-#: ../../standalone/drakconnect_.c:435 ../../standalone/drakconnect_.c:521
-#: ../../standalone/drakconnect_.c:564 ../../standalone/drakconnect_.c:667
-#: ../../standalone/drakfont_.c:612 ../../standalone/drakfont_.c:799
-#: ../../standalone/drakfont_.c:876 ../../standalone/drakfont_.c:963
-#: ../../ugtk.pm_.c:289
+#: ../../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 "OK"
+msgstr "Olgu"
 
-#: ../../bootlook.pm_.c:403
-#, c-format
-msgid "can not open /etc/inittab for reading: %s"
-msgstr "ei saa lugeda faili /etc/inittab: %s"
-
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
 msgid "GB"
 msgstr "GB"
 
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
 msgid "MB"
 msgstr "MB"
 
-#: ../../common.pm_.c:107
+#: ../../common.pm_.c:115
 msgid "TB"
 msgstr "TB"
 
-#: ../../common.pm_.c:115
+#: ../../common.pm_.c:123
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutit"
 
-#: ../../common.pm_.c:117
+#: ../../common.pm_.c:125
 msgid "1 minute"
 msgstr "1 minut"
 
-#: ../../common.pm_.c:119
+#: ../../common.pm_.c:127
 #, c-format
 msgid "%d seconds"
 msgstr "%d sekundit"
 
-#: ../../common.pm_.c:164
-#, fuzzy
+#: ../../common.pm_.c:172
 msgid "Can't make screenshots before partitioning"
-msgstr "Partitsioone ei saa enam lisada"
+msgstr "Hetktõmmiseid ei saa teha enne partitsioneerimist"
 
-#: ../../common.pm_.c:171
-#, fuzzy, c-format
+#: ../../common.pm_.c:179
+#, c-format
 msgid "Screenshots will be available after install in %s"
-msgstr "Teisi keeli saab valida p�rast installimist"
+msgstr "Hetktõmmised asuvad pärast paigaldust asukohas %s"
 
-#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:28 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:113
+#: ../../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 ""
+msgstr "Costa Rica"
 
-#: ../../crypto.pm_.c:16 ../../crypto.pm_.c:29 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:116
-#, fuzzy
+#: ../../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 ""
+msgstr "Tšehhi"
 
 #: ../../crypto.pm_.c:18 ../../crypto.pm_.c:31
 msgid "Germany"
-msgstr "Saksa"
+msgstr "Saksamaa"
 
 #: ../../crypto.pm_.c:19 ../../crypto.pm_.c:32
-#, fuzzy
 msgid "Greece"
 msgstr "Kreeka"
 
 #: ../../crypto.pm_.c:20 ../../crypto.pm_.c:33
-#, fuzzy
 msgid "Norway"
 msgstr "Norra"
 
 #: ../../crypto.pm_.c:21 ../../crypto.pm_.c:34
-#, fuzzy
 msgid "Sweden"
-msgstr "Vaata"
+msgstr "Rootsi"
 
-#: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:114
+#: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:128
 msgid "Netherlands"
-msgstr ""
+msgstr "Holland"
 
-#: ../../crypto.pm_.c:23 ../../crypto.pm_.c:37 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:115 ../../standalone/drakxtv_.c:68
-#, fuzzy
+#: ../../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
-#, fuzzy
 msgid "Austria"
-msgstr "seerial"
+msgstr "Austria"
 
-#: ../../crypto.pm_.c:35 ../../crypto.pm_.c:61 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:117
+#: ../../crypto.pm_.c:35 ../../crypto.pm_.c:61 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:131
 msgid "United States"
-msgstr ""
+msgstr "USA"
 
 #: ../../diskdrake/dav.pm_.c:19
 msgid ""
@@ -1486,556 +1493,545 @@ msgid ""
 "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:392
+#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:400
 #: ../../diskdrake/smbnfs_gtk.pm_.c:81
 msgid "Unmount"
-msgstr "�henda lahti"
+msgstr "Lahuta"
 
-#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:389
+#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:397
 #: ../../diskdrake/smbnfs_gtk.pm_.c:82
 msgid "Mount"
-msgstr "�henda"
+msgstr "Haagi"
 
 #: ../../diskdrake/dav.pm_.c:65
 msgid "Server"
 msgstr "Server"
 
-#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:383
-#: ../../diskdrake/interactive.pm_.c:572 ../../diskdrake/interactive.pm_.c:599
-#: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/removable_gtk.pm_.c:15
-#: ../../diskdrake/smbnfs_gtk.pm_.c:85
+#: ../../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 "�henduspunkt"
+msgstr "Haakepunkt"
 
 #: ../../diskdrake/dav.pm_.c:85
-#, fuzzy
 msgid "Please enter the WebDAV server URL"
-msgstr "Palun testige hiirt"
+msgstr "Palun sisestage WebDAV-serveri URL"
 
 #: ../../diskdrake/dav.pm_.c:88
-#, fuzzy
 msgid "The URL must begin with http:// or https://"
-msgstr "Vahendaja peab olema kujul http://..."
+msgstr "URL peab algama kas http:// või https://"
 
 #: ../../diskdrake/dav.pm_.c:109
-#, fuzzy
 msgid "Server: "
-msgstr "Server"
+msgstr "Server: "
 
-#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:444
-#: ../../diskdrake/interactive.pm_.c:1093
-#: ../../diskdrake/interactive.pm_.c:1168
+#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:452
+#: ../../diskdrake/interactive.pm_.c:1102
+#: ../../diskdrake/interactive.pm_.c:1177
 msgid "Mount point: "
-msgstr "�henduspunkt:"
+msgstr "Haakepunkt:"
 
-#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1174
+#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1183
 #, c-format
 msgid "Options: %s"
 msgstr "Eelistused: %s"
 
-#: ../../diskdrake/hd_gtk.pm_.c:94
+#: ../../diskdrake/hd_gtk.pm_.c:97
 msgid "Please make a backup of your data first"
-msgstr "Palun tehke oma andmetest enne tagavarakoopia"
+msgstr "Palun tehke oma andmetest kõigepealt varukoopia"
 
-#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:938
-#: ../../diskdrake/interactive.pm_.c:947
-#: ../../diskdrake/interactive.pm_.c:1013
+#: ../../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:97
+#: ../../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"
+"Kui soovite kasutada aboot-i, jätke palun ketta algusesse vähemalt 2048 \n"
 "sektorit vaba ruumi"
 
-#: ../../diskdrake/hd_gtk.pm_.c:151
+#: ../../diskdrake/hd_gtk.pm_.c:154
 msgid "Wizard"
-msgstr "Abimees"
+msgstr "Nõustaja"
 
-#: ../../diskdrake/hd_gtk.pm_.c:184 ../../diskdrake/removable_gtk.pm_.c:24
+#: ../../diskdrake/hd_gtk.pm_.c:187
 msgid "Choose action"
 msgstr "Valige tegevus"
 
-#: ../../diskdrake/hd_gtk.pm_.c:188
+#: ../../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\")"
 msgstr ""
-"Teil on �ks suur FAT partitsioon.\n"
+"Teil on üks suur FAT partitsioon\n"
 "(tavaliselt kasutab sellist MS DOS/Windows)\n"
 "Soovitame teil esmalt selle suurust muuta\n"
-"(klikkige ja siis valige \"Muuda\")"
+"(klõpsake ja siis valige \"Muuda\")"
 
-#: ../../diskdrake/hd_gtk.pm_.c:191
+#: ../../diskdrake/hd_gtk.pm_.c:194
 msgid "Please click on a partition"
 msgstr "Palun valige partitsioon"
 
-#: ../../diskdrake/hd_gtk.pm_.c:205 ../../diskdrake/smbnfs_gtk.pm_.c:69
-#: ../../install_steps_gtk.pm_.c:465
+#: ../../diskdrake/hd_gtk.pm_.c:208 ../../diskdrake/smbnfs_gtk.pm_.c:69
+#: ../../install_steps_gtk.pm_.c:464
 msgid "Details"
-msgstr "�ksikasjad"
+msgstr "Üksikasjad"
 
-#: ../../diskdrake/hd_gtk.pm_.c:252
-#, fuzzy
+#: ../../diskdrake/hd_gtk.pm_.c:254
 msgid "No hard drives found"
-msgstr "Kohalik printer"
+msgstr "Kõvakettaid ei leitud"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "Ext2"
-msgstr "ext2"
+msgstr "Ext2"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
-#, fuzzy
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "Journalised FS"
-msgstr "�hendamine eba�nnestus"
+msgstr "Kirjendatud FS"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "Swap"
 msgstr "Saaleala"
 
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1109
+#: ../../diskdrake/hd_gtk.pm_.c:326 ../../diskdrake/interactive.pm_.c:1118
 msgid "Empty"
-msgstr "T�hi"
+msgstr "Tühi"
 
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../install_steps_gtk.pm_.c:325
-#: ../../install_steps_gtk.pm_.c:383 ../../mouse.pm_.c:165
-#: ../../services.pm_.c:157 ../../standalone/drakbackup_.c:1756
+#: ../../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:328
+#: ../../diskdrake/hd_gtk.pm_.c:330
 msgid "Filesystem types:"
-msgstr "Failis�steemi t��bid: "
+msgstr "Failisüsteemi tüübid: "
 
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:406
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:414
 msgid "Create"
 msgstr "Tekita"
 
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:384
-#: ../../diskdrake/interactive.pm_.c:535 ../../diskdrake/removable.pm_.c:26
-#: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17
+#: ../../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"
+msgstr "Tüüp"
 
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/hd_gtk.pm_.c:347
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/hd_gtk.pm_.c:349
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Kasutage pigem ``%s''"
 
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:393
+#: ../../diskdrake/hd_gtk.pm_.c:349 ../../diskdrake/interactive.pm_.c:401
 msgid "Delete"
 msgstr "Kustuta"
 
-#: ../../diskdrake/hd_gtk.pm_.c:351
+#: ../../diskdrake/hd_gtk.pm_.c:353
 msgid "Use ``Unmount'' first"
-msgstr "Kasutage enne \"�henda lahti\""
+msgstr "Kasutage enne \"Lahuta\""
 
-#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:522
+#: ../../diskdrake/hd_gtk.pm_.c:354 ../../diskdrake/interactive.pm_.c:530
 #, 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"
+msgstr "Partitsiooni %s tüübi muutmisel hävivad kõik seal olnud andmed"
 
-#: ../../diskdrake/interactive.pm_.c:174
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:177
 msgid "Choose a partition"
-msgstr "Valige tegevus"
+msgstr "Valige partitsioon"
 
-#: ../../diskdrake/interactive.pm_.c:174
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:177
 msgid "Choose another partition"
-msgstr "Looge uus partitsioon"
+msgstr "Valige muu partitsioon"
 
-#: ../../diskdrake/interactive.pm_.c:199
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:202
 msgid "Exit"
-msgstr "ext2"
+msgstr "Välju"
 
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
 msgid "Toggle to expert mode"
 msgstr "Tavakasutaja > Ekspert"
 
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
 msgid "Toggle to normal mode"
 msgstr "Ekspert > Tavakasutaja"
 
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
 msgid "Undo"
 msgstr "Tagasi"
 
-#: ../../diskdrake/interactive.pm_.c:244
+#: ../../diskdrake/interactive.pm_.c:247
 msgid "Continue anyway?"
-msgstr "J�tkate ikkagi?"
+msgstr "Kas ikkagi jätkata?"
 
-#: ../../diskdrake/interactive.pm_.c:249
+#: ../../diskdrake/interactive.pm_.c:252
 msgid "Quit without saving"
-msgstr "L�peta ilma salvestamata"
+msgstr "Välju ilma salvestamata"
 
-#: ../../diskdrake/interactive.pm_.c:249
+#: ../../diskdrake/interactive.pm_.c:252
 msgid "Quit without writing the partition table?"
-msgstr "L�petate ilma partitsioonitabelit salvestamata?"
+msgstr "Kas väljuda partitsioonitabelit salvestamata?"
 
-#: ../../diskdrake/interactive.pm_.c:254
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:257
 msgid "Do you want to save /etc/fstab modifications"
-msgstr "Kas soovite seadistusi proovida?"
+msgstr "Kas salvestada /etc/fstab muudatused"
+
+#: ../../diskdrake/interactive.pm_.c:271
+msgid "Clear all"
+msgstr "Kustuta kõik"
 
-#: ../../diskdrake/interactive.pm_.c:267
+#: ../../diskdrake/interactive.pm_.c:272
 msgid "Auto allocate"
 msgstr "Paiguta ise"
 
-#: ../../diskdrake/interactive.pm_.c:267
-msgid "Clear all"
-msgstr "Kustuta k�ik"
-
-#: ../../diskdrake/interactive.pm_.c:267
-#: ../../install_steps_interactive.pm_.c:214
+#: ../../diskdrake/interactive.pm_.c:273
+#: ../../install_steps_interactive.pm_.c:220
 msgid "More"
-msgstr "Veel.."
+msgstr "Veel..."
 
-#: ../../diskdrake/interactive.pm_.c:271
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:278
 msgid "Hard drive information"
-msgstr "Meili informatsioon"
+msgstr "Kõvaketta info"
 
-#: ../../diskdrake/interactive.pm_.c:302
+#: ../../diskdrake/interactive.pm_.c:310
 msgid "All primary partitions are used"
-msgstr "K�ik primaarsed partitsioonid on kasutusel"
+msgstr "Kõik primaarsed partitsioonid on kasutusel"
 
-#: ../../diskdrake/interactive.pm_.c:303
+#: ../../diskdrake/interactive.pm_.c:311
 msgid "I can't add any more partition"
 msgstr "Partitsioone ei saa enam lisada"
 
-#: ../../diskdrake/interactive.pm_.c:304
+#: ../../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 "
+"Et saada rohkem partitsioone, kustutage palun üks, et luua laiendatud "
 "partitsioon"
 
-#: ../../diskdrake/interactive.pm_.c:314
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:322
 msgid "Save partition table"
 msgstr "Kirjuta partitsioonitabel"
 
-#: ../../diskdrake/interactive.pm_.c:315
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:323
 msgid "Restore partition table"
-msgstr "P��sta partitsioonitabel"
+msgstr "Taasta partitsioonitabel"
 
-#: ../../diskdrake/interactive.pm_.c:316
+#: ../../diskdrake/interactive.pm_.c:324
 msgid "Rescue partition table"
-msgstr "P��sta partitsioonitabel"
+msgstr "Päästa partitsioonitabel"
 
-#: ../../diskdrake/interactive.pm_.c:318
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:326
 msgid "Reload partition table"
-msgstr "P��sta partitsioonitabel"
+msgstr "Laadi partitsioonitabel uuesti"
 
-#: ../../diskdrake/interactive.pm_.c:323
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:331
 msgid "Removable media automounting"
-msgstr "CD/flopi/.. auto�hendamine"
+msgstr "Eemaldatava andmekandja autohaakimine"
 
-#: ../../diskdrake/interactive.pm_.c:332 ../../diskdrake/interactive.pm_.c:352
+#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:360
 msgid "Select file"
 msgstr "Valige fail"
 
-#: ../../diskdrake/interactive.pm_.c:339
+#: ../../diskdrake/interactive.pm_.c:347
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
 msgstr ""
-"Tabeli tagavarakoopia ei ole sama suurusega\n"
-"Soovite j�tkata?"
+"Tabeli varukoopia ei ole sama suurusega\n"
+"Kas ikkagi jätkata?"
 
-#: ../../diskdrake/interactive.pm_.c:353 ../../harddrake/sound.pm_.c:200
+#: ../../diskdrake/interactive.pm_.c:361 ../../harddrake/sound.pm_.c:202
+#: ../../network/modem.pm_.c:95
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: ../../diskdrake/interactive.pm_.c:354
+#: ../../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"
+"Pange tühi flopi masinasse\n"
+"Kõik andmed sellel hävivad"
 
-#: ../../diskdrake/interactive.pm_.c:365
+#: ../../diskdrake/interactive.pm_.c:373
 msgid "Trying to rescue partition table"
-msgstr "Proovin p��sta partitsioonitabelit"
+msgstr "Proovin päästa partitsioonitabelit"
 
-#: ../../diskdrake/interactive.pm_.c:371
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:379
 msgid "Detailed information"
-msgstr "Meili informatsioon"
+msgstr "Üksikasjalik info"
 
-#: ../../diskdrake/interactive.pm_.c:386 ../../diskdrake/interactive.pm_.c:666
+#: ../../diskdrake/interactive.pm_.c:394 ../../diskdrake/interactive.pm_.c:674
 msgid "Resize"
 msgstr "Muuda suurust"
 
-#: ../../diskdrake/interactive.pm_.c:387 ../../diskdrake/interactive.pm_.c:719
+#: ../../diskdrake/interactive.pm_.c:395 ../../diskdrake/interactive.pm_.c:727
 msgid "Move"
 msgstr "Liiguta"
 
-#: ../../diskdrake/interactive.pm_.c:388
+#: ../../diskdrake/interactive.pm_.c:396
 msgid "Format"
 msgstr "Vorminda"
 
-#: ../../diskdrake/interactive.pm_.c:390
+#: ../../diskdrake/interactive.pm_.c:398
 msgid "Add to RAID"
 msgstr "Lisa RAIDi"
 
-#: ../../diskdrake/interactive.pm_.c:391
+#: ../../diskdrake/interactive.pm_.c:399
 msgid "Add to LVM"
 msgstr "Lisa LVMi"
 
-#: ../../diskdrake/interactive.pm_.c:394
+#: ../../diskdrake/interactive.pm_.c:402
 msgid "Remove from RAID"
 msgstr "Eemalda RAIDist"
 
-#: ../../diskdrake/interactive.pm_.c:395
+#: ../../diskdrake/interactive.pm_.c:403
 msgid "Remove from LVM"
 msgstr "Eemalda LVMist"
 
-#: ../../diskdrake/interactive.pm_.c:396
+#: ../../diskdrake/interactive.pm_.c:404
 msgid "Modify RAID"
 msgstr "Modifitseeri RAIDi"
 
-#: ../../diskdrake/interactive.pm_.c:397
+#: ../../diskdrake/interactive.pm_.c:405
 msgid "Use for loopback"
 msgstr "Kasuta loopback-ina"
 
-#: ../../diskdrake/interactive.pm_.c:437
+#: ../../diskdrake/interactive.pm_.c:445
 msgid "Create a new partition"
-msgstr "Looge uus partitsioon"
+msgstr "Loo uus partitsioon"
 
-#: ../../diskdrake/interactive.pm_.c:440
+#: ../../diskdrake/interactive.pm_.c:448
 msgid "Start sector: "
 msgstr "Algsektor: "
 
-#: ../../diskdrake/interactive.pm_.c:442 ../../diskdrake/interactive.pm_.c:819
+#: ../../diskdrake/interactive.pm_.c:450 ../../diskdrake/interactive.pm_.c:827
 msgid "Size in MB: "
 msgstr "Suurus (MB): "
 
-#: ../../diskdrake/interactive.pm_.c:443 ../../diskdrake/interactive.pm_.c:820
+#: ../../diskdrake/interactive.pm_.c:451 ../../diskdrake/interactive.pm_.c:828
 msgid "Filesystem type: "
-msgstr "Failis�steemi t��p: "
+msgstr "Failisüsteemi tüüp: "
 
-#: ../../diskdrake/interactive.pm_.c:448
+#: ../../diskdrake/interactive.pm_.c:456
 msgid "Preference: "
 msgstr "Eelistus: "
 
-#: ../../diskdrake/interactive.pm_.c:473
+#: ../../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:503
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:511
 msgid "Remove the loopback file?"
-msgstr "Vormindan loopback faili %s"
+msgstr "Kas eemaldada loopback fail?"
 
-#: ../../diskdrake/interactive.pm_.c:533
+#: ../../diskdrake/interactive.pm_.c:541
 msgid "Change partition type"
-msgstr "Muuda partitsiooni t��p"
+msgstr "Muuda partitsiooni tüüpi"
 
-#: ../../diskdrake/interactive.pm_.c:534 ../../diskdrake/removable.pm_.c:48
+#: ../../diskdrake/interactive.pm_.c:542 ../../diskdrake/removable.pm_.c:48
 msgid "Which filesystem do you want?"
-msgstr "Mis failis�steemi soovite kasutada?"
+msgstr "Millist failisüsteemi soovite kasutada?"
 
-#: ../../diskdrake/interactive.pm_.c:540
+#: ../../diskdrake/interactive.pm_.c:548
 msgid "Switching from ext2 to ext3"
-msgstr ""
+msgstr "Ext2 vahetamine ext3 vastu"
 
-#: ../../diskdrake/interactive.pm_.c:570
+#: ../../diskdrake/interactive.pm_.c:578
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
-msgstr "Kuhu soovite loopback-faili %s �hendada?"
+msgstr "Kuhu soovite haakida loopback-faili %s?"
 
-#: ../../diskdrake/interactive.pm_.c:571
+#: ../../diskdrake/interactive.pm_.c:579
 #, c-format
 msgid "Where do you want to mount device %s?"
-msgstr "Kuhu soovite seadme %s �hendada?"
+msgstr "Kuhu soovite haakida seadme %s?"
 
-#: ../../diskdrake/interactive.pm_.c:577
+#: ../../diskdrake/interactive.pm_.c:585
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
 msgstr ""
-"Seda �henduspunkti ei saa eemaldada, kuna partitsioon on kasutusel.\n"
-"loopback-ina. Eemaldage enne loopback"
+"Seda haakepunkti ei saa eemaldada, sest partitsioon on kasutusel\n"
+"loopback-ina. Eemaldage esmalt loopback"
 
-#: ../../diskdrake/interactive.pm_.c:598
-#, fuzzy, c-format
+#: ../../diskdrake/interactive.pm_.c:606
+#, c-format
 msgid "Where do you want to mount %s?"
-msgstr "Kuhu soovite seadme %s �hendada?"
+msgstr "Kuhu soovite haakida %s?"
 
-#: ../../diskdrake/interactive.pm_.c:622
+#: ../../diskdrake/interactive.pm_.c:630
 msgid "Computing FAT filesystem bounds"
-msgstr "Arvutan FAT failis�steemi piire"
+msgstr "Arvutan FAT failisüsteemi piire"
 
-#: ../../diskdrake/interactive.pm_.c:622 ../../diskdrake/interactive.pm_.c:681
-#: ../../install_interactive.pm_.c:133
+#: ../../diskdrake/interactive.pm_.c:630 ../../diskdrake/interactive.pm_.c:689
+#: ../../install_interactive.pm_.c:131
 msgid "Resizing"
 msgstr "Muudan suurust"
 
-#: ../../diskdrake/interactive.pm_.c:654
+#: ../../diskdrake/interactive.pm_.c:662
 msgid "This partition is not resizeable"
 msgstr "See partitsioon ei ole muudetav"
 
-#: ../../diskdrake/interactive.pm_.c:659
+#: ../../diskdrake/interactive.pm_.c:667
 msgid "All data on this partition should be backed-up"
-msgstr "Selle partitsiooni andmetest v�iks olla tagavarakoopia"
+msgstr "Selle partitsiooni andmetest võiks olla varukoopia"
 
-#: ../../diskdrake/interactive.pm_.c:661
+#: ../../diskdrake/interactive.pm_.c:669
 #, 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"
+msgstr "Partitsiooni %s suuruse muutmisel hävivad sellel kõik andmed"
 
-#: ../../diskdrake/interactive.pm_.c:666
+#: ../../diskdrake/interactive.pm_.c:674
 msgid "Choose the new size"
 msgstr "Valige uus suurus"
 
-#: ../../diskdrake/interactive.pm_.c:667
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:675
 msgid "New size in MB: "
-msgstr "Suurus (MB): "
+msgstr "Uus suurus (MB): "
 
-#: ../../diskdrake/interactive.pm_.c:720
+#: ../../diskdrake/interactive.pm_.c:728
 msgid "Which disk do you want to move it to?"
-msgstr "Millisele kettale soovite seda �mber paigutada?"
+msgstr "Millisele kettale soovite seda ümber paigutada?"
 
-#: ../../diskdrake/interactive.pm_.c:721
+#: ../../diskdrake/interactive.pm_.c:729
 msgid "Sector"
 msgstr "Sektor"
 
-#: ../../diskdrake/interactive.pm_.c:722
+#: ../../diskdrake/interactive.pm_.c:730
 msgid "Which sector do you want to move it to?"
-msgstr "Millisele sektorile soovite seda �mber paigutada?"
+msgstr "Millisele sektorile soovite seda ümber paigutada?"
 
-#: ../../diskdrake/interactive.pm_.c:725
+#: ../../diskdrake/interactive.pm_.c:733
 msgid "Moving"
-msgstr "Paigutan �mber"
+msgstr "Paigutan ümber"
 
-#: ../../diskdrake/interactive.pm_.c:725
+#: ../../diskdrake/interactive.pm_.c:733
 msgid "Moving partition..."
 msgstr "Liigutan partitsiooni..."
 
-#: ../../diskdrake/interactive.pm_.c:742
+#: ../../diskdrake/interactive.pm_.c:750
 msgid "Choose an existing RAID to add to"
 msgstr "Vali olemasolev RAID, millele lisada"
 
-#: ../../diskdrake/interactive.pm_.c:743 ../../diskdrake/interactive.pm_.c:760
+#: ../../diskdrake/interactive.pm_.c:751 ../../diskdrake/interactive.pm_.c:768
 msgid "new"
 msgstr "uus"
 
-#: ../../diskdrake/interactive.pm_.c:758
+#: ../../diskdrake/interactive.pm_.c:766
 msgid "Choose an existing LVM to add to"
 msgstr "Vali olemasolev LVM, millele lisada"
 
-#: ../../diskdrake/interactive.pm_.c:763
+#: ../../diskdrake/interactive.pm_.c:771
 msgid "LVM name?"
 msgstr "LVM nimi?"
 
-#: ../../diskdrake/interactive.pm_.c:804
+#: ../../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:817
+#: ../../diskdrake/interactive.pm_.c:825
 msgid "Loopback"
-msgstr "loopback"
+msgstr "Loopback"
 
-#: ../../diskdrake/interactive.pm_.c:818
+#: ../../diskdrake/interactive.pm_.c:826
 msgid "Loopback file name: "
-msgstr "loopback faili nimi:"
+msgstr "Loopback faili nimi:"
 
-#: ../../diskdrake/interactive.pm_.c:823
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:831
 msgid "Give a file name"
-msgstr "P�risnimi"
+msgstr "Failinimi"
 
-#: ../../diskdrake/interactive.pm_.c:826
+#: ../../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"
+msgstr "See fail on juba loopback-ina kasutusel, valige mõni muu"
 
-#: ../../diskdrake/interactive.pm_.c:827
+#: ../../diskdrake/interactive.pm_.c:835
 msgid "File already exists. Use it?"
-msgstr "Fail on juba olemas. Kas kasutan seda?"
+msgstr "Fail on juba olemas. Kas kasutada seda?"
 
-#: ../../diskdrake/interactive.pm_.c:850
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:858
 msgid "Mount options"
-msgstr "Mooduli parameetrid:"
+msgstr "Haakimise valikud"
 
-#: ../../diskdrake/interactive.pm_.c:857
+#: ../../diskdrake/interactive.pm_.c:865
 msgid "Various"
-msgstr ""
+msgstr "Mitmesugust"
 
-#: ../../diskdrake/interactive.pm_.c:921 ../../standalone/drakfloppy_.c:104
+#: ../../diskdrake/interactive.pm_.c:929 ../../standalone/drakfloppy_.c:76
 msgid "device"
 msgstr "seade"
 
-#: ../../diskdrake/interactive.pm_.c:922
+#: ../../diskdrake/interactive.pm_.c:930
 msgid "level"
 msgstr "tase"
 
-#: ../../diskdrake/interactive.pm_.c:923
+#: ../../diskdrake/interactive.pm_.c:931
 msgid "chunk size"
-msgstr "�hiku suurus"
+msgstr "ühiku suurus"
 
-#: ../../diskdrake/interactive.pm_.c:938
+#: ../../diskdrake/interactive.pm_.c:947
 msgid "Be careful: this operation is dangerous."
-msgstr "Vaadake ette: see v�ib olla ohtlik."
+msgstr "Vaadake ette: see võib olla ohtlik."
 
-#: ../../diskdrake/interactive.pm_.c:953
+#: ../../diskdrake/interactive.pm_.c:962
 msgid "What type of partitioning?"
-msgstr "Mis t��pi partitsioonid teete?"
+msgstr "Mis tüüpi partitsioonid teete?"
 
-#: ../../diskdrake/interactive.pm_.c:969
-#, fuzzy, c-format
+#: ../../diskdrake/interactive.pm_.c:978
+#, c-format
 msgid "The package %s is needed. Install it?"
-msgstr "Valige paketid mida soovite installida"
+msgstr "Vajalik on pakett %s. Kas paigaldada see?"
 
-#: ../../diskdrake/interactive.pm_.c:983
+#: ../../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 ""
-"Vabandan, aga ei saa n�ustuda /boot kataloogi paigutamisega kaugemale 1024-"
-"st silindrist.\n"
-"Kui kasutate LILO-t, ei t��ta see sel moel, kui aga ei kasuta, ei ole Teile "
+"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:987
+#: ../../diskdrake/interactive.pm_.c:996
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -2043,150 +2039,151 @@ msgid ""
 "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 1024-t silindrit ja Teil ei ole /boot partitsiooni.\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:993
+#: ../../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"
 msgstr ""
 "Olete valinud juurpartitsiooniks (/) tarkvaralise RAID-i.\n"
-"Ilma /boot partitsioonita ei ole v�imalik sellist s�steemi laadida.\n"
+"Ilma /boot partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
 "Lisage kindlasti /boot partitsioon!"
 
-#: ../../diskdrake/interactive.pm_.c:1013
+#: ../../diskdrake/interactive.pm_.c:1022
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Ketta %s partitsioonitabel salvestatakse!"
 
-#: ../../diskdrake/interactive.pm_.c:1017
+#: ../../diskdrake/interactive.pm_.c:1026
 msgid "You'll need to reboot before the modification can take place"
-msgstr "Muudatuste j�ustamiseks vajate alglaadimist"
+msgstr "Muudatuste rakendamiseks vajate alglaadimist"
 
-#: ../../diskdrake/interactive.pm_.c:1028
+#: ../../diskdrake/interactive.pm_.c:1037
 #, 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"
+msgstr "Partitsiooni %s vormindamisel hävivad sellel kõik andmed"
 
-#: ../../diskdrake/interactive.pm_.c:1030
+#: ../../diskdrake/interactive.pm_.c:1039
 msgid "Formatting"
 msgstr "Vormindan"
 
-#: ../../diskdrake/interactive.pm_.c:1031
+#: ../../diskdrake/interactive.pm_.c:1040
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Vormindan loopback faili %s"
 
-#: ../../diskdrake/interactive.pm_.c:1032
-#: ../../install_steps_interactive.pm_.c:459
+#: ../../diskdrake/interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:466
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Vormindan partitsiooni %s"
 
-#: ../../diskdrake/interactive.pm_.c:1043
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:1052
 msgid "Hide files"
-msgstr "mkraid eba�nnestus"
+msgstr "Failide peitmine"
 
-#: ../../diskdrake/interactive.pm_.c:1043
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:1052
 msgid "Move files to the new partition"
-msgstr "Ei ole piisavalt ruumi uute partitsioonide jaoks"
+msgstr "Liiguta failid uuele partitsioonile"
 
-#: ../../diskdrake/interactive.pm_.c:1044
+#: ../../diskdrake/interactive.pm_.c:1053
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
 "(%s)"
 msgstr ""
+"Kataloogis %s on juba andmed\n"
+"(%s)"
 
-#: ../../diskdrake/interactive.pm_.c:1055
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:1064
 msgid "Moving files to the new partition"
-msgstr "Ei ole piisavalt ruumi uute partitsioonide jaoks"
+msgstr "Failide liigutamine uuele partitsioonile"
 
-#: ../../diskdrake/interactive.pm_.c:1059
+#: ../../diskdrake/interactive.pm_.c:1068
 #, c-format
 msgid "Copying %s"
-msgstr ""
+msgstr "%s kopeerimine"
 
-#: ../../diskdrake/interactive.pm_.c:1063
-#, fuzzy, c-format
+#: ../../diskdrake/interactive.pm_.c:1072
+#, c-format
 msgid "Removing %s"
-msgstr "Kuvatihedus: %s\n"
+msgstr "%s eemaldamine"
 
-#: ../../diskdrake/interactive.pm_.c:1073
+#: ../../diskdrake/interactive.pm_.c:1082
 #, c-format
 msgid "partition %s is now known as %s"
-msgstr ""
+msgstr "partitsioon %s kannab nüüd nime %s"
 
-#: ../../diskdrake/interactive.pm_.c:1094
-#: ../../diskdrake/interactive.pm_.c:1153
+#: ../../diskdrake/interactive.pm_.c:1103
+#: ../../diskdrake/interactive.pm_.c:1162
 msgid "Device: "
 msgstr "Seade: "
 
-#: ../../diskdrake/interactive.pm_.c:1095
+#: ../../diskdrake/interactive.pm_.c:1104
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
-msgstr "DOS kettat�his: %s (arvatavasti)\n"
+msgstr "DOS kettatähis: %s (arvatavasti)\n"
 
-#: ../../diskdrake/interactive.pm_.c:1099
-#: ../../diskdrake/interactive.pm_.c:1107
-#: ../../diskdrake/interactive.pm_.c:1172
+#: ../../diskdrake/interactive.pm_.c:1108
+#: ../../diskdrake/interactive.pm_.c:1116
+#: ../../diskdrake/interactive.pm_.c:1181
 msgid "Type: "
-msgstr "T��p: "
+msgstr "Tüüp: "
 
-#: ../../diskdrake/interactive.pm_.c:1103
+#: ../../diskdrake/interactive.pm_.c:1112
 msgid "Name: "
 msgstr "Nimi: "
 
-#: ../../diskdrake/interactive.pm_.c:1111
+#: ../../diskdrake/interactive.pm_.c:1120
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Algus: sektor %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1112
+#: ../../diskdrake/interactive.pm_.c:1121
 #, c-format
 msgid "Size: %s"
 msgstr "Suurus: %s"
 
-#: ../../diskdrake/interactive.pm_.c:1114
+#: ../../diskdrake/interactive.pm_.c:1123
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sektorit"
 
-#: ../../diskdrake/interactive.pm_.c:1116
-#, fuzzy, c-format
+#: ../../diskdrake/interactive.pm_.c:1125
+#, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "Silindrid %d kuni %d\n"
 
-#: ../../diskdrake/interactive.pm_.c:1117
+#: ../../diskdrake/interactive.pm_.c:1126
 msgid "Formatted\n"
 msgstr "Vormindatud\n"
 
-#: ../../diskdrake/interactive.pm_.c:1118
+#: ../../diskdrake/interactive.pm_.c:1127
 msgid "Not formatted\n"
 msgstr "Vormindamata\n"
 
-#: ../../diskdrake/interactive.pm_.c:1119
+#: ../../diskdrake/interactive.pm_.c:1128
 msgid "Mounted\n"
-msgstr "�hendatud\n"
+msgstr "Haagitud\n"
 
-#: ../../diskdrake/interactive.pm_.c:1120
+#: ../../diskdrake/interactive.pm_.c:1129
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1122
-#, fuzzy, c-format
+#: ../../diskdrake/interactive.pm_.c:1131
+#, c-format
 msgid ""
 "Loopback file(s):\n"
 "   %s\n"
-msgstr "loopback fail(id): %s\n"
+msgstr ""
+"Loopback fail(id):\n"
+"   %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1123
+#: ../../diskdrake/interactive.pm_.c:1132
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -2194,27 +2191,27 @@ msgstr ""
 "Partitsioonilt toimub alglaadimine\n"
 "    (MS-DOS-i, mitte lilo jaoks)\n"
 
-#: ../../diskdrake/interactive.pm_.c:1125
+#: ../../diskdrake/interactive.pm_.c:1134
 #, c-format
 msgid "Level %s\n"
 msgstr "Tase %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1126
+#: ../../diskdrake/interactive.pm_.c:1135
 #, c-format
 msgid "Chunk size %s\n"
-msgstr "�hiku suurus %s\n"
+msgstr "Ühiku suurus %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1127
+#: ../../diskdrake/interactive.pm_.c:1136
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "RAID-kettad %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1129
+#: ../../diskdrake/interactive.pm_.c:1138
 #, c-format
 msgid "Loopback file name: %s"
-msgstr "loopback faili nimi: %s"
+msgstr "Loopback faili nimi: %s"
 
-#: ../../diskdrake/interactive.pm_.c:1132
+#: ../../diskdrake/interactive.pm_.c:1141
 msgid ""
 "\n"
 "Chances are, this partition is\n"
@@ -2222,11 +2219,11 @@ msgid ""
 "probably leave it alone.\n"
 msgstr ""
 "\n"
-"V�imalik, et on tegemist\n"
+"Võimalik, et on tegemist\n"
 "juhtpartitsiooniga, parem oleks\n"
 "seda mitte puutuda.\n"
 
-#: ../../diskdrake/interactive.pm_.c:1135
+#: ../../diskdrake/interactive.pm_.c:1144
 msgid ""
 "\n"
 "This special Bootstrap\n"
@@ -2236,139 +2233,127 @@ msgstr ""
 "\n"
 "See on eriline, alglaadimisel\n"
 "kasutatav partitsioon, mis\n"
-"v�imaldab mitme operratsioonis�steemi\n"
+"võimaldab mitme operatsioonisüsteemi\n"
 "laadimist.\n"
 
-#: ../../diskdrake/interactive.pm_.c:1154
+#: ../../diskdrake/interactive.pm_.c:1163
 msgid "Read-only"
-msgstr ""
+msgstr "Ainult lugemisõigusega"
 
-#: ../../diskdrake/interactive.pm_.c:1155
+#: ../../diskdrake/interactive.pm_.c:1164
 #, c-format
 msgid "Size: %s\n"
 msgstr "Suurus: %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1156
+#: ../../diskdrake/interactive.pm_.c:1165
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geomeetria: %s silindrit, %s pead, %s sektorit\n"
 
-#: ../../diskdrake/interactive.pm_.c:1157
+#: ../../diskdrake/interactive.pm_.c:1166
 msgid "Info: "
 msgstr "Info: "
 
-#: ../../diskdrake/interactive.pm_.c:1158
+#: ../../diskdrake/interactive.pm_.c:1167
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "LVM-kettad %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1159
+#: ../../diskdrake/interactive.pm_.c:1168
 #, c-format
 msgid "Partition table type: %s\n"
-msgstr "Partitsioonitabeli t��p: %s\n"
+msgstr "Partitsioonitabeli tüüp: %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1160
-#, fuzzy, c-format
+#: ../../diskdrake/interactive.pm_.c:1169
+#, c-format
 msgid "on channel %d id %d\n"
-msgstr "siinil %d id %d\n"
+msgstr "kanalil %d id %d\n"
 
-#: ../../diskdrake/interactive.pm_.c:1190
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:1199
 msgid "Filesystem encryption key"
-msgstr "Failis�steemi t��p: "
+msgstr "Failisüsteemi krüptovõti"
 
-#: ../../diskdrake/interactive.pm_.c:1191
+#: ../../diskdrake/interactive.pm_.c:1200
 msgid "Choose your filesystem encryption key"
-msgstr ""
+msgstr "Valige failisüsteemi krüptovõti"
 
-#: ../../diskdrake/interactive.pm_.c:1194
-#, fuzzy, c-format
+#: ../../diskdrake/interactive.pm_.c:1203
+#, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
-msgstr "Salas�na on liiga lihtne (peaks olema v�hemalt %d t�hem�rki)"
+msgstr "See krüptovõti on liiga lihtne (peaks olema vähemalt %d märki)"
 
-#: ../../diskdrake/interactive.pm_.c:1195
-#, fuzzy
+#: ../../diskdrake/interactive.pm_.c:1204
 msgid "The encryption keys do not match"
-msgstr "Salas�nad ei klapi"
+msgstr "Krüptovõtmed ei klapi"
 
-#: ../../diskdrake/interactive.pm_.c:1198
+#: ../../diskdrake/interactive.pm_.c:1207
 msgid "Encryption key"
-msgstr ""
+msgstr "Krüptovõti"
 
-#: ../../diskdrake/interactive.pm_.c:1199
+#: ../../diskdrake/interactive.pm_.c:1208
 msgid "Encryption key (again)"
-msgstr ""
+msgstr "Krüptovõti (uuesti)"
 
 #: ../../diskdrake/removable.pm_.c:47
-#, fuzzy
 msgid "Change type"
-msgstr "Muuda partitsiooni t��p"
-
-#: ../../diskdrake/removable_gtk.pm_.c:28
-#, fuzzy
-msgid "Please click on a medium"
-msgstr "Palun valige partitsioon"
+msgstr "Muuda tüüpi"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:162
 #, c-format
 msgid "Can't login using username %s (bad password?)"
-msgstr ""
+msgstr "Sisselogimine kasutajanimega %s ebaõnnestus (vale parool?)"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:166 ../../diskdrake/smbnfs_gtk.pm_.c:175
-#, fuzzy
 msgid "Domain Authentication Required"
-msgstr "Autentimisviis"
+msgstr "Nõutav on domeeni autentimine"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:167
-#, fuzzy
 msgid "Another one"
-msgstr "Internet"
+msgstr "Veel üks"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:167
-#, fuzzy
 msgid "Which username"
-msgstr "Kasutajatunnus"
+msgstr "Milline kasutajanimi"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:176
 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."
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3529
-#, fuzzy
+#: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3477
 msgid "Username"
-msgstr "Kasutajatunnus"
+msgstr "Kasutajanimi"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:180
-#, fuzzy
 msgid "Domain"
-msgstr "NIS domeen"
+msgstr "Domeen"
 
 #: ../../diskdrake/smbnfs_gtk.pm_.c:200
-#, fuzzy
 msgid "Search servers"
-msgstr "Nimeserver"
+msgstr "Serverite otsing"
 
-#: ../../fs.pm_.c:545 ../../fs.pm_.c:555 ../../fs.pm_.c:559 ../../fs.pm_.c:563
-#: ../../fs.pm_.c:567 ../../fs.pm_.c:571
+#: ../../fs.pm_.c:547 ../../fs.pm_.c:557 ../../fs.pm_.c:561 ../../fs.pm_.c:565
+#: ../../fs.pm_.c:569 ../../fs.pm_.c:573
 #, c-format
 msgid "%s formatting of %s failed"
-msgstr "%s vormindamine seadmel %s eba�nnestus"
+msgstr "%s vormindamine seadmel %s ebaõnnestus"
 
-#: ../../fs.pm_.c:608
+#: ../../fs.pm_.c:610
 #, c-format
 msgid "I don't know how to format %s in type %s"
-msgstr "Ei oska seadet %s vormindada t��pi %s"
+msgstr "Ei oska seadet %s vormindada tüüpi %s"
 
-#: ../../fs.pm_.c:682 ../../fs.pm_.c:725
+#: ../../fs.pm_.c:684 ../../fs.pm_.c:727
 #, c-format
 msgid "mounting partition %s in directory %s failed"
-msgstr ""
+msgstr "partitsiooni %s haakimine kataloogis %s ebaõnnestus"
 
-#: ../../fs.pm_.c:740 ../../partition_table.pm_.c:598
+#: ../../fs.pm_.c:742 ../../partition_table.pm_.c:599
 #, c-format
 msgid "error unmounting %s: %s"
-msgstr "viga %s lahti �hendamisel: %s"
+msgstr "viga %s lahutamisel: %s"
 
 #: ../../fsedit.pm_.c:21
 msgid "simple"
@@ -2376,14 +2361,14 @@ msgstr "lihtne"
 
 #: ../../fsedit.pm_.c:25
 msgid "with /usr"
-msgstr ""
+msgstr "koos /usr-ga"
 
 #: ../../fsedit.pm_.c:30
 msgid "server"
 msgstr "server"
 
 #: ../../fsedit.pm_.c:240
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "I can't read the partition table of device %s, it's too corrupted for me :(\n"
 "I can try to go on, erasing over bad partitions (ALL DATA will be lost!).\n"
@@ -2392,15 +2377,16 @@ msgid ""
 "\n"
 "Do you agree to loose all the partitions?\n"
 msgstr ""
-"Partitsioonitabel on loetamatu, liiga rikutud DrakX-i jaoks :(\n"
-"Proovin loetamatud kirjed puhastada kuid ANDMED NENDEL H�VIVAD.\n"
-"Teine v�imalus on keelata DrakX-il partitsioonitabeli muutmine.\n"
+"Partitsioonitabel seadmel %s on loetamatu, liiga rikutud DrakX-i jaoks :(\n"
+"Proovin loetamatud kirjed puhastada, kuid ANDMED NEIL HÄVIVAD.\n"
+"Teine võimalus on keelata DrakX-il partitsioonitabeli muutmine.\n"
 "(Viga oli selline: %s)\n"
-"Kas olete n�us partitsioonide kaotamisega?\n"
+"\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 partisioonidel"
+msgstr "JFS ei ole kasutatav alla 16MB partitsioonidel"
 
 #: ../../fsedit.pm_.c:502
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
@@ -2408,73 +2394,80 @@ msgstr "ReiserFS ei ole kasutatav alla 32MB partisioonidel"
 
 #: ../../fsedit.pm_.c:521
 msgid "Mount points must begin with a leading /"
-msgstr "�henduspunktid peavad algama kaldkriipsuga (/)"
+msgstr "Haakepunktid peavad algama kaldkriipsuga (/)"
 
 # c-format
 #: ../../fsedit.pm_.c:522
 #, c-format
 msgid "There is already a partition with mount point %s\n"
-msgstr "�henduspunktile %s on juba �ks partitsioon m��ratud\n"
+msgstr "Haakepunktile %s on juba partitsioon määratud\n"
 
 #: ../../fsedit.pm_.c:526
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
-msgstr "Te ei saa �henduspunkti %s jaoks LVM loogilist ketast kasutada"
+msgstr "Te ei saa haakepunkti %s jaoks LVM loogilist ketast kasutada"
 
 #: ../../fsedit.pm_.c:528
 msgid "This directory should remain within the root filesystem"
-msgstr "See kataloog peab j��ma kokku juurfailis�steemiga"
+msgstr "See kataloog peab jääma kokku juurfailisüsteemiga"
 
 #: ../../fsedit.pm_.c:530
-#, fuzzy
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
 "point\n"
-msgstr "See �henduspunkt vajab t�elist (ext2, reiserfs) failis�steemi\n"
+msgstr ""
+"See haakepunkt vajab tõelist (ext2/ext3, reiserfs, xfs või jfs) "
+"failisüsteemi\n"
 
 #: ../../fsedit.pm_.c:532
-#, fuzzy, c-format
+#, c-format
 msgid "You can't use an encrypted file system for mount point %s"
-msgstr "Te ei saa �henduspunkti %s jaoks LVM loogilist ketast kasutada"
+msgstr "Te ei saa haakepunkti %s jaoks krüptitud failisüsteemi kasutada"
 
 #: ../../fsedit.pm_.c:599
-#, fuzzy
 msgid "Not enough free space for auto-allocating"
 msgstr "Ei ole piisavalt ruumi automaatpaigutuseks"
 
 #: ../../fsedit.pm_.c:601
 msgid "Nothing to do"
-msgstr ""
+msgstr "Pole midagi teha"
 
 #: ../../fsedit.pm_.c:694
 #, c-format
 msgid "Error opening %s for writing: %s"
-msgstr "Seadme %s avamine kirjutamiseks eba�nnestus: %s"
+msgstr "%s avamine kirjutamiseks ebaõnnestus: %s"
+
+#: ../../harddrake/data.pm_.c:71
+msgid "cpu /* "
+msgstr "cpu /* "
 
-#: ../../harddrake/sound.pm_.c:168
+#: ../../harddrake/sound.pm_.c:170
 msgid "No alternative driver"
-msgstr ""
+msgstr "Alternatiivne draiver puudub"
 
-#: ../../harddrake/sound.pm_.c:169
+#: ../../harddrake/sound.pm_.c:171
 #, 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 draiverit Teie helikaardile (%s), "
+"millel praegu on kasutusel \"%s\""
 
-#: ../../harddrake/sound.pm_.c:171
-#, fuzzy
+#: ../../harddrake/sound.pm_.c:173
 msgid "Sound configuration"
-msgstr "LAN s�tted"
+msgstr "Heliseadistused"
 
-#: ../../harddrake/sound.pm_.c:172
+#: ../../harddrake/sound.pm_.c:174
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr ""
+"Siin saate valida alternatiivse draiveri (kas OSS või ALSA) oma helikaardile "
+"(%s)."
 
-#: ../../harddrake/sound.pm_.c:174
+#: ../../harddrake/sound.pm_.c:176
 #, c-format
 msgid ""
 "\n"
@@ -2482,28 +2475,30 @@ msgid ""
 "Your card currently use the %s\"%s\" driver (default driver for your card is "
 "\"%s\")"
 msgstr ""
+"\n"
+"\n"
+"Teie helikaart kasutab praegu %s\"%s\" draiverit (selle kaardi vaikedraiver "
+"on \"%s\")"
 
-#: ../../harddrake/sound.pm_.c:176
-#, fuzzy
+#: ../../harddrake/sound.pm_.c:178
 msgid "Driver:"
-msgstr "Juhtprogramm"
-
-#: ../../harddrake/sound.pm_.c:181 ../../standalone/drakTermServ_.c:246
-#: ../../standalone/drakbackup_.c:3932 ../../standalone/drakbackup_.c:3965
-#: ../../standalone/drakbackup_.c:3991 ../../standalone/drakbackup_.c:4018
-#: ../../standalone/drakbackup_.c:4045 ../../standalone/drakbackup_.c:4084
-#: ../../standalone/drakbackup_.c:4105 ../../standalone/drakbackup_.c:4132
-#: ../../standalone/drakbackup_.c:4162 ../../standalone/drakbackup_.c:4188
-#: ../../standalone/drakbackup_.c:4213 ../../standalone/drakfont_.c:700
-#, fuzzy
+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"
+msgstr "Abi"
 
-#: ../../harddrake/sound.pm_.c:183
+#: ../../harddrake/sound.pm_.c:185
 msgid "Switching between ALSA and OSS help"
-msgstr ""
+msgstr "ALSA ja OSS abi vahel lülitamine"
 
-#: ../../harddrake/sound.pm_.c:184
+#: ../../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 "
@@ -2521,8 +2516,22 @@ msgid ""
 "- 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"
+"\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"
 
-#: ../../harddrake/sound.pm_.c:200
+#: ../../harddrake/sound.pm_.c:202
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -2531,30 +2540,36 @@ msgid ""
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
+"Vana \"%s\" draiver on mustas nimekirjas.\n"
+"\n"
+"On teatatud, et see tekitab mahalaadimisel kernelile jama.\n"
+"\n"
+"Uut \"%s\" draiverit kasutatakse järgmisel alglaadimisel."
 
-#: ../../harddrake/sound.pm_.c:203 ../../standalone/drakconnect_.c:301
+#: ../../harddrake/sound.pm_.c:205 ../../standalone/drakconnect_.c:298
 msgid "Please Wait... Applying the configuration"
 msgstr "Palun oodake... Rakendan seadistusi"
 
-#: ../../harddrake/sound.pm_.c:203 ../../harddrake/ui.pm_.c:111
-#: ../../interactive.pm_.c:391
+#: ../../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:208
+#: ../../harddrake/sound.pm_.c:210
 msgid "No known driver"
-msgstr ""
+msgstr "Draiverit ei õnnestunud tuvastada"
 
-#: ../../harddrake/sound.pm_.c:209
+#: ../../harddrake/sound.pm_.c:211
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
-msgstr ""
+msgstr "Teie helikaardile (%s) ei õnnestunud tuvastada draiverit"
 
-#: ../../harddrake/sound.pm_.c:212
+#: ../../harddrake/sound.pm_.c:214
 msgid "Unkown driver"
-msgstr ""
+msgstr "Tundmatu draiver"
 
-#: ../../harddrake/sound.pm_.c:213
+#: ../../harddrake/sound.pm_.c:215
 #, c-format
 msgid ""
 "The \"%s\" driver for your sound card is unlisted\n"
@@ -2563,276 +2578,67 @@ msgid ""
 "<install at mandrakesoft dot com>\n"
 "with subject: unlisted sound driver \"%s\""
 msgstr ""
-
-#: ../../harddrake/ui.pm_.c:16
-#, fuzzy
-msgid "Model"
-msgstr "Hiir"
-
-#: ../../harddrake/ui.pm_.c:16
-#, fuzzy
-msgid "hard disk model"
-msgstr "Kaardi m�lu (DMA)"
-
-#: ../../harddrake/ui.pm_.c:17
-#, fuzzy
-msgid "Channel"
-msgstr "Katkesta"
-
-#: ../../harddrake/ui.pm_.c:17
-msgid "EIDE/SCSI channel"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:19
-msgid "Bus"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:20
-msgid ""
-"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:21
-#, fuzzy
-msgid "Module"
-msgstr "Hiir"
-
-#: ../../harddrake/ui.pm_.c:21
-msgid "the module of the GNU/Linux kernel that handle that device"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:22
-msgid "Media class"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:22
-msgid "class of hardware device"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1562
-msgid "Description"
-msgstr "Kirjeldus"
-
-#: ../../harddrake/ui.pm_.c:23
-msgid "this field describe the device"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:25
-#, fuzzy
-msgid "Bus identification"
-msgstr "Autentimisviis"
-
-#: ../../harddrake/ui.pm_.c:26
-msgid ""
-"- PCI and USB devices: this list the vendor, device, subvendor and subdevice "
-"PCI/USB ids"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:28
-msgid "Location on the bus"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:29
-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"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:32
-#, fuzzy
-msgid "Old device file"
-msgstr "Valige fail"
-
-#: ../../harddrake/ui.pm_.c:33
-msgid "old static device name used in dev package"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:34
-#, fuzzy
-msgid "New devfs device"
-msgstr "L��sipoolne seade"
-
-#: ../../harddrake/ui.pm_.c:35
-msgid "new dinamic device name generated by incore kernel devfs"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:36
-#, fuzzy
-msgid "Number of buttons"
-msgstr "2 nuppu"
-
-#: ../../harddrake/ui.pm_.c:37
-msgid "the vendor name of the device"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:38
-#, fuzzy
-msgid "Alternative drivers"
-msgstr "Tr�kitakse testlehek�lg(i)..."
-
-#: ../../harddrake/ui.pm_.c:39
-msgid "the list of alternative drivers for this sound card"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:63
-#, fuzzy
-msgid "/_Quit"
-msgstr "V�lju"
-
-#: ../../harddrake/ui.pm_.c:64 ../../harddrake/ui.pm_.c:65
-#: ../../harddrake/ui.pm_.c:71 ../../harddrake/ui.pm_.c:73
-#: ../../standalone/logdrake_.c:111
-msgid "/_Help"
-msgstr "/_Abi"
-
-#: ../../harddrake/ui.pm_.c:65
-#, fuzzy
-msgid "/_Help..."
-msgstr "/_Abi"
-
-#: ../../harddrake/ui.pm_.c:66
-msgid "Harddrake help"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:67
-msgid ""
-"Description of the fields:\n"
+"Teie helikaardi \"%s\" draiver ei ole loendis\n"
 "\n"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:71
-msgid "/_Report Bug"
-msgstr "/_Vearaport"
-
-#: ../../harddrake/ui.pm_.c:73
-#, fuzzy
-msgid "/_About..."
-msgstr "/Abi/_Misv�rk"
-
-#: ../../harddrake/ui.pm_.c:74
-msgid "About Harddrake"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:75
-msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
-"Version:"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:76
-#, fuzzy
-msgid "Author:"
-msgstr "Proovida niisama"
-
-#: ../../harddrake/ui.pm_.c:86
-#, fuzzy
-msgid "Harddrake2 version "
-msgstr "K�vaketta leidmine"
-
-#: ../../harddrake/ui.pm_.c:101
-#, fuzzy
-msgid "Detected hardware"
-msgstr "Info riistvara kohta"
-
-#: ../../harddrake/ui.pm_.c:103
-#, fuzzy
-msgid "Information"
-msgstr "N�ita lisainfot"
-
-#: ../../harddrake/ui.pm_.c:106
-#, fuzzy
-msgid "Configure module"
-msgstr "Hiire seadmine"
-
-#: ../../harddrake/ui.pm_.c:107
-msgid "Run config tool"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:111
-#, fuzzy
-msgid "Detection in progress"
-msgstr "leiti port %s"
-
-#: ../../harddrake/ui.pm_.c:148
-msgid "You can configure each parameter of the module here."
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:166
-#, fuzzy, c-format
-msgid "Running \"%s\" ..."
-msgstr "Loetakse CUPS juhtprogramme"
-
-#: ../../harddrake/ui.pm_.c:180
-#, c-format
-msgid "Probing %s class\n"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:201
-msgid "primary"
-msgstr ""
-
-#: ../../harddrake/ui.pm_.c:201
-#, fuzzy
-msgid "secondary"
-msgstr "%d sekundit"
+"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
-#, fuzzy
 msgid "Auto-detect"
-msgstr "Kasuta automaattuvastust"
+msgstr "Automaattuvastus"
 
-#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:185
-#, fuzzy
+#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:198
 msgid "Unknown|Generic"
-msgstr "Tavaline"
+msgstr "Tundmatu|Tavaline"
 
 #: ../../harddrake/v4l.pm_.c:97
 msgid "Unknown|CPH05X (bt878) [many vendors]"
-msgstr ""
+msgstr "Tundmatu|CPH05X (bt878) [paljud tootjad]"
 
 #: ../../harddrake/v4l.pm_.c:98
 msgid "Unknown|CPH06X (bt878) [many vendors]"
-msgstr ""
+msgstr "Tundmatu|CPH06X (bt878) [paljud tootjad]"
 
-#: ../../harddrake/v4l.pm_.c:209
+#: ../../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:212
-#, fuzzy
+#: ../../harddrake/v4l.pm_.c:227
 msgid "Card model:"
-msgstr "Kaardi m�lu (DMA)"
+msgstr "Kaardi mudel:"
 
-#: ../../harddrake/v4l.pm_.c:213
-#, fuzzy
+#: ../../harddrake/v4l.pm_.c:228
 msgid "Tuner type:"
-msgstr "Muuda partitsiooni t��p"
+msgstr "Tuuneri tüüp:"
 
-#: ../../harddrake/v4l.pm_.c:214
+#: ../../harddrake/v4l.pm_.c:229
 msgid "Number of capture buffers:"
-msgstr ""
+msgstr "Hõivepuhvrite arv:"
 
-#: ../../harddrake/v4l.pm_.c:214
+#: ../../harddrake/v4l.pm_.c:229
 msgid "number of capture buffers for mmap'ed capture"
-msgstr ""
+msgstr "hõivatavate puhvrite arv mmap-i jaoks"
 
-#: ../../harddrake/v4l.pm_.c:216
-#, fuzzy
+#: ../../harddrake/v4l.pm_.c:231
 msgid "PLL setting:"
-msgstr "vormindatakse"
+msgstr "PLL:"
 
-#: ../../harddrake/v4l.pm_.c:217
+#: ../../harddrake/v4l.pm_.c:232
 msgid "Radio support:"
-msgstr ""
+msgstr "Raadiotugi:"
 
-#: ../../harddrake/v4l.pm_.c:217
+#: ../../harddrake/v4l.pm_.c:232
 msgid "enable radio support"
-msgstr ""
+msgstr "raadiotoe lubamine"
 
 #: ../../help.pm_.c:13
 msgid ""
@@ -2870,9 +2676,53 @@ msgid ""
 "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"
+"\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"
+"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"
+"\n"
+"Klõps nupule \"Täpsemalt\" võimaldab muuta kasutajale määratavat vaike-"
+"\"shelli\"\n"
+"(vaikimisi on see bash).\n"
+"\n"
+"Kui olete kasutajate lisamise lõpetanud, pakutakse Teile valida kasutaja, "
+"kel on\n"
+"õigus logida süsteemi automaatselt, kui arvuti algkäivituse teeb. Kui see "
+"võimalus\n"
+"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\"."
 
 #: ../../help.pm_.c:48
-#, fuzzy
 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"
@@ -2904,34 +2754,31 @@ msgid ""
 "With SCSI hard drives, an \"a\" means \"lowest SCSI ID\", a \"b\" means\n"
 "\"second lowest SCSI ID\", etc."
 msgstr ""
-"�lalpool 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 "
-"installimisel\n"
-"Kasutajate jaoks on sageli m�istlik luua eraldi \"/home\" partitsioon.\n"
-"\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"
 "Iga partitsiooni juures on toodud abiinfona \"Nimi\" ja \"Mahutavus\".\n"
 "\n"
+"\"Nimi\" koosneb kõvakettatüübist, selle numbrist ja partitsiooni\n"
+"numbrist (näiteks \"hda1\").\n"
 "\n"
-"\"Nimi\" koosneb k�vakettat��bist, selle numbrist ja partitsiooni\n"
-"numbrist (n�iteks \"hda1\").\n"
-"\n"
-"\n"
-"K�vaketta t��p on \"hd\" kui on tegemist IDE kettaga ja \"sd\" kui on\n"
+"Kõvaketta tüüp on \"hd\", kui on tegemist IDE kettaga, ning \"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"
-"K�vaketta number on alati t�ht \"hd\" v�i \"sd\" j�rel. IDE ketastel:\n"
-"\n"
-"   * \"a\" - esmase IDE kontrolleri �lem,\n"
+" * \"a\" - esmase IDE kontrolleri ülem,\n"
 "\n"
-"   * \"b\" - esmase IDE kontrolleri alluv,\n"
+" * \"b\" - esmase IDE kontrolleri allutatu,\n"
 "\n"
-"   * \"c\" - teisase IDE kontrolleri �lem,\n"
+" * \"c\" - teisese IDE kontrolleri ülem,\n"
 "\n"
-"   * \"d\" - teisase IDE kontrolleri alluv.\n"
+" * \"d\" - teisese IDE kontrolleri allutatu.\n"
 "\n"
 "SCSI ketaste puhul on \"a\" esimene, \"b\" teine ja nii edasi."
 
@@ -2941,6 +2788,10 @@ msgid ""
 "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."
 
 #: ../../help.pm_.c:84
 msgid ""
@@ -2994,6 +2845,60 @@ msgid ""
 "groups to avoid installing any new package. This is useful to repair or\n"
 "update 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"
+"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"
+"\n"
+"Paketid on rühmitatud gruppidesse vastavalt nende kasutusalale. Grupid ise "
+"on\n"
+"jagatud nelja sektsiooni:\n"
+"\n"
+" * \"Tööjaam\": kui kavatsete kasutada arvutit tööjaama, valige siit "
+"sektsioonist\n"
+"üks või enam gruppidest;\n"
+"\n"
+" * \"Arendus\": kui kavatsete kasutada arvutit programmeerimiseks, valige\n"
+"soovitud grupid siit;\n"
+"\n"
+" * \"Server\": kui arvuti peab täitma serveri ülesandeid, saate siit "
+"valida,\n"
+"milliseid kõige enam levinud teenuseid oma masinale paigaldada;\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"
+"\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"
+"\n"
+" * \"X-iga\": paigaldatakse minimaalselt graafiliseks töölauaks vajalikud "
+"paketid;\n"
+"\n"
+" * \"Baasdokumentatsiooniga\": paigaldatakse baassüsteem ning põhilised\n"
+"utiliidid ja nende dokumentatsioon. See peaks sobima näiteks serverile;\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"
+"\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"
+"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:135
 msgid ""
@@ -3032,6 +2937,48 @@ msgid ""
 "another installation. See the second tip of the previous step on how to\n"
 "create such a floppy disk."
 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"
+"\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"
+"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_.c:171
 msgid ""
@@ -3056,9 +3003,32 @@ msgid ""
 "If you wish to configure the network later after installation, or if you\n"
 "are finished configuring your network connection, click \"Cancel\"."
 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"
+"\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"
+"\n"
+"Kui soovite seadistada võrku pärast paigaldust või olete lõpetanud selle\n"
+"seadistamise, vajutage nuppu \"Katkesta\"."
 
 #: ../../help.pm_.c:193
-#, fuzzy
 msgid ""
 "You may now choose which services you wish to start at boot time.\n"
 "\n"
@@ -3076,13 +3046,25 @@ msgid ""
 "enabled on a server. In general, select only the services you really need.\n"
 "!!"
 msgstr ""
-"N��d saate valida, milliseid teenused peaks s�steemi laadimisel k�ivitama.\n"
+"Nüüd saate valida, millised teenused peaks käivitama alglaadimisel.\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"
 "\n"
-"Abiinfo balloonis antakse l�hike kirjeldus iga�he kohta neist.\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"
 "\n"
-"Kui kavatsete oma s�steemi kasutada serverina, olge eriti t�helepanelik:\n"
-"t�en�oliselt ei soovi te k�ivitada mittevajalikke teenuseid."
+"!! 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 ""
@@ -3099,6 +3081,22 @@ msgid ""
 "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"
+"\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 ""
@@ -3123,6 +3121,30 @@ msgid ""
 "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"
+"\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"
+"\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"
+"\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 ""
@@ -3132,6 +3154,12 @@ msgid ""
 "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 ""
@@ -3158,9 +3186,35 @@ msgid ""
 "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"
+"alglaadimist CD-ROMilt, tuleks tulla selle sammu juurde tagasi abi otsima\n"
+"vähemalt kahe situatsiooni korral:\n"
+"\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 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"
+"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:277
-#, fuzzy
 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"
@@ -3231,50 +3285,88 @@ msgid ""
 "here, refer to the section ``Managing Your Partitions'' of the ````Starter\n"
 "Guide''''"
 msgstr ""
-"Olete j�udnud punkti, kus peate otsustama, kuhu t�pselt Mandrake Linux oma\n"
-"k�vakettal paigaldada. Kui k�vaketas on t�hi v�i kui 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 installimiseks.\n"
-"\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 abimees. Siiski,\n"
-"palun varuga natuke ettevalmistusaega\n"
-"\n"
-"\n"
-"Mandrake Linux jaoks on Teil vaja v�hemalt kaht partitsiooni. �hele "
-"paigutatakse\n"
-"operatsioonis�steem ise ja teisele luuakse virtuaalm�lu (saaleala e. swap).\n"
-"\n"
-"\n"
-"Kui partitsioonid on juba loodud (eelmise installi v�i m�ne muu vahendi\n"
-"abil), siis peate need lihtsalt Linuxi paigaldamise jaoks v�lja valima.\n"
-"\n"
-"\n"
-"Kui partitsioone ei ole varem loodud, peate kasutama �lalttoodud abimeest.\n"
-"Abimees hindab Teie k�vaketast ja pakub j�rgmised valikud:\n"
-"\n"
-"* Kasuta olemasolevaid partitsioone: abimees leidis kettalt Linuxi "
-"partitsioonid.\n"
-"  Kui soovite neid kasutada, valige see.\n"
-"\n"
-"\n"
-"* Puhasta kogu ketas: kui soovite alustada Mandrake Linux installimist "
-"t�iesti t�hjale kettale.\n"
-"  T�helepanu: k�ik andmed, mis enne kettal olid, h�vivad!\n"
-"\n"
-"\n"
-"* Kasuta vaba ruumi Windowsi partitsioonil: kui Microsoft Windows kasutab "
-"kogu Teie k�vaketta vaba pinna,\n"
-"  saate luua lisaruumi Windowsi partitsiooni suuruse muutmisel.\n"
-"  Sageli on see m�istlik, kui soovite kasutada ka Windowst.\n"
-"\n"
-"* Asjatundja: kui soovite ise oma k�vaketast jagada, valige see. Nii on Teil "
-"k�ige rohkem v�imalusi,\n"
-"  aga ka k�ige rohkem ohtusid! �rge valige seda, kui Te t�pselt ei tea, mida "
-"teete."
+"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"
+"\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"
+"\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"
+"\n"
+"Kui partitsioone veel ei ole, tuleb need nõustajat kasutades luua. "
+"Sõltuvalt\n"
+"kõvaketta omadustest on selleks mitmeid võimalusi.\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"
+"\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"
+"\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"
+"   !! 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:347
 msgid ""
@@ -3308,9 +3400,47 @@ msgid ""
 "(*) 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 \"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"
+"   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:378
-#, fuzzy
 msgid ""
 "Any partitions that have been newly defined must be formatted for use\n"
 "(formatting means creating a filesystem on it).\n"
@@ -3337,25 +3467,30 @@ msgid ""
 "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"
+"Kõik värskelt loodud partitsioonid tuleb enne kasutamist vormindada\n"
+"ehk sinna tuleb luua failisüsteemid.\n"
 "\n"
+"Samuti võib vormindada varem olemas olnud partitsioonid, kui soovite\n"
+"seal leiduvad andmed ära kustutada.\n"
 "\n"
-"Samuti v�ib vormindada varem olemas olnud partitsioonid, kui soovite\n"
-"seal leiduvad andmed �ra kustutada.\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"
+"Olge partitsioonide valikul hoolas. Pärast vormindamist on kõik valitud\n"
+"partitsioonidel asunud andmed kustutatud ning neid pole võimalik taastada.\n"
 "\n"
-"Paneme t�hele, et alati ei ole k�igi vanade partitsioonide vormindamine\n"
-"vajalik.\n"
-"Kindlasti v�ib vormindada partitsioone, kus varem asus \"/\", \"/usr\"\n"
-"v�i \"/var\" aga kasutajate faile sisaldav \"/home\" v�iks j��da\n"
-"alles.\n"
+"Klõpsake \"Olgu\", kui olete vormindamiseks valmis.\n"
 "\n"
+"Klõpsake \"Katkesta\", kui soovite valida oma uue Mandrake Linuxi süsteemi\n"
+"paigaldamiseks mõne muu partitsiooni.\n"
 "\n"
-"Klikkige \"OK\", kui olete vormindamiseks valmis."
+"Klõpsake \"Muud\", kui soovite valida partitsioone, millel kontrollitaks "
+"halbade\n"
+"blokkide olemasolu."
 
 #: ../../help.pm_.c:404
-#, fuzzy
 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"
@@ -3364,12 +3499,11 @@ msgid ""
 "\n"
 "Please be patient."
 msgstr ""
-"Teie Mandrake Linux s�steemi hakati n��d installima. Selleks v�ib\n"
-"olenevalt Teie poolt valitud pakettide arvust ja Teie arvuti kiirusest\n"
-"kuluda m�nik�mmend minutit.\n"
+"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"
 "\n"
-"\n"
-"Palun veidi kannatlikkust."
+"Palun varuge kannatust."
 
 #: ../../help.pm_.c:412
 msgid ""
@@ -3385,6 +3519,22 @@ msgid ""
 "appears: review the selection, and press \"Install\" to retrieve and\n"
 "install 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"
+"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_.c:425
 msgid ""
@@ -3394,6 +3544,13 @@ msgid ""
 "immediately terminate the installation. To continue with the installation,\n"
 "click on the \"Accept\" button."
 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\"."
 
 #: ../../help.pm_.c:432
 msgid ""
@@ -3406,9 +3563,15 @@ msgid ""
 "\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"
+"Kui Te ei tea, mida valida, leppige pakutud võimalusega."
 
 #: ../../help.pm_.c:442
-#, fuzzy
 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"
@@ -3480,67 +3643,79 @@ msgid ""
 "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 Linux installida.\n"
-"\n"
-"Partitsioon on loogiliselt eraldatud k�vaketta piirkond, mille suurust\n"
-"ei ole v�imalik hiljem, t��tavas s�steemis enam muuta. Samuti h�vivad\n"
-"partitsiooni kustutamisel k�ik sellel sisalduvad andmed.\n"
-"\n"
-"Et muuta seda tegevust lihtsamaks, on loodud Abimees, mille soovitused\n"
-"on harilikult m�istlikud.\n"
+"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"
+"partitsioone. Vastasel juhul tuleb need luua.\n"
 "\n"
+"Partitsioon on loogiliselt eraldatud kõvaketta piirkond, mille suurust\n"
+"ei ole võimalik hiljem, töötavas süsteemis enam muuta. Samuti hävivad\n"
+"partitsiooni kustutamisel kõik sellel sisalduvad andmed.\n"
 "\n"
-"Partitsioonide loomiseks valige esmalt k�vaketas.\n"
+"Et muuta seda tegevust lihtsamaks, on loodud nõustaja, mille soovitused\n"
+"on harilikult mõistlikud.\n"
 "\n"
+"Partitsioonide loomiseks valige esmalt kõvaketas. ``hda'' tähendab siin "
+"esimest\n"
+"IDE-ketast, ``hdb'' teist IDE-ketast, ``sda'' esimest SCSI-ketast ja nii "
+"edasi.\n"
 "\n"
-"Valitud ketta partitsioneerimiseks on j�rgmised v�imalused:\n"
+"Valitud ketta partitsioneerimiseks on järgmised võimalused:\n"
 "\n"
-"   * Puhasta k�ik: kustutatakse k�ik olemasolevad partitsioonid sellel "
-"kettal\n"
+" * \"Puhasta kõik\": kustutatakse kõik olemasolevad partitsioonid\n"
+"sellel kettal.\n"
 "\n"
+" * \"Paiguta automaatselt\": sel juhul tekitatakse Linuxile vajalikud\n"
+"partitsioonid vabale kettapinnale automaatselt.\n"
 "\n"
-"   * Paiguta ise: sel juhul tekitatakse Linuxi jaoks vajalikud partitsioonid "
-"vabale kettapinnale automaatselt.\n"
+"\"Rohkem\": pakub mõned lisavõimalused:\n"
+" * \"Salvesta partitsioonitabel\": salvestab partitsioonitabeli "
+"flopikettale.\n"
+"Sellest on kasu hilisemal partitsioonitabeli taastamisel, kui seda vaja\n"
+"peaks olema. Igal juhul on äärmiselt soovitav see samm ette võtta.\n"
 "\n"
+" * \"Taasta partitsioonitabel\": võimaldab taastada flopikettalt varem\n"
+"salvestatud partitsioonitabeli.\n"
 "\n"
-"   * P��sta partitsioonitabel: kui partitsioonitabel on vigastatud, v�ib "
-"proovida seda parandada. \n"
-"     Palun �rge sellega igaks juhuks palju arvestage.\n"
+" * \"Päästa partitsioonitabel\": kui partitsioonitabel on vigastatud, võib\n"
+"proovida seda parandada. Palun ärge selle peale siiski liiga palju lootke.\n"
 "\n"
+" * \"Lae uuesti\": kui soovite tühistada kõik enda tehtud muutused ja "
+"alustada algse partitsioonitabeliga.\n"
 "\n"
-"   * Lae uuesti: kui soovite t�histada k�ik enda tehtud muutused ja alustada "
-"algse partitsioonitabeliga\n"
+" * \"Eemaldatava andmekandja automaathaakimine\": selle võimaluse\n"
+"tühistamine sunnib kasutajaid käsitsi haakima ja lahutama eemaldatavaid\n"
+"andmekandjaid, st flopikettaid ja CD-ROMe.\n"
 "\n"
+" * \"Nõustaja\": kui soovite uue partitsioonitabeli loomisel samm-sammulist\n"
+"juhatust. See on soovitatav, kui Te ei ole varem midagi sellist teinud.\n"
 "\n"
-"   * Abimees: kui soovite uue partitsioonitabeli loomisel samm-sammulist "
-"juhatust.\n"
-"     Soovitav, kui ei ole varem midagi sellist teinud.\n"
+" * \"Tühista\": selle võimalusega saab tühistada kõik tehtud muudatused.\n"
 "\n"
+" * \"Tava/Ekspertresiimi lülitamine\": võimaldab partitsioonidega ette\n"
+"võtta lisaoperatsioone (tüüp, võtmed, vorming) ning pakub rohkem infot.\n"
 "\n"
-"   * Taasta flopilt: kui olete varem salvestanud koopia "
-"partitsioonitabelist\n"
-"     flopile, tuleb see n��d kasuks\n"
+"Märkus: igale võimalusele pääseb ligi ka klaviatuuri abil. Partitsioonidel\n"
+"saab liikuda klahvidega [Tab] ning üles-alla nooleklahvidega.\n"
 "\n"
+"Valitud partitsioonil on võimalikud järgmised tegevused:\n"
 "\n"
-"   * Salvesta flopile: kui soovite salvestada partitsioonitabeli flopile, "
-"et\n"
-"     vajadusel oleks v�imalik sealt taastada.\n"
-"\n"
-"\n"
-"   * Tehtud: kui olete partitsioneerimise l�petanud, siis saate muutused "
-"n��d salvestada\n"
-"\n"
+" * Ctrl-c uue partitsiooni loomine (kui valitud on tühi partitsioon).\n"
 "\n"
-"Valitud partitsioonil on v�imalikud j�rgmised tegevused:\n"
+" * Ctrl-d partitsiooni kustutamine.\n"
 "\n"
-"           * Ctrl-c uue partitsiooni loomine\n"
+" * Ctrl-m haakepunkti seadmine.\n"
 "\n"
-"           * Ctrl-d partitsiooni kustutamine\n"
+"Lähemat infot erinevate failisüsteemitüüpide kohta leiab käsiraamatu\n"
+"peatükist ext2FS.\n"
 "\n"
-"           * Ctrl-m �henduspunkti seadmine"
+"Kui paigaldus toimub PPC-masinale, tuleks luua vähemalt 1MB suurune\n"
+"väike HFS ``bootstrap'' partitsioon, mida kasutab alglaadur yaboot. Kui Te\n"
+"aga teete selle partitsiooni natukene suuremaks (näiteks nii umbes 50MB),\n"
+"on see päris hea koht, kuhu hädaolukorraks paigutada tagavarakernel\n"
+"ja ramdisk-laadepildid."
 
 #: ../../help.pm_.c:513
-#, fuzzy
 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"
@@ -3572,43 +3747,39 @@ msgid ""
 "\"Windows name\" is the letter of your hard drive under Windows (the first\n"
 "disk or partition is called \"C:\")."
 msgstr ""
-"Teie arvuti k�vakettal on rohkem kui �ks Microsoft Windows partitsioon.\n"
-"Palun valige v�lja see, mille suurust soovite Mandrake Linux jaoks muuta.\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"
-"\n"
-"Teie abistamiseks on iga partitsioonidel n�idatud \"Nimi Linuxis\", \"Nimi "
+"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"
-"\n"
-"K�vaketta t��p on \"hd\" kui on tegemist IDE kettaga ja \"sd\" kui on\n"
-"tegemist SCSI kettaga.\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"
+"Kõvaketta number on alati täht \"hd\" või \"sd\" järel. IDE-ketastel:\n"
 "\n"
-"   * \"a\" - esmase IDE kontrolleri �lem,\n"
+" * \"a\" - esmase IDE kontrolleri ülem,\n"
 "\n"
-"   * \"b\" - esmase IDE kontrolleri alluv,\n"
+" * \"b\" - esmase IDE kontrolleri allutatu,\n"
 "\n"
-"   * \"c\" - teisase IDE kontrolleri �lem,\n"
+" * \"c\" - teisese IDE kontrolleri ülem,\n"
 "\n"
-"   * \"d\" - teisase IDE kontrolleri alluv.\n"
+" * \"d\" - teisese IDE kontrolleri allutatu.\n"
 "\n"
-"SCSI ketaste puhul on \"a\" esimene, \"b\" teine ja nii edasi.\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."
+"\"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 natuke kannatust. Selleks v�ib kuluda m�nigi minut."
+msgstr "Palun varuge kannatust. Selleks võib kuluda mõnigi minut."
 
 #: ../../help.pm_.c:547
-#, fuzzy
 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"
@@ -3644,30 +3815,43 @@ msgid ""
 "so it is not recommended that those without a fair amount of experience\n"
 "select this installation class."
 msgstr ""
-"Palun valige \"Installimine\" kui Teie arvutis ei ole varasemat Mandrake "
-"Linux\n"
-"versiooni.\n"
+"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"
 "\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"
 "\n"
-"Palun valige \"Uuendamine\" kui soovite uuendada varasemat Mandrake Linux "
-"versiooni.\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"
-"S�ltuvalt Teie GNU/Linuxi alastest teadmistest saate valida erineva tasemega "
-"installi- v�i uuendusmeetodi:\n"
+"Uuendamine peaks toimina edukalt Mandrake Linuxi süsteemidel, mille "
+"versioon\n"
+"on \"8.1\" või uuem.\n"
 "\n"
-"* Soovituslik: Te ei ole varem GNU/Linuxit installinud. K�ik tehakse "
-"lihtsaks ja esitatakse v�he k�simusi\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"
-"* Isetehtud: Olete Linuxiga tuttav ja soovite s�steemi kohandada vastavalt\n"
-"  Teie vajadustele. J�rgmisena saate teha valikud s�ltuvalt Teie arvuti \n"
-"  edaspidisest kasutusalast.\n"
-"\n"
-"\n"
-"* Ekspert: Te tunnete end GNU/Linux 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!"
+"* 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 ""
@@ -3686,6 +3870,19 @@ msgid ""
 "asked in the next dialog to choose the key binding that will switch the\n"
 "keyboard layout between the latin and non-latin layouts."
 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"
+"\n"
+"Klõpsake nupul \"Rohkem\", mis näitab kõiki toetatud klaviatuure.\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 ""
@@ -3707,6 +3904,22 @@ msgid ""
 "\"/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"
+"\n"
+"Palun valige keel, mida kasutada paigaldamisel ja hilisemas töös.\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"
+"\n"
+"Paigaldada võib ka mitu keelt. Kui olete valinud, millised lisakeeled\n"
+"paigaldada, klõpsake jätkamiseks nupul \"Olgu\".\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."
 
 #: ../../help.pm_.c:617
 msgid ""
@@ -3730,15 +3943,37 @@ msgid ""
 "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"
+"\n"
+"Kui soovite muuta hiiretüüpi, valige pakutud nimekirjast sobiv tüüp.\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"
+"\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."
 
 #: ../../help.pm_.c:638
-#, fuzzy
 msgid ""
 "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 Windows-i COM1 kannab GNU/Linuxis\n"
-"nime ttyS0."
+"Palun valige õige port. Näiteks MS Windowsi \"COM1\" kannab\n"
+"GNU/Linuxis nime \"ttyS0\"."
 
 #: ../../help.pm_.c:642
 msgid ""
@@ -3777,6 +4012,46 @@ msgid ""
 "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"
+"\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"
+"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"
+"\n"
+"Kui arvuti ei ole ühendatud ühtegi administreeritavasse võrku, on mõttekas\n"
+"valida autentimisviis \"Kohalikud failid\"."
 
 #: ../../help.pm_.c:678
 msgid ""
@@ -3819,9 +4094,49 @@ msgid ""
 "Clicking the \"Advanced\" button in this dialog will offer many advanced\n"
 "options, which are reserved for the expert user."
 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"
+"\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"
+"\n"
+" * kui leitakse grubi või LILO alglaadimissektor, asendatakse see uuega.\n"
+"\n"
+"kui DrakX ei suuda selgusele jõuda, palub ta valiku teha Teil.\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"
+"\n"
+"    * \"LILO tekstiresiimis\": kui eelistate LILOt teksti kujul.\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"
+"\n"
+"Klõpsuga nupul \"Muud\" saab näha veel mitmeid valikuid, mis on mõeldud\n"
+"kogenud kasutajatele."
 
 #: ../../help.pm_.c:718
-#, fuzzy
 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"
@@ -3836,14 +4151,21 @@ msgid ""
 "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!"
 msgstr ""
-"LILO (ehk LInux LOader) ja Grub on alglaadurid: nad v�imaldavad laadida\n"
-"kas GNU/Linuxi v�i m�ne muu Teie arvutis olevad operatsioonis�steemi.\n"
-"Tavaliselt tuvastakse teised operatsioonis�steemid �igesti ja seadistatakse\n"
-"ka alglaadur. Kui Teil aga ei ole �nne, tuleb parameetrid seada\n"
-"k�sitsi. Olge sel juhul hoolas valima �iged."
+"Kui olete määranud alglaaduri üldised parameetrid, näidatakse loendit\n"
+"alglaadimise ajal kasutatavatest valikutest.\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"
+"\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_.c:732
-#, fuzzy
 msgid ""
 "You must indicate where you wish to place the information required to boot\n"
 "GNU/Linux.\n"
@@ -3851,9 +4173,9 @@ msgid ""
 "Unless you know exactly what you are doing, choose \"First sector of drive\n"
 "(MBR)\"."
 msgstr ""
-"N��d peate valima, milliselt kettaosalt soovite GNU/Linuxit laadida.\n"
+"Nüüd peate valima, milliselt kettaosalt soovite GNU/Linuxit laadida.\n"
 "\n"
-"Valige \"K�vaketta esimene sektor (MBR)\", kui ei tea t�pselt, mida\n"
+"Valige \"Kõvaketta esimene sektor (MBR)\", kui Te ei tea täpselt, mida\n"
 "teha."
 
 #: ../../help.pm_.c:739
@@ -3877,9 +4199,36 @@ msgid ""
 "emulate an \"lpd\" server, you must turn on the \"cups-lpd\" daemon. It has\n"
 "graphical front-ends for printing or choosing printer options."
 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"
+" * \"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"
+"\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."
 
 #: ../../help.pm_.c:759
-#, fuzzy
 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"
@@ -3902,32 +4251,33 @@ msgid ""
 "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."
 msgstr ""
-"Esmalt otsib DrakX PCI siini SCSI liideseid. Kui neid leitakse, ja \n"
-"vastav(ad) juhtprogramm(id) on teada, siis laetakse ja installitakse \n"
-"k�ik vajalik automaatselt.\n"
-"\n"
-"\n"
-"Kui Teie SCSI liides kasutab ISA siini v�i kui DrakX ei tea,\n"
-"millist juhtprogrammi kasutada v�i Teil ei ole �ldse SCSI liidest,\n"
-"siis k�sitakse Teilt selle kohta.\n"
-"Kui Teil SCSI liidest t�esti ei ole, vastake \"Ei\". Kui Teil aga siiski\n"
-"on, siis vastake \"Jah\". Seej�rel lastakse Teil nimekirjast sobiv\n"
-"juhtprogramm valida.\n"
-"\n"
-"\n"
-"Kui olete juhtprogrammi v�lja valinud, on Teil v�imalus anda sellele\n"
-"ka parameetreid. Siiski, enamasti l�heb k�ik kenasti ka ilma neid\n"
-"sisestamata: vastavad andmed leiab juhtprogramm ise.\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.\n"
-"Vaadake ka User Guide'i (peat�kk 2, l�ik \"Collective informations on your\n"
-"hardware\")\n"
-"Ka samas masinas olev Windows oskab vahel SCSI kohta kasulikku \n"
-"informatsiooni anda."
+"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"
+"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"
+"\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"
+"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:781
-#, fuzzy
 msgid ""
 "You can add additional entries for yaboot, either for other operating\n"
 "systems, alternate kernels, or for an emergency boot image.\n"
@@ -3975,78 +4325,60 @@ msgid ""
 "also be highlighted with a ``*'', if you press [Tab] to see the boot\n"
 "selections."
 msgstr ""
-"You can add additional entries for yaboot, either for other operating "
-"systems,\n"
-"alternate kernels, or for an emergency boot image.\n"
-"\n"
-"\n"
-"For other OS's - the entry consists only of a label and the root partition.\n"
-"\n"
+"Yabooti jaoks on võimalik lisada kirjeid kas teiste operatsioonisüsteemide,\n"
+"alternatiivsete kernelite või hädaolukorras alglaadimistõmmise leidmiseks.\n"
 "\n"
-"For Linux, there are a few possible options: \n"
+"Teiste operatsioonisüsteemide kirje sisaldab vaid pealdist ja "
+"juurpartitsiooni.\n"
 "\n"
+"Linuxi puhul on võimalusi rohkem:\n"
 "\n"
-"  - Label: This is simply the name will type at the yaboot prompt to select "
-"this \n"
-"boot option.\n"
+" * Pealdis: lihtsalt nimetus, mida tuleb kirjutada, kui yaboot pärib teilt "
+"alglaadimise\n"
+"ajal, mida laadida.\n"
 "\n"
+" * Laadepilt: alglaaditava kerneli nimetus, tavaliselt vmlinux koos või ilma "
+"laiendita.\n"
 "\n"
-"  - Image: This would be the name of the kernel to boot.  Typically vmlinux "
-"or\n"
-"a variation of vmlinux with an extension.\n"
+" * Juur: juurseade ehk Teie Linuxi ``/''.\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"
 "\n"
-"  - Root: The root device or '/' for your Linux installation.\n"
-"\n"
-"\n"
-"  \n"
-"  - Append: On Apple hardware, the kernel append option is used quite often "
-"to\n"
-"assist in initializing video hardware, or to enable keyboard mouse button "
-"emulation\n"
-"for the often lacking 2nd and 3rd mouse buttons on a stock Apple mouse.  The "
-"following \n"
-"are some examples:\n"
-"\n"
-"\n"
-"\t video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111 "
+"         video=aty128fb:vmode:17,cmode:32,mclk:71 adb_buttons=103,111\n"
 "hda=autotune\n"
 "\n"
-"\t video=atyfb:vmode:12,cmode:24 adb_buttons=103,111 \n"
-"\n"
-"\n"
-" \n"
-"  - Initrd: This option can be used either to load initial modules, before "
-"the boot \n"
-"device is available, or to load a ramdisk image for an emergency boot "
-"situation.\n"
-"\n"
-"\n"
-"  - Initrd-size: The default ramdisk size is generally 4096 bytes.  If you "
-"should need\n"
-"to allocate a large ramdisk, this option can be used.\n"
-"\n"
+"         video=atyfb:vmode:12,cmode:24 adb_buttons=103,111\n"
 "\n"
-"  - Read-write: Normally the 'root' partition is initially brought up read-"
-"only, to allow\n"
-"a filesystem check before the system becomes 'live'.  You can override this "
-"option here.\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"
+" * Initrd-size: ramdiski suurus on tavaliselt 4096 baiti. Kui teil peaks "
+"minema\n"
+"tarvis suuremat, saab seda siin määrata.\n"
 "\n"
-"  - NoVideo: Should the Apple video hardware prove to be exceptionally "
-"problematic, you can\n"
-"select this option to boot in 'novideo' mode, with native framebuffer "
-"support.\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"
+" * 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"
 "\n"
-"  - Default: Selects this entry as being the default Linux selection, "
-"selectable by just\n"
-"pressing ENTER at the yaboot prompt.  This entry will also be highlighted "
-"with a '*', if you\n"
-"press TAB to see the boot selections."
+" * 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 (``*'')."
 
 #: ../../help.pm_.c:828
-#, fuzzy
 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"
@@ -4079,52 +4411,44 @@ msgid ""
 " * Default OS: you can select which OS will boot by default when the Open\n"
 "Firmware Delay expires."
 msgstr ""
-"Yaboot is a bootloader for NewWorld MacIntosh hardware. It is able\n"
-"to boot either GNU/Linux, MacOS, or MacOSX, if present on your computer.\n"
-"Normally, these other operating systems are correctly detected and\n"
-"installed. If this is not the case, you can add an entry by hand in this\n"
-"screen. Be careful as to choose the correct parameters.\n"
-"\n"
-"\n"
-"Yaboot main options are:\n"
-"\n"
-"\n"
-"  - Init Message: A simple text message that is displayed before the boot\n"
-"prompt.\n"
-"\n"
-"\n"
-"  - Boot Device: Indicate where you want to place the information required "
-"to \n"
-"boot to GNU/Linux. Generally, you will have setup a bootstrap partition "
-"earlier \n"
-"to hold this information.\n"
-"\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"
-"  - 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"
+"Yabooti põhivalikud on järgmised:\n"
 "\n"
+" * Initsialiseerimisteade: tavaline tekstisõnum, mida näidatakse enne\n"
+"alglaadimise käsurea ilmumist.\n"
 "\n"
-"  - Kernel Boot Timeout: This timeout is similar to the LILO boot delay.  "
-"After \n"
-"selecting Linux, you will have this delay in 0.1 seconds before your "
-"default\n"
-"kernel description is selected.\n"
+" * Alglaadimisseade: näitab, kuhu soovite panna info, mida läheb vaja\n"
+"GNU/Linuxi algkäivituseks. Üldiselt tuleks selle info tarbeks juba varem "
+"luua\n"
+"alglaadimispartitsioon.\n"
 "\n"
+" * Open Firmware viivitus: Erinevalt 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"
 "\n"
-"  - Enable CD Boot?: Checking this option will allow you to choose 'C' for "
-"CD at\n"
-"the first boot prompt.\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"
 "\n"
+" * Lubada alglaadimine CD-lt?: Selle valimine võimaldab alglaadimise "
+"käsureale\n"
+"``C'' kirjutades valida CD.\n"
 "\n"
-"  - Enable OF Boot?: Checking this option will allow you to choose 'N' for "
-"Open\n"
-"Firmware at the first boot prompt.\n"
+" * Lubada OF alglaadimine?: Selle valimine võimaldab alglaadimise käsureale\n"
+"``N'' kirjutades valida Open Firmware.\n"
 "\n"
-"\n"
-"  - Default OS: You can select which OS will boot by default when the Open "
-"Firmware \n"
-"Delay expires."
+" * OS vaikimisi: Siin võite valida, milline operatsioonisüsteem laaditakse "
+"vaikimisi,\n"
+"kui Open Firmware viivitus läbi saab."
 
 #: ../../help.pm_.c:860
 msgid ""
@@ -4149,29 +4473,61 @@ msgid ""
 "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. No modification possible at installation time;\n"
+"displayed here.\n"
 "\n"
 " * \"TV card\": if a TV card is detected on your system, it will be\n"
-"displayed here. No modification possible at installation time;\n"
+"displayed here.\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."
 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"
+"\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"
+" * \"Helikaart\": kui süsteemis leiti helikaart, näidatakse seda. Paigalduse "
+"ajal pole\n"
+"seda võimalik (ümber) seadistada.\n"
+"\n"
+" * \"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:891
-#, fuzzy
 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!"
 msgstr ""
-"Valige k�vaketas, mida soovite Mandrake Linux installimiseks puhastada\n"
-"Ettevaatust, k�ik sellel leiduvad andmed h�vitatakse ja ei ole enam\n"
-"taastatavad."
+"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."
 
 #: ../../help.pm_.c:896
-#, fuzzy
 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"
@@ -4181,11 +4537,9 @@ msgid ""
 "Click on \"Cancel\" to stop this operation without losing any data and\n"
 "partitions present on this hard drive."
 msgstr ""
-"Valige \"OK\" kui soovite kustutada k�ik sellel kettal asuvad "
-"partitsioonid.\n"
-"Ettevaatust, peale \"OK\" klikkimist ei ole enam v�imalik sellelt kettalt\n"
-"andmeid taastada.\n"
-"\n"
+"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\"."
 
@@ -4196,11 +4550,14 @@ msgid ""
 "missing), this generally means your boot floppy in not in sync with the "
 "Installation medium (please create a newer boot floppy)"
 msgstr ""
+"Ligipääs Teie kernelile vastavatele kerneli moodulitele ebaõnnestus (puudub "
+"fail %s), mis enamasti tähendab, et Teie alglaadimisflopi ei ole sünkroonis "
+"paigaldus-andmekandjaga (palun looge uus alglaadimisflopi)"
 
 #: ../../install2.pm_.c:167
 #, c-format
 msgid "You must also format %s"
-msgstr ""
+msgstr "Vormindada tuleb ka %s"
 
 #: ../../install_any.pm_.c:423
 #, c-format
@@ -4216,6 +4573,16 @@ msgid ""
 "\n"
 "Do you really want to install these servers?\n"
 msgstr ""
+"Olete valinud järgmise(d) serveri(d): %s\n"
+"\n"
+"\n"
+"Need serverid aktiveeritakse vaikimisi. Pole küll teada, et neil oleks\n"
+"turvaprobleeme, aga nende leidmine tulevikus pole sugugi välistatud.\n"
+"Kui peaks nii minema, kontrollige, et suudate uuenduse võimalikult\n"
+"ruttu hankida.\n"
+"\n"
+"\n"
+"Kas tõesti paigaldada need serverid?\n"
 
 #: ../../install_any.pm_.c:441
 #, c-format
@@ -4225,146 +4592,150 @@ msgid ""
 "\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_.c:471
 msgid "Can't use broadcast with no NIS domain"
-msgstr "�ldlevi kasutamine on ilma NIS domeenita v�imatu"
+msgstr "Üldlevi kasutamine on ilma NIS domeenita võimatu"
 
-#: ../../install_any.pm_.c:870
+#: ../../install_any.pm_.c:879
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "Pane FAT formaadis flopi seadmesse %s"
+msgstr "Pange FAT-vormingus flopi seadmesse %s"
 
-#: ../../install_any.pm_.c:874
+#: ../../install_any.pm_.c:883
 msgid "This floppy is not FAT formatted"
-msgstr "See flopi ei ole FAT formaadis"
+msgstr "See flopi ei ole FAT-vormingus"
 
-#: ../../install_any.pm_.c:886
+#: ../../install_any.pm_.c:895
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
 msgstr ""
-"Et kasutada seda paketivalikut, alustage installimist k�sureaga \"linux "
+"Selle paketivaliku kasutamiseks alustage paigaldamist käsuga \"linux "
 "defcfg=floppy\""
 
-#: ../../install_any.pm_.c:909 ../../partition_table.pm_.c:767
+#: ../../install_any.pm_.c:918 ../../partition_table.pm_.c:767
 #, c-format
 msgid "Error reading file %s"
 msgstr "Viga faili %s lugemisel"
 
-#: ../../install_any.pm_.c:1031
+#: ../../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\n"
+"Tekkis viga: failisüsteemi loomiseks ei leitud ühtki seadet. Palun "
 "kontrollige oma riistvara."
 
-#: ../../install_interactive.pm_.c:23
+#: ../../install_interactive.pm_.c:21
 #, 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 juhtprogramme.\n"
-"Informatsiooni nende kohta saate: %s"
+"Osa Teie riistvarast nõuab tarnijapoolseid draivereid.\n"
+"Infot nende kohta saate: %s"
 
-#: ../../install_interactive.pm_.c:58
+#: ../../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 \"�henduspunkt\" ja seadke see kui '/'"
+"Selleks looge uus partitsioon (või valige üks olemasolevatest).\n"
+"Siis valige tegevus \"Haakepunkt\" ja määrake see kui '/'"
 
-#: ../../install_interactive.pm_.c:63
+#: ../../install_interactive.pm_.c:61
 msgid "You must have a swap partition"
 msgstr "Teil peab olema saaleala"
 
-#: ../../install_interactive.pm_.c:64
+#: ../../install_interactive.pm_.c:62
 msgid ""
 "You don't have a swap partition.\n"
 "\n"
 "Continue anyway?"
 msgstr ""
-"Saaleala ei ole m��ratud\n"
+"Saaleala ei ole määratud.\n"
 "\n"
-"J�tkate ikkagi?"
+"Kas ikkagi jätkata?"
 
-#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:169
-#, fuzzy
+#: ../../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 saaleala"
+msgstr "Teil peab olema FAT-partitsioon haagitud asukohas /boot/efi"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:90
 msgid "Use free space"
 msgstr "Kasuta vaba ruumi"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../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:102
+#: ../../install_interactive.pm_.c:100
 msgid "Use existing partitions"
 msgstr "Kasuta olemasolevat partitsiooni"
 
-#: ../../install_interactive.pm_.c:104
+#: ../../install_interactive.pm_.c:102
 msgid "There is no existing partition to use"
 msgstr "Kasutatavat partitsiooni ei leitud"
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:109
 msgid "Use the Windows partition for loopback"
-msgstr "Kasuta Windowsi partitsiooni loopback-ina"
+msgstr "Kasuta Windowsi partitsiooni loopbackina"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:112
 msgid "Which partition do you want to use for Linux4Win?"
-msgstr "Millisele partitsioonile soovite installida Linux4Win?"
+msgstr "Millisele partitsioonile soovite paigaldada Linux4Win?"
 
-#: ../../install_interactive.pm_.c:116
+#: ../../install_interactive.pm_.c:114
 msgid "Choose the sizes"
 msgstr "Valige suurused"
 
-#: ../../install_interactive.pm_.c:117
+#: ../../install_interactive.pm_.c:115
 msgid "Root partition size in MB: "
 msgstr "Juurpartitsiooni suurus (MB): "
 
-#: ../../install_interactive.pm_.c:118
+#: ../../install_interactive.pm_.c:116
 msgid "Swap partition size in MB: "
 msgstr "Saaleala suurus (MB): "
 
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:126
 msgid "Use the free space on the Windows partition"
 msgstr "Kasuta vaba ruumi Windowsi partitsioonil"
 
-#: ../../install_interactive.pm_.c:131
+#: ../../install_interactive.pm_.c:129
 msgid "Which partition do you want to resize?"
-msgstr "Mis partitsiooni soovite muuta?"
+msgstr "Millist partitsiooni soovite muuta?"
 
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:131
 msgid "Resizing Windows partition"
-msgstr "Arvutan Windowsi failis�steemi piire"
+msgstr "Arvutan Windowsi failisüsteemi piire"
 
-#: ../../install_interactive.pm_.c:136
+#: ../../install_interactive.pm_.c:134
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
 "the following error occured: %s"
 msgstr ""
-"FAT partitsiooni suurust ei �nnestu muuta, \n"
+"FAT-partitsiooni suurust ei õnnestunud muuta, \n"
 "ilmnes selline viga: %s"
 
-#: ../../install_interactive.pm_.c:139
+#: ../../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 kasutada 'defrag'-i"
+"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:140
-#, fuzzy
+#: ../../install_interactive.pm_.c:138
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4377,89 +4748,89 @@ msgid ""
 msgstr ""
 "HOIATUS!\n"
 "\n"
-"DrakX hakkab Teie Windowsi partitsiooni suurust muutma. Olge ettevaatlik:\n"
-"see operatsioon v�ib olla ohtlik Teie failidele. Palun kasutage enne\n"
-"scandisk-i, defrag-i ja tehke tagavarakoopia.\n"
-"Kui olete oma otsuses kindel, vajutage OK."
+"DrakX hakkab Teie Windowsi partitsiooni suurust muutma.\n"
+"Olge ettevaatlik: see operatsioon võib olla ohtlik Teie failidele.\n"
+"Palun kasutage enne scandisk-i, defrag-i ja tehke tagavarakoopia.\n"
+"Kui olete oma otsuses kindel, vajutage \"Olgu\"."
 
-#: ../../install_interactive.pm_.c:150
+#: ../../install_interactive.pm_.c:148
 msgid "Which size do you want to keep for Windows on"
-msgstr "Kui palju ruumi j�tate Windowsi jaoks?"
+msgstr "Kui palju ruumi jätate Windowsi jaoks?"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:149
 #, c-format
 msgid "partition %s"
-msgstr "Partitsioon %s"
+msgstr "partitsioon %s"
 
-#: ../../install_interactive.pm_.c:158
+#: ../../install_interactive.pm_.c:156
 #, c-format
 msgid "FAT resizing failed: %s"
-msgstr "Suuruse muutmine eba�nnestus: %s"
+msgstr "FATi suuruse muutmine ebaõnnestus: %s"
 
-#: ../../install_interactive.pm_.c:173
+#: ../../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)"
+msgstr "Sobivat FAT-partitsiooni ei leitud (ei ole piisavalt ruumi)"
 
-#: ../../install_interactive.pm_.c:179
+#: ../../install_interactive.pm_.c:177
 msgid "Erase entire disk"
-msgstr "T�hjenda kogu ketas"
+msgstr "Tühjenda kogu ketas"
 
-#: ../../install_interactive.pm_.c:179
+#: ../../install_interactive.pm_.c:177
 msgid "Remove Windows(TM)"
 msgstr "Eemalda Windows(TM)"
 
-#: ../../install_interactive.pm_.c:182
+#: ../../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 neis installite Linuxi?"
+msgstr "Teil on rohkem kui üks kõvaketas, millisele neist paigaldate Linuxi?"
 
-#: ../../install_interactive.pm_.c:185
+#: ../../install_interactive.pm_.c:183
 #, 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"
+msgstr "Kettal %s hävivad KÕIK partitsioonid ja andmed"
 
-#: ../../install_interactive.pm_.c:193
+#: ../../install_interactive.pm_.c:191
 msgid "Custom disk partitioning"
 msgstr "Partitsioneerin ise"
 
-#: ../../install_interactive.pm_.c:197
+#: ../../install_interactive.pm_.c:195
 msgid "Use fdisk"
 msgstr "Kasuta fdisk-i"
 
-#: ../../install_interactive.pm_.c:200
+#: ../../install_interactive.pm_.c:198
 #, c-format
 msgid ""
 "You can now partition %s.\n"
 "When you are done, don't forget to save using `w'"
 msgstr ""
-"N��d saate partitsioneerida %s k�vaketta\n"
-"Kui olete valmis, salvestage k�suga 'w'"
+"Nüüd saate partitsioneerida %s kõvaketta\n"
+"Kui olete valmis, salvestage käsuga 'w'"
 
-#: ../../install_interactive.pm_.c:229
+#: ../../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:245
+#: ../../install_interactive.pm_.c:243
 msgid "I can't find any room for installing"
-msgstr "Installimiseks ei ole �ldse ruumi"
+msgstr "Paigalduseks ei ole üldse ruumi"
 
-#: ../../install_interactive.pm_.c:248
+#: ../../install_interactive.pm_.c:246
 msgid "The DrakX Partitioning wizard found the following solutions:"
-msgstr "DrakX kettajagamise abimees leidis sellised lahendused:"
+msgstr "DrakX kettajagamise nõustaja leidis sellised lahendused:"
 
-#: ../../install_interactive.pm_.c:252
+#: ../../install_interactive.pm_.c:250
 #, c-format
 msgid "Partitioning failed: %s"
-msgstr "Ketta jagamine eba�nnestus: %s"
+msgstr "Ketta jagamine ebaõnnestus: %s"
 
-#: ../../install_interactive.pm_.c:262
+#: ../../install_interactive.pm_.c:260
 msgid "Bringing up the network"
-msgstr "K�ivitame v�rguliidesed"
+msgstr "Võrgu käimapanek"
 
-#: ../../install_interactive.pm_.c:267
+#: ../../install_interactive.pm_.c:265
 msgid "Bringing down the network"
-msgstr "Seiskame v�rguliidesed"
+msgstr "Võrgu seiskamine"
 
 #: ../../install_steps.pm_.c:76
 msgid ""
@@ -4467,12 +4838,12 @@ msgid ""
 "Continue at your own risk."
 msgstr ""
 "Tekkis mingi viga, aga seda ei suuda programm ise klaarida.\n"
-"J�tkake omal vastutusel."
+"Jätkake omal vastutusel."
 
 #: ../../install_steps.pm_.c:211
 #, c-format
 msgid "Duplicate mount point %s"
-msgstr "�henduspunkt %s on m��ratud topelt"
+msgstr "Haakepunkt %s on määratud topelt"
 
 #: ../../install_steps.pm_.c:380
 msgid ""
@@ -4481,186 +4852,182 @@ msgid ""
 "Check the cdrom on an installed computer using \"rpm -qpl Mandrake/RPMS/*.rpm"
 "\"\n"
 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"
+"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.pm_.c:452
+#: ../../install_steps.pm_.c:450
 #, c-format
 msgid "Welcome to %s"
 msgstr "See ongi %s"
 
-#: ../../install_steps.pm_.c:542 ../../install_steps.pm_.c:781
+#: ../../install_steps.pm_.c:543 ../../install_steps.pm_.c:769
 msgid "No floppy drive available"
-msgstr "Flopiseade ei ole k�ttesaadav"
+msgstr "Flopiseade ei ole kättesaadav"
 
 #: ../../install_steps_auto_install.pm_.c:76
 #: ../../install_steps_stdio.pm_.c:22
 #, c-format
 msgid "Entering step `%s'\n"
-msgstr "J�rgmine samm: '%s'\n"
+msgstr "Järgmine samm: '%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:150
+#: ../../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 on ressursiprobleeme ja installimine v�ib eba�nnestuda.\n"
-"Kui nii juhtub, proovige palun tekstip�hjalist paigaldust. Selleks \n"
-"vajutaga laadimisel F1 ja sisestage 'text'"
+"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:161 ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_gtk.pm_.c:157 ../../install_steps_interactive.pm_.c:237
 msgid "Install Class"
-msgstr "Installi klass"
+msgstr "Paigaldusmeetod"
 
-#: ../../install_steps_gtk.pm_.c:164
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:160
 msgid "Please choose one of the following classes of installation:"
-msgstr "Palun valige �ks j�rgnevatest paigaldusklassidest"
+msgstr "Palun valige üks järgnevatest paigaldusmeetoditest:"
 
-#: ../../install_steps_gtk.pm_.c:237 ../../install_steps_interactive.pm_.c:676
+#: ../../install_steps_gtk.pm_.c:236 ../../install_steps_interactive.pm_.c:683
 msgid "Package Group Selection"
 msgstr "Paketigruppide valik"
 
-#: ../../install_steps_gtk.pm_.c:270 ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_gtk.pm_.c:269 ../../install_steps_interactive.pm_.c:698
 msgid "Individual package selection"
 msgstr "Valik paketthaaval"
 
-#: ../../install_steps_gtk.pm_.c:293 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:292 ../../install_steps_interactive.pm_.c:621
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Suurus kokku: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Bad package"
 msgstr "Vigane pakett"
 
-#: ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_gtk.pm_.c:335
 #, c-format
 msgid "Name: %s\n"
 msgstr "Nimi: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:337
+#: ../../install_steps_gtk.pm_.c:336
 #, c-format
 msgid "Version: %s\n"
 msgstr "Versioon: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:338
+#: ../../install_steps_gtk.pm_.c:337
 #, c-format
 msgid "Size: %d KB\n"
-msgstr "Suurus: %d kB\n"
+msgstr "Suurus: %d KB\n"
 
-#: ../../install_steps_gtk.pm_.c:339
+#: ../../install_steps_gtk.pm_.c:338
 #, c-format
 msgid "Importance: %s\n"
-msgstr "T�htsus: %s\n"
+msgstr "Tähtsus: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:361
+#: ../../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, kettaruumi ei ole paigalsuseks piisavalt"
+msgstr "Seda paketti ei saa valida, sest paigalduseks napib kettaruumi"
 
-#: ../../install_steps_gtk.pm_.c:366
+#: ../../install_steps_gtk.pm_.c:365
 msgid "The following packages are going to be installed"
-msgstr "Installimiseks on valitud j�rgmised paketid"
+msgstr "Paigaldamiseks on valitud järgmised paketid"
 
-#: ../../install_steps_gtk.pm_.c:367
+#: ../../install_steps_gtk.pm_.c:366
 msgid "The following packages are going to be removed"
-msgstr "Eemaldamiseks on valitud j�rgmised paketid"
+msgstr "Eemaldamiseks on valitud järgmised paketid"
 
-#: ../../install_steps_gtk.pm_.c:379
+#: ../../install_steps_gtk.pm_.c:378
 msgid "You can't select/unselect this package"
 msgstr "Seda paketti ei saa (mitte) valida"
 
-#: ../../install_steps_gtk.pm_.c:391
+#: ../../install_steps_gtk.pm_.c:390
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "See pakett on kohustuslik"
 
-#: ../../install_steps_gtk.pm_.c:393
+#: ../../install_steps_gtk.pm_.c:392
 msgid "You can't unselect this package. It is already installed"
-msgstr "See pakett on juba installitud"
+msgstr "See pakett on juba paigaldatud"
 
-#: ../../install_steps_gtk.pm_.c:396
+#: ../../install_steps_gtk.pm_.c:395
 msgid ""
 "This package must be upgraded.\n"
 "Are you sure you want to deselect it?"
 msgstr ""
-"Selle paketi peaks uuendame\n"
+"Selle paketi peaks uuendama.\n"
 "Olete kindel, et Te ei vali seda?"
 
-#: ../../install_steps_gtk.pm_.c:399
+#: ../../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:404
+#: ../../install_steps_gtk.pm_.c:403
 msgid "Show automatically selected packages"
-msgstr "N�ita automaatselt valitud pakette"
+msgstr "Näita automaatselt valitud pakette"
 
-#: ../../install_steps_gtk.pm_.c:405 ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
-#: ../../standalone/drakbackup_.c:4259
+#: ../../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 "Installimine"
+msgstr "Paigaldamine"
 
-#: ../../install_steps_gtk.pm_.c:408
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:407
 msgid "Load/Save on floppy"
-msgstr "Salvesta flopile"
+msgstr "Laadi flopilt/Salvesta flopile"
 
-#: ../../install_steps_gtk.pm_.c:409
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:408
 msgid "Updating package selection"
-msgstr "Salvest paketivalik"
+msgstr "Paketivaliku uuendamine"
 
-#: ../../install_steps_gtk.pm_.c:414
-#, fuzzy
+#: ../../install_steps_gtk.pm_.c:413
 msgid "Minimal install"
-msgstr "Eemaldamine"
+msgstr "Minimaalne paigaldus"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../install_steps_interactive.pm_.c:522
+#: ../../install_steps_gtk.pm_.c:428 ../../install_steps_interactive.pm_.c:529
 msgid "Choose the packages you want to install"
-msgstr "Valige paketid installimiseks"
+msgstr "Valige paketid, mida soovite paigaldada"
 
-#: ../../install_steps_gtk.pm_.c:445 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_gtk.pm_.c:444 ../../install_steps_interactive.pm_.c:767
 msgid "Installing"
-msgstr "Installin"
+msgstr "Paigaldan"
 
-#: ../../install_steps_gtk.pm_.c:451
+#: ../../install_steps_gtk.pm_.c:450
 msgid "Estimating"
 msgstr "Oletan"
 
-#: ../../install_steps_gtk.pm_.c:458
+#: ../../install_steps_gtk.pm_.c:457
 msgid "Time remaining "
-msgstr "Aega j��nud "
+msgstr "Aega jäänud "
 
-#: ../../install_steps_gtk.pm_.c:470
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Please wait, preparing installation..."
-msgstr "Palun oodake, valmistun installimiseks"
+msgstr "Palun oodake, valmistun paigalduseks..."
 
-#: ../../install_steps_gtk.pm_.c:554
+#: ../../install_steps_gtk.pm_.c:551
 #, c-format
 msgid "%d packages"
 msgstr "%d paketti"
 
-#: ../../install_steps_gtk.pm_.c:559
+#: ../../install_steps_gtk.pm_.c:556
 #, c-format
 msgid "Installing package %s"
-msgstr "Paketi %s installimine"
+msgstr "Paketi %s paigaldamine"
 
-#: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
-#: ../../install_steps_interactive.pm_.c:784
-#: ../../standalone/drakautoinst_.c:202
+#: ../../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"
+msgstr "Nõus"
 
-#: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
-#: ../../install_steps_interactive.pm_.c:784
+#: ../../install_steps_gtk.pm_.c:593 ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:791
 msgid "Refuse"
 msgstr "Keeldun"
 
-#: ../../install_steps_gtk.pm_.c:597 ../../install_steps_interactive.pm_.c:785
+#: ../../install_steps_gtk.pm_.c:594 ../../install_steps_interactive.pm_.c:792
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -4669,24 +5036,24 @@ msgid ""
 "done.\n"
 "If you don't have it, press Cancel to avoid installation from this Cd-Rom."
 msgstr ""
-"Vahetage CD!\n"
+"Vahetage CD-ROM!\n"
 "\n"
-"Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <OK>.\n"
-"Kui teil s�herdust ei ole, vajutage <Katkesta>"
+"Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <Olgu>.\n"
+"Kui teil säherdust ei ole, vajutage <Katkesta>."
 
-#: ../../install_steps_gtk.pm_.c:611 ../../install_steps_gtk.pm_.c:615
-#: ../../install_steps_interactive.pm_.c:797
-#: ../../install_steps_interactive.pm_.c:801
+#: ../../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:611 ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_gtk.pm_.c:608 ../../install_steps_interactive.pm_.c:804
 msgid "There was an error ordering packages:"
 msgstr "Pakettide tellimisel tekkis viga:"
 
-#: ../../install_steps_gtk.pm_.c:615 ../../install_steps_interactive.pm_.c:801
+#: ../../install_steps_gtk.pm_.c:612 ../../install_steps_interactive.pm_.c:808
 msgid "There was an error installing packages:"
-msgstr "Pakettide installimisel tekkis viga:"
+msgstr "Pakettide paigaldamisel tekkis viga:"
 
 #: ../../install_steps_interactive.pm_.c:10
 msgid ""
@@ -4722,44 +5089,45 @@ msgstr ""
 "\n"
 "Hoiatus\n"
 "\n"
-"Palun lugege hoolega alltoodud teksti. Kui Te ei ole k�igi allj�rgnevate\n"
-"v�idetega, on installimine j�rgmise CD pealt keelatud. Vajutage 'Keeldun', \n"
-"et j�tkata installimist ilma selle CD-ta.\n"
-"\n"
-"\n"
-"Some components contained in the next CD media are not governed\n"
-"by the GPL License or similar agreements. Each such component is then\n"
-"governed by the terms and conditions of its own specific license. \n"
-"Please read carefully and comply with such specific licenses before \n"
-"you use or redistribute the said components. \n"
-"Such licenses will in general prevent the transfer,  duplication \n"
-"(except for backup purposes), redistribution, reverse engineering, \n"
-"de-assembly, de-compilation or modification of the component. \n"
-"Any breach of agreement will immediately terminate your rights under \n"
-"the specific license. Unless the specific license terms grant you such\n"
-"rights, you usually cannot install the programs on more than one\n"
-"system, or adapt it to be used on a network. In doubt, please contact \n"
-"directly the distributor or editor of the component. \n"
-"Transfer to third parties or copying of such components including the \n"
-"documentation is usually forbidden.\n"
-"\n"
-"\n"
-"All rights to the components of the next CD media belong to their \n"
-"respective authors and are protected by intellectual property and \n"
-"copyright laws applicable to software programs.\n"
+"Palun lugege hoolega järgnevat teksti. Kui Te ei ole nõus kõigi "
+"alljärgnevate\n"
+"väidetega, on paigaldamine järgmise CD pealt keelatud. Vajutage 'Keeldun',\n"
+"et jätkata paigaldamist ilma selle CD-ta.\n"
+"\n"
+"\n"
+"Mõned komponendid järgmisel CD-l ei ole kaitstud Üldise Avaliku Litsentsi\n"
+"või muude sarnaste litsentsidega, vaid kasutavad omaenda erilisi\n"
+"litsentsivorme. Seepärast lugege sellised litsentsid hoolega läbi ja\n"
+"tutvuge nende tingimustega, enne kui hakata neid komponente kasutama\n"
+"või levitama.\n"
+"Üldiselt kipuvad sellised litsentsid keelama komponendi kopeerimise,\n"
+"duplitseerimise (välja arvatud varundamise sihil), edastamise, muutmise\n"
+"või edasiarendamise.\n"
+"Litsentsilepingu tingimuste rikkumine lõpetab otsekohe kõik Teie õigused,\n"
+"mis kaasnesid litsentsiga nõustumisel. Kui mõni konkreetne litsentsi\n"
+"punkt Teile selliseid õigusi ei anna, ei või Te enamasti paigaldada "
+"rakendust\n"
+"enam kui ühte süsteemi ega muuta seda võrgutöö huvides. Kui Te ei ole\n"
+"tingimustes kindel, võtke ühendust komponendi levitaja või arendajaga.\n"
+"Üldjuhul on selliste komponentide, sealhulgas dokumentatsiooni, edastamine\n"
+"kolmandale poolele või kopeerimine keelatud.\n"
+"\n"
+"\n"
+"Kõigi järgmisel CD-l paiknevate komponentide õigused kuuluvad vastavalt\n"
+"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
-#, fuzzy
 msgid "Do you really want to leave the installation?"
-msgstr "Kas soovite v�rgu�hendust taask�ivitada?"
+msgstr "Kas tõesti loobuda paigaldusest ja väljuda?"
 
 #: ../../install_steps_interactive.pm_.c:112
 msgid "License agreement"
-msgstr "L�ppkasutaja litsentsileping"
+msgstr "Lõppkasutaja litsentsileping"
 
 #: ../../install_steps_interactive.pm_.c:113
 msgid ""
@@ -4881,7 +5249,7 @@ msgid ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 msgstr ""
-"J�rgnev l�ppkasutaja litsents on eksimuste v�ltimiseks originaalkeeles\n"
+"Järgnev lõppkasutaja litsents on eksimuste vältimiseks originaalkeeles!\n"
 "\n"
 "Introduction\n"
 "\n"
@@ -5001,356 +5369,285 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
-#: ../../install_steps_interactive.pm_.c:191
+#: ../../install_steps_interactive.pm_.c:197
 msgid "Are you sure you refuse the licence?"
-msgstr ""
+msgstr "Kas Te tõesti ei ole litsentsilepinguga nõus?"
 
-#: ../../install_steps_interactive.pm_.c:211
-#: ../../install_steps_interactive.pm_.c:1021
-#: ../../standalone/keyboarddrake_.c:31
+#: ../../install_steps_interactive.pm_.c:217
+#: ../../install_steps_interactive.pm_.c:995
+#: ../../standalone/keyboarddrake_.c:25
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
-#: ../../install_steps_interactive.pm_.c:212
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:218
 msgid "Please choose your keyboard layout."
-msgstr "Palun valige klaviatuuriasetus"
+msgstr "Palun valige klaviatuuriasetus."
 
-#: ../../install_steps_interactive.pm_.c:213
+#: ../../install_steps_interactive.pm_.c:219
 msgid "Here is the full list of keyboards available"
-msgstr "V�imalike klaviatuuride t�ielik nimekiri"
+msgstr "Võimalike klaviatuuride täielik nimekiri"
 
-#: ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_interactive.pm_.c:237
 msgid "Which installation class do you want?"
-msgstr "Millist installi klassi Te soovite"
+msgstr "Millist paigaldusmeetodit Te soovite?"
 
-#: ../../install_steps_interactive.pm_.c:235
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Install/Update"
-msgstr "Installimine/Uuendus"
+msgstr "Paigaldamine/Uuendus"
 
-#: ../../install_steps_interactive.pm_.c:235
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Is this an install or an update?"
-msgstr "On see installimine v�i taastamine?"
+msgstr "Kas see on paigaldus või uuendus?"
 
-#: ../../install_steps_interactive.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:250
 msgid "Recommended"
-msgstr "Soovituslik"
+msgstr "Soovitatav"
 
-#: ../../install_steps_interactive.pm_.c:247
-#: ../../install_steps_interactive.pm_.c:250
+#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:256
 msgid "Expert"
 msgstr "Ekspert"
 
-#: ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:265
 msgid "Upgrade"
 msgstr "Uuendus"
 
-#: ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:265
 msgid "Upgrade packages only"
-msgstr "Salvest paketivalik"
+msgstr "Ainult pakettide uuendamine"
 
-#: ../../install_steps_interactive.pm_.c:275
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:282
 msgid "Please choose the type of your mouse."
-msgstr "Palun valige hiire t��p"
+msgstr "Palun valige hiire tüüp."
 
-#: ../../install_steps_interactive.pm_.c:281 ../../standalone/mousedrake_.c:60
+#: ../../install_steps_interactive.pm_.c:288 ../../standalone/mousedrake_.c:52
 msgid "Mouse Port"
 msgstr "Hiire port"
 
-#: ../../install_steps_interactive.pm_.c:282 ../../standalone/mousedrake_.c:61
+#: ../../install_steps_interactive.pm_.c:289 ../../standalone/mousedrake_.c:53
 msgid "Please choose on which serial port your mouse is connected to."
-msgstr "Millisesse seerialporti on Teie hiir �hendatud?"
+msgstr "Millisesse jadaporti on Teie hiir ühendatud?"
 
-#: ../../install_steps_interactive.pm_.c:290
+#: ../../install_steps_interactive.pm_.c:297
 msgid "Buttons emulation"
-msgstr "Nuppude teesklemine"
+msgstr "Nuppude emuleerimine"
 
-#: ../../install_steps_interactive.pm_.c:292
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Button 2 Emulation"
-msgstr "Teeskle 2 hiirenupp"
+msgstr "Emuleeri 2. hiirenuppu"
 
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:300
 msgid "Button 3 Emulation"
-msgstr "Teeskle 3 hiirenuppu"
+msgstr "Emuleeri 3. hiirenuppu"
 
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:321
 msgid "Configuring PCMCIA cards..."
 msgstr "PCMCIA kaartide seadmine..."
 
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:321
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:321
+#: ../../install_steps_interactive.pm_.c:328
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: ../../install_steps_interactive.pm_.c:321
+#: ../../install_steps_interactive.pm_.c:328
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:338
+#: ../../install_steps_interactive.pm_.c:345
 msgid "No partition available"
-msgstr "ei leia partitsioone"
+msgstr "Ei leia partitsioone"
 
-#: ../../install_steps_interactive.pm_.c:341
+#: ../../install_steps_interactive.pm_.c:348
 msgid "Scanning partitions to find mount points"
-msgstr "Otsin partitsioonidelt �henduspunkte"
+msgstr "Partitsioonidelt haakepunktide otsimine"
 
-#: ../../install_steps_interactive.pm_.c:349
+#: ../../install_steps_interactive.pm_.c:356
 msgid "Choose the mount points"
-msgstr "Valige �henduspunktid"
+msgstr "Valige haakepunktid"
 
-#: ../../install_steps_interactive.pm_.c:379
+#: ../../install_steps_interactive.pm_.c:386
 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:388
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:395
 msgid "No root partition found to perform an upgrade"
-msgstr "Juurpartitsiooni ei leitud"
+msgstr "Uuendamiseks vajalikku juurpartitsiooni ei leitud"
 
-#: ../../install_steps_interactive.pm_.c:389
+#: ../../install_steps_interactive.pm_.c:396
 msgid "Root Partition"
 msgstr "Juurpartitsioon"
 
-#: ../../install_steps_interactive.pm_.c:390
+#: ../../install_steps_interactive.pm_.c:397
 msgid "What is the root partition (/) of your system?"
 msgstr "Millisel partitsioonil hoiate juurkataloogi (/)?"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../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"
+msgstr "Partitsioonitabeli säilitamiseks vajate alglaadimist"
 
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:435
 msgid "Choose the partitions you want to format"
 msgstr "Valige partitsioonid, mida soovite vormindada"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:436
 msgid "Check bad blocks?"
 msgstr "Blokkide kontroll?"
 
-#: ../../install_steps_interactive.pm_.c:456
+#: ../../install_steps_interactive.pm_.c:463
 msgid "Formatting partitions"
 msgstr "Vormindan partitsioone"
 
-#: ../../install_steps_interactive.pm_.c:458
+#: ../../install_steps_interactive.pm_.c:465
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Loon ja vormindan faili %s"
 
-#: ../../install_steps_interactive.pm_.c:463
+#: ../../install_steps_interactive.pm_.c:470
 #, 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:465
+#: ../../install_steps_interactive.pm_.c:472
 msgid "Not enough swap space to fulfill installation, please add some"
-msgstr "Saaleala on installimiseks liiga v�ike, palun lisage"
+msgstr "Saaleala on paigalduseks liiga väike, palun suurendage seda"
 
-#: ../../install_steps_interactive.pm_.c:472
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:479
 msgid "Looking for available packages and rebuilding rpm database..."
-msgstr "Otsin k�ttesaadavaid pakette"
+msgstr "Otsin saadaolevaid pakette ja loon uuesti rpm andmebaasi..."
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:480
 msgid "Looking for available packages..."
-msgstr "Otsin k�ttesaadavaid pakette"
+msgstr "Otsin saadaolevaid pakette..."
 
-#: ../../install_steps_interactive.pm_.c:476
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:483
 msgid "Looking at packages already installed..."
-msgstr "See pakett on juba installitud"
+msgstr "Tuvastan juba paigaldatud pakette..."
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:487
 msgid "Finding packages to upgrade..."
-msgstr "Otsin uuendatavaid pakette"
+msgstr "Otsin uuendatavaid pakette..."
 
-#: ../../install_steps_interactive.pm_.c:498
+#: ../../install_steps_interactive.pm_.c:505
 #, 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 (%d > %d)"
+msgstr ""
+"Teie kõvakettal ei ole piisavalt vaba ruumi paigalduseks või uuenduseks (%d "
+"> %d)"
 
-#: ../../install_steps_interactive.pm_.c:534
+#: ../../install_steps_interactive.pm_.c:541
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
 msgstr ""
+"Valige palun paketivaliku laadimine või salvestamine flopil(t).\n"
+"Vorming on sama, mis automaatpaigaldusega loodud flopide puhul."
 
-#: ../../install_steps_interactive.pm_.c:536
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:543
 msgid "Load from floppy"
-msgstr "Taasta flopilt"
+msgstr "Laadi flopilt"
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:543
 msgid "Save on floppy"
 msgstr "Salvesta flopile"
 
-#: ../../install_steps_interactive.pm_.c:540
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:547
 msgid "Loading from floppy"
-msgstr "Taasta flopilt"
+msgstr "Laadimine flopilt"
 
-#: ../../install_steps_interactive.pm_.c:540
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:547
 msgid "Package selection"
-msgstr "Paketigruppide valik"
+msgstr "Pakettide valik"
 
-#: ../../install_steps_interactive.pm_.c:545
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:552
 msgid "Insert a floppy containing package selection"
-msgstr "Pane flopi seadmesse %s"
+msgstr "Sisestage palun paketivalikut sisaldav flopi"
 
-#: ../../install_steps_interactive.pm_.c:627
+#: ../../install_steps_interactive.pm_.c:634
 msgid "Selected size is larger than available space"
-msgstr ""
+msgstr "Valiku suurus ületab saadaolevat kettaruumi"
 
-#: ../../install_steps_interactive.pm_.c:642
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:649
 msgid "Type of install"
-msgstr "Valige pakett installimiseks"
+msgstr "Paigalduse tüüp"
 
-#: ../../install_steps_interactive.pm_.c:643
+#: ../../install_steps_interactive.pm_.c:650
 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:646
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:653
 msgid "With X"
-msgstr "Oodake"
+msgstr "X-iga"
 
-#: ../../install_steps_interactive.pm_.c:648
+#: ../../install_steps_interactive.pm_.c:655
 msgid "With basic documentation (recommended!)"
-msgstr ""
+msgstr "Baasdokumentatsiooniga (soovitatav!)"
 
-#: ../../install_steps_interactive.pm_.c:649
+#: ../../install_steps_interactive.pm_.c:656
 msgid "Truly minimal install (especially no urpmi)"
-msgstr ""
+msgstr "Tõeliselt minimaalne (eriti just ilma urpmi-ta)"
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:741
 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, klikkige <OK>.\n"
-"Kui Teil ei ole �htki neist, klikkige <Katkesta>.\n"
-"Kui puuduvad m�ned CD-d, m�rkige vaid olemasolevad ja siis <OK>."
+"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:739
+#: ../../install_steps_interactive.pm_.c:746
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "CD pealdisega \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:767
 msgid "Preparing installation"
-msgstr "Valmistun installimiseks"
+msgstr "Valmistun paigalduseks"
 
-#: ../../install_steps_interactive.pm_.c:769
+#: ../../install_steps_interactive.pm_.c:776
 #, c-format
 msgid ""
 "Installing package %s\n"
 "%d%%"
 msgstr ""
-"Paketi %s installimine\n"
+"Paketi %s paigaldamine\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:815
+#: ../../install_steps_interactive.pm_.c:822
 msgid "Post-install configuration"
-msgstr "Paigaldusj�rgsed s�tted"
+msgstr "Paigaldusjärgsed sätted"
 
-#: ../../install_steps_interactive.pm_.c:821
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:828
+#, c-format
 msgid "Please insert the Boot floppy used in drive %s"
-msgstr "Pane flopi seadmesse %s"
+msgstr "Pange palun alglaadimisflopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:827
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:834
+#, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
-msgstr "Pange palun t�hi flopi seadmesse %s"
+msgstr "Pange palun moodulite uuendamise flopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:847
-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 "
-"�iguslikud \n"
-"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"
-"kaotsimine 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"
-
-#: ../../install_steps_interactive.pm_.c:886
+#: ../../install_steps_interactive.pm_.c:861
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
 "have been released after the distribution was released. They may\n"
@@ -5361,165 +5658,165 @@ msgid ""
 "\n"
 "Do you want to install the updates ?"
 msgstr ""
+"Teil on nüüd võimalus alla laadida uuendatud pakette. Need on välja lastud\n"
+"pärast Mandrake Linuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
+"parandusi või turvauuendusi.\n"
+"\n"
+"Allalaadimiseks peab Teil olema töötav internetiühendus.\n"
+"\n"
+"Kas soovite uuendusi paigaldada?"
 
-#: ../../install_steps_interactive.pm_.c:901
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:876
 msgid ""
 "Contacting Mandrake Linux web site to get the list of available mirrors..."
-msgstr "Proovin lugeda peeglilt pakettide nimekirja"
+msgstr ""
+"Proovin hankida Mandrake Linuxi veebisaidilt saadaolevate peeglite "
+"nimekirja..."
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../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_.c:915
+#: ../../install_steps_interactive.pm_.c:890
 msgid "Contacting the mirror to get the list of available packages..."
-msgstr "Proovin lugeda peeglilt pakettide nimekirja"
+msgstr "Proovin lugeda peeglilt pakettide nimekirja..."
 
-#: ../../install_steps_interactive.pm_.c:943
+#: ../../install_steps_interactive.pm_.c:918
 msgid "Which is your timezone?"
-msgstr "Millises ajav��tmes asute?"
+msgstr "Millises ajavöötmes asute?"
 
-#: ../../install_steps_interactive.pm_.c:948
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:923
 msgid "Hardware clock set to GMT"
-msgstr "Kas Teie arvuti sisekell on seatud GMT ajale?"
+msgstr "Arvuti sisekell on seatud GMT ajale"
 
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:924
 msgid "Automatic time synchronization (using NTP)"
-msgstr ""
+msgstr "Aja automaatne sünkroniseerimine (NTP abil)"
 
-#: ../../install_steps_interactive.pm_.c:956
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:931
 msgid "NTP Server"
-msgstr "NIS server:"
+msgstr "NTP server"
 
-#: ../../install_steps_interactive.pm_.c:990
-#: ../../install_steps_interactive.pm_.c:998
+#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:972
 msgid "Remote CUPS server"
 msgstr "CUPS printserver"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:966
 msgid "No printer"
-msgstr "Printerit ei ole"
+msgstr "Printer puudub"
 
-#: ../../install_steps_interactive.pm_.c:1008
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:982
 msgid "Do you have an ISA sound card?"
-msgstr "On Teil veel kaarte?"
+msgstr "Kas Teil on ISA helikaart?"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:984
 msgid "Run \"sndconfig\" after installation to configure your sound card"
-msgstr ""
+msgstr "Helikaardi seadistamiseks käivitage pärast paigaldust \"sndconfig\""
 
-#: ../../install_steps_interactive.pm_.c:1012
+#: ../../install_steps_interactive.pm_.c:986
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
+"Helikaarti ei leitud. Proovige see leida pärast paigaldust \"harddrake\" abil"
 
-#: ../../install_steps_interactive.pm_.c:1017 ../../steps.pm_.c:27
+#: ../../install_steps_interactive.pm_.c:991 ../../steps.pm_.c:27
 msgid "Summary"
-msgstr "Kokkuv�te"
+msgstr "Kokkuvõte"
 
-#: ../../install_steps_interactive.pm_.c:1020
+#: ../../install_steps_interactive.pm_.c:994
 msgid "Mouse"
 msgstr "Hiir"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:996
 msgid "Timezone"
-msgstr "Ajav��de"
+msgstr "Ajavöönd"
 
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2989
-#: ../../printerdrake.pm_.c:3078
+#: ../../install_steps_interactive.pm_.c:997
+#: ../../printer/printerdrake.pm_.c:2759 ../../printer/printerdrake.pm_.c:2844
 msgid "Printer"
 msgstr "Printer"
 
-#: ../../install_steps_interactive.pm_.c:1025
+#: ../../install_steps_interactive.pm_.c:999
 msgid "ISDN card"
 msgstr "ISDN kaart"
 
-#: ../../install_steps_interactive.pm_.c:1028
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1003
+#: ../../install_steps_interactive.pm_.c:1009
 msgid "Sound card"
 msgstr "Helikaart"
 
-#: ../../install_steps_interactive.pm_.c:1033
+#: ../../install_steps_interactive.pm_.c:1012
 msgid "TV card"
 msgstr "TV kaart"
 
-#: ../../install_steps_interactive.pm_.c:1075
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1104
+#: ../../install_steps_interactive.pm_.c:1055
+#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1084
 msgid "LDAP"
-msgstr ""
+msgstr "LDAP"
 
-#: ../../install_steps_interactive.pm_.c:1076
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1113
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1056
+#: ../../install_steps_interactive.pm_.c:1080
+#: ../../install_steps_interactive.pm_.c:1093
 msgid "NIS"
-msgstr "Kasuta NIS-i"
+msgstr "NIS"
 
-#: ../../install_steps_interactive.pm_.c:1077
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1121
-#: ../../install_steps_interactive.pm_.c:1127
-#, fuzzy
+#: ../../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 "Gnome t��jaam"
+msgstr "Windowsi domeen"
 
-#: ../../install_steps_interactive.pm_.c:1078
-#: ../../install_steps_interactive.pm_.c:1100
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1058
+#: ../../install_steps_interactive.pm_.c:1080
 msgid "Local files"
-msgstr "Kohalik printer"
+msgstr "Kohalikud failid"
 
-#: ../../install_steps_interactive.pm_.c:1087
-#: ../../install_steps_interactive.pm_.c:1088 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1067
+#: ../../install_steps_interactive.pm_.c:1068 ../../steps.pm_.c:24
 msgid "Set root password"
-msgstr "Juurkasutaja salas�na"
+msgstr "Juurkasutaja salasõna"
 
-#: ../../install_steps_interactive.pm_.c:1089
+#: ../../install_steps_interactive.pm_.c:1069
 msgid "No password"
-msgstr "Salas�na puudub"
+msgstr "Salasõna puudub"
 
-#: ../../install_steps_interactive.pm_.c:1094
+#: ../../install_steps_interactive.pm_.c:1074
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
-msgstr "Salas�na on liiga lihtne (peaks olema v�hemalt %d t�hem�rki)"
+msgstr "Salasõna on liiga lühike (peaks olema vähemalt %d tähemärki)"
 
-#: ../../install_steps_interactive.pm_.c:1100 ../../network/modem.pm_.c:49
-#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
+#: ../../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_.c:1108
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1088
 msgid "Authentication LDAP"
-msgstr "Autentimisviis"
+msgstr "LDAP autentimine"
 
-#: ../../install_steps_interactive.pm_.c:1109
+#: ../../install_steps_interactive.pm_.c:1089
 msgid "LDAP Base dn"
-msgstr ""
+msgstr "LDAPi alus dn"
 
-#: ../../install_steps_interactive.pm_.c:1110
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1090
 msgid "LDAP Server"
-msgstr "NIS server:"
+msgstr "LDAP server"
 
-#: ../../install_steps_interactive.pm_.c:1116
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1096
 msgid "Authentication NIS"
 msgstr "NIS autentimine"
 
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1097
 msgid "NIS Domain"
 msgstr "NIS domeen"
 
-#: ../../install_steps_interactive.pm_.c:1118
+#: ../../install_steps_interactive.pm_.c:1098
 msgid "NIS Server"
-msgstr "NIS server:"
+msgstr "NIS server"
 
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../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 /"
@@ -5534,23 +5831,34 @@ msgid ""
 "The command 'wbinfo -t' will test whether your authentication secrets are "
 "good."
 msgstr ""
-
-#: ../../install_steps_interactive.pm_.c:1126
-#, fuzzy
+"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_.c:1106
 msgid "Authentication Windows Domain"
-msgstr "Autentimisviis"
+msgstr "Windows domeeni autentimine"
 
-#: ../../install_steps_interactive.pm_.c:1128
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1108
 msgid "Domain Admin User Name"
-msgstr "Domeeninimi"
+msgstr "Domeeni administraatori kasutajatunnus"
 
-#: ../../install_steps_interactive.pm_.c:1129
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1109
 msgid "Domain Admin Password"
-msgstr "Salas�na uuesti"
+msgstr "Domeeni administraatori parool"
 
-#: ../../install_steps_interactive.pm_.c:1164
+#: ../../install_steps_interactive.pm_.c:1144
 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 "
@@ -5567,30 +5875,31 @@ msgid ""
 "first\n"
 "drive and press \"Ok\"."
 msgstr ""
-"Isetehtud alglaadimisketas annab Teile v�imaluse laadida Linux flopilt\n"
-"s�ltumata tavaliselt 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"
+"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"
-"\"Ok\"."
+"\"Olgu\"."
 
-#: ../../install_steps_interactive.pm_.c:1180
+#: ../../install_steps_interactive.pm_.c:1160
 msgid "First floppy drive"
 msgstr "Esimene flopiseade"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1161
 msgid "Second floppy drive"
 msgstr "Teine flopiseade"
 
-#: ../../install_steps_interactive.pm_.c:1182 ../../printerdrake.pm_.c:2515
+#: ../../install_steps_interactive.pm_.c:1162
+#: ../../printer/printerdrake.pm_.c:2397
 msgid "Skip"
-msgstr "J�ta vahele"
+msgstr "Jäta vahele"
 
-#: ../../install_steps_interactive.pm_.c:1187
+#: ../../install_steps_interactive.pm_.c:1167
 #, c-format
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -5605,16 +5914,16 @@ msgid ""
 "failures. Would you like to create a bootdisk for your system?\n"
 "%s"
 msgstr ""
-"Isetehtud alglaadimisketas annab Teile v�imaluse laadida Linux flopilt\n"
-"s�ltumata tavaliselt 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"
+"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"
 
-#: ../../install_steps_interactive.pm_.c:1193
+#: ../../install_steps_interactive.pm_.c:1173
 msgid ""
 "\n"
 "\n"
@@ -5622,58 +5931,66 @@ msgid ""
 "creating a bootdisk on a 1.44 Mb floppy will probably fail,\n"
 "because XFS needs a very large driver)."
 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)."
 
-#: ../../install_steps_interactive.pm_.c:1201
+#: ../../install_steps_interactive.pm_.c:1181
 msgid "Sorry, no floppy drive available"
-msgstr "Flopiseade ei ole k�ttesaadav"
+msgstr "Flopiseade ei ole kättesaadav"
 
-#: ../../install_steps_interactive.pm_.c:1205
+#: ../../install_steps_interactive.pm_.c:1185
 msgid "Choose the floppy drive you want to use to make the bootdisk"
-msgstr "Vali flopiseade, mida kasutad alglaadimisketta tegemiseks"
+msgstr "Valige flopiseade, mida kasutada alglaadimisketta tegemiseks"
 
-#: ../../install_steps_interactive.pm_.c:1209
-#, fuzzy, c-format
+#: ../../install_steps_interactive.pm_.c:1189
+#, c-format
 msgid "Insert a floppy in %s"
-msgstr "Pane flopi seadmesse %s"
+msgstr "Pange flopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:1212
+#: ../../install_steps_interactive.pm_.c:1192
 msgid "Creating bootdisk..."
-msgstr "Loome alglaadimisketta"
+msgstr "Alglaadimisketta loomine..."
 
-#: ../../install_steps_interactive.pm_.c:1219
+#: ../../install_steps_interactive.pm_.c:1199
 msgid "Preparing bootloader..."
-msgstr "Alglaaduri s�tted"
+msgstr "Alglaaduri ettevalmistamine..."
 
-#: ../../install_steps_interactive.pm_.c:1230
+#: ../../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"
 
-#: ../../install_steps_interactive.pm_.c:1236
+#: ../../install_steps_interactive.pm_.c:1216
 msgid "Do you want to use aboot?"
-msgstr "Soovite aboot-i kasutada?"
+msgstr "Kas soovite kasutada aboot-i?"
 
-#: ../../install_steps_interactive.pm_.c:1239
+#: ../../install_steps_interactive.pm_.c:1219
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
 msgstr ""
 "Viga aboot-i installimisel, \n"
-"kas forseerida, riskides esimese partitsiooni h�vinguga?"
+"kas sundida peale, riskides esimese partitsiooni hävinguga?"
 
-#: ../../install_steps_interactive.pm_.c:1246
-#, fuzzy
+#: ../../install_steps_interactive.pm_.c:1226
 msgid "Installing bootloader"
-msgstr "Alglaaduri s�tted"
+msgstr "Alglaaduri paigaldamine"
 
-#: ../../install_steps_interactive.pm_.c:1252
+#: ../../install_steps_interactive.pm_.c:1232
 msgid "Installation of bootloader failed. The following error occured:"
-msgstr "Alglaaduri installimine eba�nnestus. Tekkis j�rgnev viga:"
+msgstr "Alglaaduri paigaldamine ebaõnnestus. Tekkis järgnev viga:"
 
-#: ../../install_steps_interactive.pm_.c:1260
+#: ../../install_steps_interactive.pm_.c:1240
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -5683,34 +6000,34 @@ msgid ""
 " Then type: shut-down\n"
 "At your next boot you should see the bootloader prompt."
 msgstr ""
-"You will need to change your Open Firmware boot-device to\n"
-" enable the bootloader.  Hold down Command-Option-O-F\n"
-" at reboot and enter:\n"
+"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"
-" Then type: shut-down\n"
-"At your next boot you should see the bootloader prompt."
+" Seejärel kirjutage: shut-down\n"
+"Järgmisel käivitusel peaksite nägema alglaaduri käsurida."
 
-#: ../../install_steps_interactive.pm_.c:1294
-#: ../../standalone/drakautoinst_.c:79
+#: ../../install_steps_interactive.pm_.c:1274
+#: ../../standalone/drakautoinst_.c:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "Pange palun t�hi flopi seadmesse %s"
+msgstr "Pange palun tühi flopi seadmesse %s"
 
-#: ../../install_steps_interactive.pm_.c:1298
+#: ../../install_steps_interactive.pm_.c:1278
 msgid "Creating auto install floppy..."
-msgstr "Loon kiirpaigaldusflopi"
+msgstr "Kiirpaigaldusflopi loomine..."
 
-#: ../../install_steps_interactive.pm_.c:1309
+#: ../../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"
+"Mõned sammud ei ole lõpule viidud.\n"
 "\n"
-"Olete kindel, et v�ljute programmist?"
+"Kas soovite tõesti praegu lõpetada ja väljuda?"
 
-#: ../../install_steps_interactive.pm_.c:1320
+#: ../../install_steps_interactive.pm_.c:1300
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -5728,29 +6045,29 @@ msgid ""
 "Information on configuring your system is available in the post\n"
 "install chapter of the Official Mandrake Linux User's Guide."
 msgstr ""
-"�nnitlen, installimine on edukalt l�petatud.\n"
-"V�tke palun v�lja flopi ja/v�i CD ja vajutage Enter alglaadimiseks.\n"
+"Õ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 Linux kodulehek�ljelt \n"
+"Mandrake Linuxi koduleheküljelt:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
-"Abi s�steemi edasiseks konfigureerimiseks saab eelk�ige dokumendist\n"
-"\"Official Mandrake Linux User's Guide\""
+"Abi süsteemi edasiseks seadistamiseks saab eelkõige dokumendist\n"
+"\"Official Mandrake Linux User's Guide\"."
 
-#: ../../install_steps_interactive.pm_.c:1333
+#: ../../install_steps_interactive.pm_.c:1313
 msgid "http://www.mandrakelinux.com/en/90errata.php3"
-msgstr ""
+msgstr "http://www.mandrakelinux.com/en/90errata.php3"
 
-#: ../../install_steps_interactive.pm_.c:1338
+#: ../../install_steps_interactive.pm_.c:1318
 msgid "Generate auto install floppy"
 msgstr "Loo kiirpaigaldusflopi"
 
-#: ../../install_steps_interactive.pm_.c:1340
+#: ../../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"
@@ -5758,33 +6075,34 @@ msgid ""
 "\n"
 "You may prefer to replay the installation.\n"
 msgstr ""
-"Automaatne install v�ib olla ka sedav�rd tegija,\n"
-"et kasutab �ra kogu k�vaketta !!\n"
+"Automaatne paigaldus võib olla ka sedavõrd tegija,\n"
+"et kasutab ära kogu kõvaketta !!\n"
 "\n"
-"V�ite valida ka lihtsalt installi kordamise.\n"
+"Võite valida ka lihtsalt paigalduse kordamise.\n"
 
-#: ../../install_steps_interactive.pm_.c:1345
+#: ../../install_steps_interactive.pm_.c:1325
 msgid "Automated"
 msgstr "Automaatne"
 
-#: ../../install_steps_interactive.pm_.c:1345
+#: ../../install_steps_interactive.pm_.c:1325
 msgid "Replay"
-msgstr "Korda"
+msgstr "Kordamine"
 
-#: ../../install_steps_interactive.pm_.c:1348
+#: ../../install_steps_interactive.pm_.c:1328
 msgid "Save packages selection"
-msgstr "Salvest paketivalik"
+msgstr "Salvesta paketivalik"
 
-#: ../../install_steps_newt.pm_.c:22
+#: ../../install_steps_newt.pm_.c:20
 #, c-format
 msgid "Mandrake Linux Installation %s"
-msgstr "Mandrake Linux installimine %s"
+msgstr "Mandrake Linuxi paigaldamine %s"
 
 #. -PO This string must fit in a 80-char wide text screen
-#: ../../install_steps_newt.pm_.c:35
+#: ../../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 "
+msgstr ""
+"  <Tab>/<Alt-Tab> väljade vahel  | <Space> valib | <F12> järgmine samm "
 
 #: ../../interactive.pm_.c:87
 msgid "kdesu missing"
@@ -5792,32 +6110,30 @@ msgstr "kdesu puudub"
 
 #: ../../interactive.pm_.c:89 ../../interactive.pm_.c:100
 msgid "consolehelper missing"
-msgstr ""
+msgstr "consolehelper puudub"
 
 #: ../../interactive.pm_.c:152
-#, fuzzy
 msgid "Choose a file"
-msgstr "Valige tegevus"
+msgstr "Valige fail"
 
-#: ../../interactive.pm_.c:320
+#: ../../interactive.pm_.c:318
 msgid "Advanced"
-msgstr "Edasij�udnud"
+msgstr "Edasijõudnud"
 
-#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:103
+#: ../../interactive.pm_.c:319 ../../security/main.pm_.c:117
 msgid "Basic"
-msgstr ""
+msgstr "Põhiline"
 
-#: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:158
-#: ../../printerdrake.pm_.c:2169
+#: ../../interactive/newt.pm_.c:194 ../../my_gtk.pm_.c:158
+#: ../../printer/printerdrake.pm_.c:2055 ../../ugtk2.pm_.c:434
 msgid "<- Previous"
 msgstr "<- Eelmine"
 
-#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
-#: ../../standalone/drakbackup_.c:4114 ../../standalone/drakbackup_.c:4141
-#: ../../standalone/drakbackup_.c:4171 ../../standalone/drakbackup_.c:4197
-#, fuzzy
+#: ../../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 "Tekst"
+msgstr "Järgmine"
 
 #: ../../interactive/stdio.pm_.c:29 ../../interactive/stdio.pm_.c:149
 msgid "Bad choice, try again\n"
@@ -5834,35 +6150,36 @@ msgid ""
 "Entries you'll have to fill:\n"
 "%s"
 msgstr ""
+"Teil tuleb täita kirjed:\n"
+"%s"
 
 #: ../../interactive/stdio.pm_.c:70
-#, fuzzy, c-format
+#, c-format
 msgid "Your choice? (0/1, default `%s') "
-msgstr "Teie valik? (vaikimisi %s)"
+msgstr "Teie valik? (0/1, vaikimisi '%s')"
 
 #: ../../interactive/stdio.pm_.c:95
-#, fuzzy, c-format
+#, c-format
 msgid "Button `%s': %s"
-msgstr "Eelistused: %s"
+msgstr "Nupp '%s': %s"
 
 #: ../../interactive/stdio.pm_.c:96
-#, fuzzy
 msgid "Do you want to click on this button?"
-msgstr "Soovite aboot-i kasutada?"
+msgstr "Kas soovite sellel nupul klõpsata?"
 
 #: ../../interactive/stdio.pm_.c:105
 msgid " enter `void' for void entry"
-msgstr ""
+msgstr " kirjutage tühja kirje puhul 'void'"
 
 #: ../../interactive/stdio.pm_.c:105
-#, fuzzy, c-format
+#, c-format
 msgid "Your choice? (default `%s'%s) "
-msgstr "Teie valik? (vaikimisi %s)"
+msgstr "Teie valik? (vaikimisi '%s'%s)"
 
 #: ../../interactive/stdio.pm_.c:123
 #, c-format
 msgid "=> There are many things to choose from (%s).\n"
-msgstr ""
+msgstr "=> Nüüd on Teil mitmeid valikuid (%s).\n"
 
 #: ../../interactive/stdio.pm_.c:126
 msgid ""
@@ -5870,6 +6187,9 @@ msgid ""
 "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_.c:139
 #, c-format
@@ -5877,431 +6197,428 @@ msgid ""
 "=> Notice, a label changed:\n"
 "%s"
 msgstr ""
+"=> Pange tähele, et pealdis on muutunud:\n"
+"%s"
 
 #: ../../interactive/stdio.pm_.c:146
 msgid "Re-submit"
-msgstr ""
+msgstr "Uuestisaatmine"
 
-#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:153 ../../keyboard.pm_.c:188
 msgid "Czech (QWERTZ)"
-msgstr "T�ehhi (QWERTZ)"
+msgstr "Tšehhi (QWERTZ)"
 
-#: ../../keyboard.pm_.c:153 ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:154 ../../keyboard.pm_.c:190
 msgid "German"
 msgstr "Saksa"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:155
 msgid "Dvorak"
-msgstr "DVORAK"
+msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:198
 msgid "Spanish"
 msgstr "Hispaania"
 
-#: ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:198
+#: ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:199
 msgid "Finnish"
 msgstr "Soome"
 
-#: ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:158 ../../keyboard.pm_.c:200
 msgid "French"
 msgstr "Prantsuse"
 
-#: ../../keyboard.pm_.c:158 ../../keyboard.pm_.c:231
+#: ../../keyboard.pm_.c:159 ../../keyboard.pm_.c:233
 msgid "Norwegian"
 msgstr "Norra"
 
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:160
 msgid "Polish"
 msgstr "Poola"
 
-#: ../../keyboard.pm_.c:160 ../../keyboard.pm_.c:239
+#: ../../keyboard.pm_.c:161 ../../keyboard.pm_.c:241
 msgid "Russian"
 msgstr "Vene"
 
-#: ../../keyboard.pm_.c:162 ../../keyboard.pm_.c:241
+#: ../../keyboard.pm_.c:163 ../../keyboard.pm_.c:243
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: ../../keyboard.pm_.c:163 ../../keyboard.pm_.c:257
+#: ../../keyboard.pm_.c:164 ../../keyboard.pm_.c:259
 msgid "UK keyboard"
 msgstr "Briti"
 
-#: ../../keyboard.pm_.c:164 ../../keyboard.pm_.c:258
+#: ../../keyboard.pm_.c:165 ../../keyboard.pm_.c:260
 msgid "US keyboard"
-msgstr "US"
+msgstr "USA"
 
-#: ../../keyboard.pm_.c:166
-#, fuzzy
+#: ../../keyboard.pm_.c:167
 msgid "Albanian"
-msgstr "Iraani"
+msgstr "Albaania"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:168
 msgid "Armenian (old)"
 msgstr "Armeenia (vanem)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:169
 msgid "Armenian (typewriter)"
-msgstr "Armeenia (tr�kimasin)"
+msgstr "Armeenia (trükimasin)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:170
 msgid "Armenian (phonetic)"
 msgstr "Armeenia (foneetiline)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:175
 msgid "Azerbaidjani (latin)"
-msgstr "Aserbaid�aani (ladina)"
+msgstr "Aserbaidžaani (ladina)"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:177
 msgid "Belgian"
 msgstr "Belgia"
 
-#: ../../keyboard.pm_.c:177
-#, fuzzy
+#: ../../keyboard.pm_.c:178
 msgid "Bengali"
-msgstr "luba"
+msgstr "Bengali"
 
-#: ../../keyboard.pm_.c:178
-#, fuzzy
+#: ../../keyboard.pm_.c:179
 msgid "Bulgarian (phonetic)"
-msgstr "Armeenia (foneetiline)"
+msgstr "Bulgaaria (foneetiline)"
 
-#: ../../keyboard.pm_.c:179
-#, fuzzy
+#: ../../keyboard.pm_.c:180
 msgid "Bulgarian (BDS)"
-msgstr "Bulgaaria"
+msgstr "Bulgaaria (BDS)"
 
-#: ../../keyboard.pm_.c:180
+#: ../../keyboard.pm_.c:181
 msgid "Brazilian (ABNT-2)"
 msgstr "Brasiilia (ABNT-2)"
 
-#: ../../keyboard.pm_.c:183
-#, fuzzy
+#: ../../keyboard.pm_.c:184
 msgid "Bosnian"
-msgstr "Eesti"
+msgstr "Bosnia"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:185
 msgid "Belarusian"
 msgstr "Valgevene"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:186
 msgid "Swiss (German layout)"
-msgstr "�veitsi (Saksa asetus)"
+msgstr "Šveitsi (Saksa asetus)"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:187
 msgid "Swiss (French layout)"
-msgstr "�veitsi (Prantsuse asetus)"
+msgstr "Šveitsi (Prantsuse asetus)"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:189
 msgid "Czech (QWERTY)"
-msgstr "T�ehhi (QWERTY)"
+msgstr "Tšehhi (QWERTY)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:191
 msgid "German (no dead keys)"
 msgstr "Saksa (ilma sammuta)"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:192
 msgid "Devanagari"
-msgstr ""
+msgstr "Devanaagari"
 
-#: ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:193
 msgid "Danish"
 msgstr "Taani"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:194
 msgid "Dvorak (US)"
-msgstr "DVORAK (US)"
+msgstr "Dvorak (US)"
 
-#: ../../keyboard.pm_.c:194
+#: ../../keyboard.pm_.c:195
 msgid "Dvorak (Norwegian)"
-msgstr "DVORAK (Norra)"
+msgstr "Dvorak (Norra)"
 
-#: ../../keyboard.pm_.c:195
-#, fuzzy
+#: ../../keyboard.pm_.c:196
 msgid "Dvorak (Swedish)"
-msgstr "DVORAK (US)"
+msgstr "Dvorak (Rootsi)"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:197
 msgid "Estonian"
 msgstr "Eesti"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:201
 msgid "Georgian (\"Russian\" layout)"
-msgstr "Gruusia (vene)"
+msgstr "Gruusia (\"vene\" asetus)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:202
 msgid "Georgian (\"Latin\" layout)"
-msgstr "Gruusia (ladina)"
+msgstr "Gruusia (\"ladina\" asetus)"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:203
 msgid "Greek"
 msgstr "Kreeka"
 
-#: ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:204
 msgid "Gujarati"
-msgstr ""
+msgstr "Gudžarati"
 
-#: ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:205
 msgid "Gurmukhi"
-msgstr ""
+msgstr "Gurmukhi"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:206
 msgid "Hungarian"
 msgstr "Ungari"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:207
 msgid "Croatian"
-msgstr "Kroaadi"
+msgstr "Horvaadi"
 
-#: ../../keyboard.pm_.c:207
+#: ../../keyboard.pm_.c:208
 msgid "Israeli"
 msgstr "Iisraeli"
 
-#: ../../keyboard.pm_.c:208
+#: ../../keyboard.pm_.c:209
 msgid "Israeli (Phonetic)"
-msgstr "Iisraeli foneetiline"
+msgstr "Iisraeli (foneetiline)"
 
-#: ../../keyboard.pm_.c:209
+#: ../../keyboard.pm_.c:210
 msgid "Iranian"
 msgstr "Iraani"
 
-#: ../../keyboard.pm_.c:210
+#: ../../keyboard.pm_.c:211
 msgid "Icelandic"
 msgstr "Islandi"
 
-#: ../../keyboard.pm_.c:211
+#: ../../keyboard.pm_.c:212
 msgid "Italian"
 msgstr "Itaalia"
 
-#: ../../keyboard.pm_.c:212
+#: ../../keyboard.pm_.c:213
 msgid "Inuktitut"
-msgstr ""
+msgstr "Inuktitut"
 
-#: ../../keyboard.pm_.c:213
+#: ../../keyboard.pm_.c:214
 msgid "Japanese 106 keys"
 msgstr "Jaapani 106 klahviga"
 
-#: ../../keyboard.pm_.c:216
+#: ../../keyboard.pm_.c:217
 msgid "Korean keyboard"
 msgstr "Korea"
 
-#: ../../keyboard.pm_.c:217
+#: ../../keyboard.pm_.c:218
 msgid "Latin American"
 msgstr "Ladina-Ameerika"
 
-#: ../../keyboard.pm_.c:218
-#, fuzzy
+#: ../../keyboard.pm_.c:219
 msgid "Laotian"
-msgstr "Asukoht"
+msgstr "Laose"
 
-#: ../../keyboard.pm_.c:219
+#: ../../keyboard.pm_.c:220
 msgid "Lithuanian AZERTY (old)"
 msgstr "Leedu AZERTY (vanem)"
 
-#: ../../keyboard.pm_.c:221
+#: ../../keyboard.pm_.c:222
 msgid "Lithuanian AZERTY (new)"
 msgstr "Leedu AZERTY (uuem)"
 
-#: ../../keyboard.pm_.c:222
+#: ../../keyboard.pm_.c:223
 msgid "Lithuanian \"number row\" QWERTY"
-msgstr "Leedu numbrireaga QWERTY"
+msgstr "Leedu \"numbrireaga\" QWERTY"
 
-#: ../../keyboard.pm_.c:223
+#: ../../keyboard.pm_.c:224
 msgid "Lithuanian \"phonetic\" QWERTY"
-msgstr "Leedu foneetiline QWERTY"
+msgstr "Leedu \"foneetiline\" QWERTY"
 
-#: ../../keyboard.pm_.c:224
-#, fuzzy
+#: ../../keyboard.pm_.c:225
 msgid "Latvian"
-msgstr "Asukoht"
+msgstr "Läti"
 
-#: ../../keyboard.pm_.c:225
+#: ../../keyboard.pm_.c:226
+msgid "Malayalam"
+msgstr "Malajalami"
+
+#: ../../keyboard.pm_.c:227
 msgid "Macedonian"
 msgstr "Makedoonia"
 
-#: ../../keyboard.pm_.c:226
+#: ../../keyboard.pm_.c:228
 msgid "Myanmar (Burmese)"
-msgstr ""
+msgstr "Myanmari (Birma)"
 
-#: ../../keyboard.pm_.c:227
-#, fuzzy
+#: ../../keyboard.pm_.c:229
 msgid "Mongolian (cyrillic)"
-msgstr "Aserbaid�aani (kirillitsa)"
+msgstr "Mongoli (kirillitsa)"
 
-#: ../../keyboard.pm_.c:228
+#: ../../keyboard.pm_.c:230
 msgid "Maltese (UK)"
-msgstr ""
+msgstr "Malta (briti)"
 
-#: ../../keyboard.pm_.c:229
+#: ../../keyboard.pm_.c:231
 msgid "Maltese (US)"
-msgstr ""
+msgstr "Malta (USA)"
 
-#: ../../keyboard.pm_.c:230
+#: ../../keyboard.pm_.c:232
 msgid "Dutch"
 msgstr "Hollandi"
 
-#: ../../keyboard.pm_.c:232
+#: ../../keyboard.pm_.c:234
 msgid "Polish (qwerty layout)"
 msgstr "Poola (QWERTY)"
 
-#: ../../keyboard.pm_.c:233
+#: ../../keyboard.pm_.c:235
 msgid "Polish (qwertz layout)"
 msgstr "Poola (QWERTZ)"
 
-#: ../../keyboard.pm_.c:234
+#: ../../keyboard.pm_.c:236
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: ../../keyboard.pm_.c:235
+#: ../../keyboard.pm_.c:237
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: ../../keyboard.pm_.c:237
-#, fuzzy
+#: ../../keyboard.pm_.c:239
 msgid "Romanian (qwertz)"
-msgstr "Vene (Yawerty)"
+msgstr "Rumeenia (QWERTZ)"
 
-#: ../../keyboard.pm_.c:238
-#, fuzzy
+#: ../../keyboard.pm_.c:240
 msgid "Romanian (qwerty)"
-msgstr "Vene (Yawerty)"
+msgstr "Rumeenia (QWERTY)"
 
-#: ../../keyboard.pm_.c:240
+#: ../../keyboard.pm_.c:242
 msgid "Russian (Yawerty)"
 msgstr "Vene (Yawerty)"
 
-#: ../../keyboard.pm_.c:242
+#: ../../keyboard.pm_.c:244
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: ../../keyboard.pm_.c:243
+#: ../../keyboard.pm_.c:245
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovaki (QWERTZ)"
 
-#: ../../keyboard.pm_.c:244
+#: ../../keyboard.pm_.c:246
 msgid "Slovakian (QWERTY)"
 msgstr "Slovaki (QWERTY)"
 
-#: ../../keyboard.pm_.c:246
-#, fuzzy
+#: ../../keyboard.pm_.c:248
 msgid "Serbian (cyrillic)"
-msgstr "Aserbaid�aani (kirillitsa)"
+msgstr "Serbia (kirillitsa)"
 
-#: ../../keyboard.pm_.c:248
-#, fuzzy
+#: ../../keyboard.pm_.c:250
 msgid "Tamil (Unicode)"
-msgstr "i18n (kena)"
+msgstr "Tamili (Unicode)"
 
-#: ../../keyboard.pm_.c:249
+#: ../../keyboard.pm_.c:251
 msgid "Tamil (TSCII)"
-msgstr ""
+msgstr "Tamili (TSCII)"
 
-#: ../../keyboard.pm_.c:250
+#: ../../keyboard.pm_.c:252
 msgid "Thai keyboard"
 msgstr "Tai"
 
-#: ../../keyboard.pm_.c:252
-#, fuzzy
+#: ../../keyboard.pm_.c:254
 msgid "Tajik keyboard"
-msgstr "Tai"
+msgstr "Tadžiki"
 
-#: ../../keyboard.pm_.c:253
+#: ../../keyboard.pm_.c:255
 msgid "Turkish (traditional \"F\" model)"
-msgstr "T�rgi (\"F\" mudel)"
+msgstr "Türgi (traditsiooniline \"F\" mudel)"
 
-#: ../../keyboard.pm_.c:254
+#: ../../keyboard.pm_.c:256
 msgid "Turkish (modern \"Q\" model)"
-msgstr "T�rgi (\"Q\" mudel)"
+msgstr "Türgi (modernne \"Q\" mudel)"
 
-#: ../../keyboard.pm_.c:256
+#: ../../keyboard.pm_.c:258
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: ../../keyboard.pm_.c:259
+#: ../../keyboard.pm_.c:261
 msgid "US keyboard (international)"
-msgstr "US (rahvusvaheline)"
+msgstr "USA (rahvusvaheline)"
 
-#: ../../keyboard.pm_.c:260
+#: ../../keyboard.pm_.c:262
 msgid "Vietnamese \"numeric row\" QWERTY"
-msgstr "Vietnami numbrireaga QWERTY"
+msgstr "Vietnami \"numbrireaga\" QWERTY"
 
-#: ../../keyboard.pm_.c:261
-#, fuzzy
+#: ../../keyboard.pm_.c:263
 msgid "Yugoslavian (latin)"
-msgstr "Jugoslaavia (koos kirillitsaga)"
+msgstr "Jugoslaavia (ladina)"
 
-#: ../../keyboard.pm_.c:268
+#: ../../keyboard.pm_.c:270
 msgid "Right Alt key"
-msgstr ""
+msgstr "Parempoolne Alt-klahv"
 
-#: ../../keyboard.pm_.c:269
+#: ../../keyboard.pm_.c:271
 msgid "Both Shift keys simultaneously"
-msgstr ""
+msgstr "Mõlemad Shift-klahvid korraga"
 
-#: ../../keyboard.pm_.c:270
+#: ../../keyboard.pm_.c:272
 msgid "Control and Shift keys simultaneously"
-msgstr ""
+msgstr "Ctrl- ja Shift-klahvid korraga"
 
-#: ../../keyboard.pm_.c:271
+#: ../../keyboard.pm_.c:273
 msgid "CapsLock key"
-msgstr ""
+msgstr "CapsLock-klahv"
 
-#: ../../keyboard.pm_.c:272
+#: ../../keyboard.pm_.c:274
 msgid "Ctrl and Alt keys simultaneously"
-msgstr ""
+msgstr "Ctrl- ja Alt-klahvid korraga"
 
-#: ../../keyboard.pm_.c:273
+#: ../../keyboard.pm_.c:275
 msgid "Alt and Shift keys simultaneously"
-msgstr ""
+msgstr "Alt- ja Shift-klahvid korraga"
 
-#: ../../keyboard.pm_.c:274
+#: ../../keyboard.pm_.c:276
 msgid "\"Menu\" key"
-msgstr ""
+msgstr "\"Menüü\"-klahv"
 
-#: ../../keyboard.pm_.c:275
+#: ../../keyboard.pm_.c:277
 msgid "Left \"Windows\" key"
-msgstr ""
+msgstr "Vasakpoolne \"Windows\"-klahv"
 
-#: ../../keyboard.pm_.c:276
+#: ../../keyboard.pm_.c:278
 msgid "Right \"Windows\" key"
-msgstr ""
+msgstr "Parempoolne \"Windows\"-klahv"
 
 #: ../../loopback.pm_.c:32
 #, c-format
 msgid "Circular mounts %s\n"
-msgstr "Ring�hendus %s\n"
+msgstr "Ringühendus %s\n"
 
 #: ../../lvm.pm_.c:103
 msgid "Remove the logical volumes first\n"
-msgstr "Eemalda enne kettar�hmad (logical volumes)\n"
+msgstr "Eemalda enne kettarühmad (logical volumes)\n"
+
+#: ../../modules.pm_.c:290
+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."
 
-#: ../../modparm.pm_.c:50
-#, fuzzy
+#: ../../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 "Sissehelistamiskeskuse number"
+msgstr "number"
 
-#: ../../modparm.pm_.c:52
+#: ../../modules/parameters.pm_.c:52
 #, c-format
 msgid "%d comma separated numbers"
-msgstr ""
+msgstr "%d komaga eraldatud numbrit"
 
-#: ../../modparm.pm_.c:52
+#: ../../modules/parameters.pm_.c:52
 #, c-format
 msgid "%d comma separated strings"
-msgstr ""
+msgstr "%d komaga eraldatud stringi"
 
-#: ../../modparm.pm_.c:54
+#: ../../modules/parameters.pm_.c:54
 msgid "comma separated numbers"
-msgstr ""
+msgstr "komaga eradatud numbrit"
 
-#: ../../modparm.pm_.c:54
-#, fuzzy
+#: ../../modules/parameters.pm_.c:54
 msgid "comma separated strings"
-msgstr "Vormindamine"
-
-#: ../../modules.pm_.c:293
-msgid ""
-"PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
-msgstr ""
+msgstr "komaga eraldatud stringi"
 
 #: ../../mouse.pm_.c:25
 msgid "Sun - Mouse"
@@ -6313,7 +6630,7 @@ msgstr "Logitech MouseMan+"
 
 #: ../../mouse.pm_.c:33
 msgid "Generic PS2 Wheel Mouse"
-msgstr "Lihtsalt PS2 rattaga hiir"
+msgstr "Tavaline PS2 rattaga hiir"
 
 #: ../../mouse.pm_.c:34
 msgid "GlidePoint"
@@ -6332,29 +6649,28 @@ msgid "Genius NetScroll"
 msgstr "Genius NetScroll"
 
 #: ../../mouse.pm_.c:39 ../../mouse.pm_.c:48
-#, fuzzy
 msgid "Microsoft Explorer"
-msgstr "Microsoft IntelliMouse"
+msgstr "Microsoft Explorer"
 
 #: ../../mouse.pm_.c:44 ../../mouse.pm_.c:70
 msgid "1 button"
-msgstr "1 nupp"
+msgstr "1 nupuga"
 
 #: ../../mouse.pm_.c:45 ../../mouse.pm_.c:53
 msgid "Generic 2 Button Mouse"
-msgstr "Lihtsalt 2-nupuline hiir"
+msgstr "Tavaline 2 nupuga hiir"
 
 #: ../../mouse.pm_.c:47
 msgid "Wheel"
-msgstr "Ratas"
+msgstr "Rattaga"
 
 #: ../../mouse.pm_.c:51
 msgid "serial"
-msgstr "seerial"
+msgstr "jadapordi"
 
 #: ../../mouse.pm_.c:54
 msgid "Generic 3 Button Mouse"
-msgstr "Lihtsalt 3-nupuline hiir"
+msgstr "Tavaline 3 nupuga hiir"
 
 #: ../../mouse.pm_.c:55
 msgid "Microsoft IntelliMouse"
@@ -6370,7 +6686,7 @@ msgstr "Mouse Systems"
 
 #: ../../mouse.pm_.c:59
 msgid "Logitech CC Series"
-msgstr "Logitech CC seeria (seerial)"
+msgstr "Logitech CC seeria"
 
 #: ../../mouse.pm_.c:60
 msgid "Logitech MouseMan+/FirstMouse+"
@@ -6378,7 +6694,7 @@ msgstr "Logitech MouseMan+/FirstMouse+"
 
 #: ../../mouse.pm_.c:62
 msgid "MM Series"
-msgstr "MM Series"
+msgstr "MM seeria"
 
 #: ../../mouse.pm_.c:63
 msgid "MM HitTablet"
@@ -6386,7 +6702,7 @@ msgstr "MM HitTablet"
 
 #: ../../mouse.pm_.c:64
 msgid "Logitech Mouse (serial, old C7 type)"
-msgstr "Logitech (seerial, vana C7 t��pi)"
+msgstr "Logitech (jadaport, vana C7 tüüpi)"
 
 #: ../../mouse.pm_.c:68
 msgid "busmouse"
@@ -6394,11 +6710,11 @@ msgstr "siinihiir"
 
 #: ../../mouse.pm_.c:71
 msgid "2 buttons"
-msgstr "2 nuppu"
+msgstr "2 nupuga"
 
 #: ../../mouse.pm_.c:72
 msgid "3 buttons"
-msgstr "3 nuppu"
+msgstr "3 nupuga"
 
 #: ../../mouse.pm_.c:75
 msgid "none"
@@ -6406,109 +6722,120 @@ msgstr "ei soovi"
 
 #: ../../mouse.pm_.c:77
 msgid "No mouse"
-msgstr "Hiirt ei ole"
+msgstr "Hiir puudub"
 
-#: ../../mouse.pm_.c:486
+#: ../../mouse.pm_.c:490
 msgid "Please test the mouse"
 msgstr "Palun testige hiirt"
 
-#: ../../mouse.pm_.c:487
+#: ../../mouse.pm_.c:491
 msgid "To activate the mouse,"
 msgstr "Hiire aktiveerimiseks"
 
-#: ../../mouse.pm_.c:488
+#: ../../mouse.pm_.c:492
 msgid "MOVE YOUR WHEEL!"
 msgstr "KEERUTAGE RATTAKEST!"
 
-#: ../../my_gtk.pm_.c:64
+#: ../../my_gtk.pm_.c:65
 msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
-msgstr ""
+msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*.*-r-*"
 
-#: ../../my_gtk.pm_.c:159
+#: ../../my_gtk.pm_.c:159 ../../ugtk2.pm_.c:435
 msgid "Finish"
-msgstr "L�peta"
+msgstr "Lõpeta"
 
-#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2171
+#: ../../my_gtk.pm_.c:159 ../../printer/printerdrake.pm_.c:2057
+#: ../../ugtk2.pm_.c:435
 msgid "Next ->"
-msgstr "J�rgmine ->"
+msgstr "Järgmine ->"
 
-#: ../../my_gtk.pm_.c:287
+#: ../../my_gtk.pm_.c:287 ../../ugtk2.pm_.c:926
 msgid "Is this correct?"
 msgstr "Kas see on sobiv?"
 
-#: ../../my_gtk.pm_.c:359 ../../services.pm_.c:222
+#: ../../my_gtk.pm_.c:359 ../../services.pm_.c:227 ../../ugtk2.pm_.c:1011
 msgid "Info"
 msgstr "Info"
 
-#: ../../my_gtk.pm_.c:380
+#: ../../my_gtk.pm_.c:380 ../../ugtk2.pm_.c:1036
 msgid "Expand Tree"
 msgstr "Ava puu"
 
-#: ../../my_gtk.pm_.c:381
+#: ../../my_gtk.pm_.c:381 ../../ugtk2.pm_.c:1037
 msgid "Collapse Tree"
-msgstr "Sule puu"
+msgstr "Sulge puu"
 
-#: ../../my_gtk.pm_.c:382
+#: ../../my_gtk.pm_.c:382 ../../ugtk2.pm_.c:1038
 msgid "Toggle between flat and group sorted"
-msgstr "Sorteeritud v�i sorteerimata"
+msgstr "Sorteeritud või sorteerimata"
 
-#: ../../network/adsl.pm_.c:23 ../../network/ethernet.pm_.c:36
-msgid "Connect to the Internet"
-msgstr "Loo interneti�hendus"
+#: ../../network/adsl.pm_.c:23
+msgid "use pppoe"
+msgstr "pppoe"
 
 #: ../../network/adsl.pm_.c:24
+msgid "use pptp"
+msgstr "pptp"
+
+#: ../../network/adsl.pm_.c:25
+msgid "use dhcp"
+msgstr "dhcp"
+
+#: ../../network/adsl.pm_.c:26
+msgid "Alcatel speedtouch usb"
+msgstr "Alcatel speedtouch USB"
+
+#: ../../network/adsl.pm_.c:27
+msgid "Sagem (using pppoe) usb"
+msgstr "Sagem (pppoe vahendusel) usb"
+
+#: ../../network/adsl.pm_.c:29 ../../network/ethernet.pm_.c:36
+msgid "Connect to the Internet"
+msgstr "Loo internetiühendus"
+
+#: ../../network/adsl.pm_.c:30
 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'"
 msgstr ""
-"K�ige tavalisem �hendusviis ADSL jaoks on pppoe.\n"
-"M�nel juhul aga kasutatakse pptp-d, harva dhcp-d.\n"
+"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_.c:26
-msgid "Alcatel speedtouch usb"
+#: ../../network/adsl.pm_.c:166
+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 ""
-
-#: ../../network/adsl.pm_.c:26
-msgid "use dhcp"
-msgstr "dhcp"
-
-#: ../../network/adsl.pm_.c:26
-msgid "use pppoe"
-msgstr "pppoe"
-
-#: ../../network/adsl.pm_.c:26
-msgid "use pptp"
-msgstr "pptp"
+"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"
 
 #: ../../network/drakfirewall.pm_.c:12
-#, fuzzy
 msgid "Web Server"
-msgstr "Server"
+msgstr "Veebiserver"
 
 #: ../../network/drakfirewall.pm_.c:17
-#, fuzzy
 msgid "Domain Name Server"
-msgstr "Domeeninimi"
+msgstr "Nimeserver"
 
 #: ../../network/drakfirewall.pm_.c:32
-#, fuzzy
 msgid "Mail Server"
-msgstr "Server, Andmebaasid"
+msgstr "Meiliserver"
 
 #: ../../network/drakfirewall.pm_.c:37
-#, fuzzy
 msgid "POP and IMAP Server"
-msgstr "NIS server:"
+msgstr "POP ja IMAP server"
 
 #: ../../network/drakfirewall.pm_.c:111
-#, fuzzy
 msgid "No network card"
-msgstr "v�rgukaarti ei leitud"
+msgstr "Võrgukaart puudub"
 
 #: ../../network/drakfirewall.pm_.c:129
-#, fuzzy
 msgid ""
 "drakfirewall configurator\n"
 "\n"
@@ -6516,10 +6843,10 @@ msgid ""
 "For a powerful dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
-"tinyfirewall seadistamine\n"
+"drakfirewalli seadistaja\n"
 "\n"
 "Selle vahendiga saate luua lihtsa kaitse Interneti ohtude vastu.\n"
-"Kui vajate v�imsat tulem��ri, vaadake palun\n"
+"Kui vajate võimsat tulemüüri, vaadake palun\n"
 "spetsiaalset MandrakeSecurity Firewall distributsiooni."
 
 #: ../../network/drakfirewall.pm_.c:135
@@ -6529,10 +6856,14 @@ msgid ""
 "Make sure you have configured your Network/Internet access with\n"
 "drakconnect before going any further."
 msgstr ""
+"drakfirewalli seadistaja\n"
+"\n"
+"Kontrollige enne jätkamist, et olete seadistanud pääsu võrku/Internetti\n"
+"drakconnecti abil."
 
 #: ../../network/drakfirewall.pm_.c:152
 msgid "Which services would you like to allow the Internet to connect to?"
-msgstr ""
+msgstr "Millistel teenustel soovite lubada kasutada internetiühendust?"
 
 #: ../../network/drakfirewall.pm_.c:153
 msgid ""
@@ -6540,6 +6871,9 @@ msgid ""
 "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_.c:159
 #, c-format
@@ -6548,53 +6882,54 @@ msgid ""
 "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_.c:167
-#, fuzzy
 msgid "Everything (no firewall)"
-msgstr "K�ik seadistatud!"
+msgstr "Kõik (tulemüür puudub)"
 
 #: ../../network/drakfirewall.pm_.c:169
-#, fuzzy
 msgid "Other ports"
-msgstr "Muud maad"
+msgstr "Muud pordid"
 
 #: ../../network/ethernet.pm_.c:37
 msgid ""
 "Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+"Default is dhcp-client"
 msgstr ""
-"Mis DHCP klienti soovite kasutada?\n"
-"Vaikimisi on dhcpcd"
+"Millist DHCP klienti soovite kasutada?\n"
+"Vaikimisi on selleks 'dhcp-client'"
 
 #: ../../network/ethernet.pm_.c:88
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
 "I cannot set up this connection type."
 msgstr ""
-"�htki v�rgukaarti ei �nnestunud tuvastada\n"
-"Seega ei saa ka sellist �hendust seadistada."
+"Ühtki võrgukaarti ei õnnestunud tuvastada\n"
+"Seega ei saa ka sellist ühendust seadistada."
 
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:238
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:234
 msgid "Choose the network interface"
-msgstr "Valige v�rguliides"
+msgstr "Valige võrguliides"
 
 #: ../../network/ethernet.pm_.c:93
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet"
 msgstr ""
-"Palun valige, millist v�rguliidest soovite interneti�henduse jaoks kasutada"
+"Palun valige, millist võrguliidest soovite internetiühenduse jaoks kasutada"
 
-#: ../../network/ethernet.pm_.c:178
+#: ../../network/ethernet.pm_.c:176
 msgid "no network card found"
-msgstr "v�rgukaarti ei leitud"
+msgstr "võrgukaarti ei leitud"
 
-#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:362
+#: ../../network/ethernet.pm_.c:200 ../../network/network.pm_.c:349
 msgid "Configuring network"
-msgstr "V�rguseadistused"
+msgstr "Võrguseadistused"
 
-#: ../../network/ethernet.pm_.c:203
+#: ../../network/ethernet.pm_.c:201
 msgid ""
 "Please enter your host name if you know it.\n"
 "Some DHCP servers require the hostname to work.\n"
@@ -6602,25 +6937,25 @@ msgid ""
 "such as ``mybox.mylab.myco.com''."
 msgstr ""
 "Palun sisestage oma masina nimi.\n"
-"Seda n�uavad ka m�ned DHCP serverid.\n"
-"Masina nimi peab olema esitatud t�iskujul,\n"
+"Seda nõuavad ka mõned DHCP serverid.\n"
+"Masina nimi peab olema esitatud täiskujul,\n"
 "nagu ``minumasin.minufirma.ee''."
 
-#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:367
+#: ../../network/ethernet.pm_.c:205 ../../network/network.pm_.c:354
 msgid "Host name"
 msgstr "Masinanimi"
 
 #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:90 ../../network/netconnect.pm_.c:104
-#: ../../network/netconnect.pm_.c:159 ../../network/netconnect.pm_.c:174
-#: ../../network/netconnect.pm_.c:201 ../../network/netconnect.pm_.c:224
-#: ../../network/netconnect.pm_.c:232
+#: ../../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�rgu s�tete abimees"
+msgstr "Võrguseadistuste nõustaja"
 
 #: ../../network/isdn.pm_.c:22
 msgid "External ISDN modem"
-msgstr "V�line ISDN modem"
+msgstr "Väline ISDN modem"
 
 #: ../../network/isdn.pm_.c:22
 msgid "Internal ISDN card"
@@ -6628,7 +6963,7 @@ msgstr "Sisemine ISDN kaart"
 
 #: ../../network/isdn.pm_.c:22
 msgid "What kind is your ISDN connection?"
-msgstr "Millist ISDN �hendust kasutate?"
+msgstr "Millist ISDN ühendust kasutate?"
 
 #: ../../network/isdn.pm_.c:45
 msgid ""
@@ -6642,83 +6977,86 @@ msgid ""
 "\n"
 "We recommand the light configuration.\n"
 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"
 
 #
 #: ../../network/isdn.pm_.c:54
-#, fuzzy
 msgid "New configuration (isdn-light)"
-msgstr "Leitud tulem��ri s�tted!"
+msgstr "Uus seadistus (isdn-light)"
 
 #
 #: ../../network/isdn.pm_.c:54
-#, fuzzy
 msgid "Old configuration (isdn4net)"
-msgstr "Leitud tulem��ri s�tted!"
+msgstr "Vana seadistus (isdn4net)"
 
-#: ../../network/isdn.pm_.c:170 ../../network/isdn.pm_.c:188
-#: ../../network/isdn.pm_.c:200 ../../network/isdn.pm_.c:206
-#: ../../network/isdn.pm_.c:213 ../../network/isdn.pm_.c:223
+#: ../../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"
+msgstr "ISDN sätted"
 
-#: ../../network/isdn.pm_.c:170
+#: ../../network/isdn.pm_.c:166
 msgid ""
 "Select your provider.\n"
 "If it isn't listed, choose Unlisted."
 msgstr ""
-"Vali oma teenusepakkuja.\n"
-" Kui see ei ole nimekirjas, vali Tundmatu"
+"Valige oma teenusepakkuja.\n"
+"Kui see ei ole nimekirjas, valige Tundmatu."
 
-#: ../../network/isdn.pm_.c:183
-#, fuzzy
+#: ../../network/isdn.pm_.c:179
 msgid "Europe protocol"
-msgstr "Laadimisprotokoll"
+msgstr "Euroopa protokoll"
 
-#: ../../network/isdn.pm_.c:183
-#, fuzzy
+#: ../../network/isdn.pm_.c:179
 msgid "Europe protocol (EDSS1)"
-msgstr "Euroopa (EDSS1)"
+msgstr "Euroopa protokoll (EDSS1)"
 
-#: ../../network/isdn.pm_.c:185
-#, fuzzy
+#: ../../network/isdn.pm_.c:181
 msgid "Protocol for the rest of the world"
-msgstr "�lej��nud maailm"
+msgstr "Protokoll ülejäänud maailma tarbeks"
 
-#: ../../network/isdn.pm_.c:185
-#, fuzzy
+#: ../../network/isdn.pm_.c:181
 msgid ""
 "Protocol for the rest of the world\n"
 "No D-Channel (leased lines)"
 msgstr ""
-"�lej��nud maailm \n"
-" ilma D-kanalita"
+"Protokoll ülejäänud maailma tarbeks\n"
+"Ilma D-kanalita (liisitud liinid)"
 
-#: ../../network/isdn.pm_.c:189
+#: ../../network/isdn.pm_.c:185
 msgid "Which protocol do you want to use?"
-msgstr "Mis protokolli soovite kasutada?"
+msgstr "Millist protokolli soovite kasutada?"
 
-#: ../../network/isdn.pm_.c:200
+#: ../../network/isdn.pm_.c:196
 #, c-format
 msgid "Found \"%s\" interface do you want to use it ?"
-msgstr ""
+msgstr "Leiti \"%s\" liides, kas soovite seda kasutada?"
 
-#: ../../network/isdn.pm_.c:207
+#: ../../network/isdn.pm_.c:203
 msgid "What kind of card do you have?"
-msgstr "Mis t��pi kaart Teil on?"
+msgstr "Millist tüüpi kaart Teil on?"
 
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
 msgid "I don't know"
 msgstr "Ei tea"
 
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../network/isdn.pm_.c:214
+#: ../../network/isdn.pm_.c:210
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -6727,90 +7065,117 @@ msgid ""
 "card.\n"
 msgstr ""
 "\n"
-"Kui Teil on ISA kaart, siis peaks j�rgmised v��rtused olema �iged.\n"
+"Kui Teil on ISA kaart, siis peaks järgmised väärtused olema õiged.\n"
 "\n"
 "Kui Teil on PCMCIA kaart, peaksite Te ise teadma selle IRQ ning IO "
-"v��rtusi.\n"
+"väärtusi.\n"
 
-#: ../../network/isdn.pm_.c:218
+#: ../../network/isdn.pm_.c:214
 msgid "Abort"
-msgstr "Katkesta"
+msgstr "Loobu"
 
-#: ../../network/isdn.pm_.c:218
+#: ../../network/isdn.pm_.c:214
 msgid "Continue"
-msgstr "J�tka"
+msgstr "Jätka"
 
-#: ../../network/isdn.pm_.c:224
+#: ../../network/isdn.pm_.c:220
 msgid "Which is your ISDN card?"
 msgstr "Milline on Teie ISDN kaart?"
 
-#: ../../network/isdn.pm_.c:243
+#: ../../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 ""
-"Leidsin k�ll PCI ISDN kaardi, kui selle t��p on tundmatu. Palun valige �ks "
-"PCI kaart j�rgmisel sammul."
+"Leiti küll PCI ISDN kaart, kuid selle tüüp on tundmatu. Palun valige PCI "
+"kaart järgmisel sammul."
 
-#: ../../network/isdn.pm_.c:252
+#: ../../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 �ks j�rgmisel sammul."
+msgstr "PCI ISDN kaarti ei leitud. Palun valige see järgmisel sammul."
 
-#: ../../network/modem.pm_.c:39
+#: ../../network/modem.pm_.c:57
 msgid "Please choose which serial port your modem is connected to."
-msgstr "Millisesse seerialporti on Teie modem �hendatud?"
+msgstr "Millisesse jadaporti on Teie modem ühendatud?"
 
-#: ../../network/modem.pm_.c:44
+#: ../../network/modem.pm_.c:67
 msgid "Dialup options"
 msgstr "DialUp parameetrid"
 
-#: ../../network/modem.pm_.c:45 ../../standalone/drakconnect_.c:621
+#: ../../network/modem.pm_.c:68 ../../standalone/drakconnect_.c:619
 msgid "Connection name"
-msgstr "�henduse nimi"
+msgstr "Ühenduse nimi"
 
-#: ../../network/modem.pm_.c:46 ../../standalone/drakconnect_.c:622
+#: ../../network/modem.pm_.c:69 ../../standalone/drakconnect_.c:620
 msgid "Phone number"
 msgstr "Sissehelistamiskeskuse number"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/drakconnect_.c:623
+#: ../../network/modem.pm_.c:70 ../../standalone/drakconnect_.c:621
 msgid "Login ID"
 msgstr "Kasutajakonto"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
 msgid "Script-based"
-msgstr "Skriptip�hine"
+msgstr "Skriptipõhine"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
 msgid "Terminal-based"
-msgstr "Terminalip�hine"
+msgstr "Terminalipõhine"
 
-#: ../../network/modem.pm_.c:50 ../../standalone/drakconnect_.c:626
+#: ../../network/modem.pm_.c:73 ../../standalone/drakconnect_.c:624
 msgid "Domain name"
 msgstr "Domeeninimi"
 
-#: ../../network/modem.pm_.c:51 ../../standalone/drakconnect_.c:627
+#: ../../network/modem.pm_.c:74 ../../standalone/drakconnect_.c:625
 msgid "First DNS Server (optional)"
 msgstr "Esimene nimeserver (soovituslik)"
 
-#: ../../network/modem.pm_.c:52 ../../standalone/drakconnect_.c:628
+#: ../../network/modem.pm_.c:75 ../../standalone/drakconnect_.c:626
 msgid "Second DNS Server (optional)"
 msgstr "Teine nimeserver (soovituslik)"
 
+#: ../../network/modem.pm_.c:95
+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_.c:97
+#, 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_.c:97
+msgid "Do nothing"
+msgstr "Ära tee midagi"
+
+#: ../../network/modem.pm_.c:97
+msgid "Install rpm"
+msgstr "Paigalda RPM"
+
+#: ../../network/modem.pm_.c:97
+msgid "Title"
+msgstr "Tiitel"
+
 #: ../../network/netconnect.pm_.c:29
 msgid ""
 "\n"
 "You can disconnect or reconfigure your connection."
 msgstr ""
 "\n"
-"Saate �henduse katkestada v�i uuesti seadistada."
+"Saate ühenduse katkestada või uuesti seadistada."
 
 #: ../../network/netconnect.pm_.c:29 ../../network/netconnect.pm_.c:32
 msgid ""
@@ -6818,11 +7183,11 @@ msgid ""
 "You can reconfigure your connection."
 msgstr ""
 "\n"
-"Saate seadistada �henduse uuesti."
+"Saate seadistada ühenduse uuesti."
 
 #: ../../network/netconnect.pm_.c:29
 msgid "You are currently connected to internet."
-msgstr "Hetkel olete Internetiga �hendatud."
+msgstr "Hetkel olete Internetiga ühendatud."
 
 #: ../../network/netconnect.pm_.c:32
 msgid ""
@@ -6830,40 +7195,35 @@ msgid ""
 "You can connect to Internet or reconfigure your connection."
 msgstr ""
 "\n"
-"Saate �henduda Internetti v�i seadistada �hendus uuesti."
+"Saate ühenduda Internetti või seadistada ühendus uuesti."
 
 #: ../../network/netconnect.pm_.c:32
 msgid "You are not currently connected to Internet."
-msgstr "Hetkel ei ole Te Internetti �hendatud."
+msgstr "Hetkel ei ole Te Internetti ühendatud."
 
 #: ../../network/netconnect.pm_.c:36
-#, fuzzy
 msgid "Connect"
-msgstr "�hendatud"
+msgstr "Ühenda"
 
-#: ../../network/netconnect.pm_.c:38
-#, fuzzy
+#: ../../network/netconnect.pm_.c:37
 msgid "Disconnect"
-msgstr "Lahuta..."
+msgstr "Katkesta ühendus"
 
-#: ../../network/netconnect.pm_.c:40
-#, fuzzy
+#: ../../network/netconnect.pm_.c:38
 msgid "Configure the connection"
-msgstr "Seadista TV-kaabli �hendus"
+msgstr "Ühenduse seadistamine"
 
-#: ../../network/netconnect.pm_.c:45
+#: ../../network/netconnect.pm_.c:41
 msgid "Internet connection & configuration"
-msgstr "Interneti�henduse seadistamine"
+msgstr "Internetiühenduse seadistamine"
 
-#: ../../network/netconnect.pm_.c:95
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:94
+#, c-format
 msgid "We are now going to configure the %s connection."
-msgstr ""
-"\n"
-"Saate �henduse katkestada v�i uuesti seadistada."
+msgstr "Nüüd on aeg seadistada %s ühendus."
 
-#: ../../network/netconnect.pm_.c:104
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:103
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -6874,162 +7234,175 @@ msgid ""
 "Press OK to continue."
 msgstr ""
 "\n"
-"Saate �henduse katkestada v�i uuesti seadistada."
+"\n"
+"\n"
+"Nüüd on aeg seadistada %s ühendus.\n"
+"\n"
+"\n"
+"Vajutage jätkamiseks Olgu."
 
-#: ../../network/netconnect.pm_.c:133 ../../network/netconnect.pm_.c:251
-#: ../../network/netconnect.pm_.c:271 ../../network/tools.pm_.c:63
+#: ../../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"
+msgstr "Võrgu sätted"
 
-#: ../../network/netconnect.pm_.c:134
+#: ../../network/netconnect.pm_.c:133
 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 OK, muidu katkestage ja saate "
-"seadistada uuesti.\n"
+"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_.c:160
+#: ../../network/netconnect.pm_.c:157
 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"
 msgstr ""
-"Interneti�henduse Abimees\n"
+"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"
+"Nüüd hakkame internetiühendust seadistama.\n"
+"Kui Te ei soovi automaatset tuvastamist, siis jätke see märkimata.\n"
 
-#: ../../network/netconnect.pm_.c:166
+#: ../../network/netconnect.pm_.c:163
 msgid "Choose the profile to configure"
 msgstr "Valige profiil, mida seadistada"
 
-#: ../../network/netconnect.pm_.c:167
+#: ../../network/netconnect.pm_.c:164
 msgid "Use auto detection"
 msgstr "Kasuta automaattuvastust"
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3203
-#: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
-#: ../../standalone/drakfloppy_.c:146
+#: ../../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"
 
-#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:399
+#: ../../network/netconnect.pm_.c:171 ../../printer/printerdrake.pm_.c:364
 msgid "Detecting devices..."
-msgstr "Otsin printerit..."
+msgstr "Otsin seadmeid..."
 
-#: ../../network/netconnect.pm_.c:185 ../../network/netconnect.pm_.c:194
+#: ../../network/netconnect.pm_.c:214
 msgid "Normal modem connection"
-msgstr "Tavaline modemi�hendus"
+msgstr "Tavaline modemiühendus"
 
-#: ../../network/netconnect.pm_.c:185 ../../network/netconnect.pm_.c:194
+#: ../../network/netconnect.pm_.c:214
 #, c-format
 msgid "detected on port %s"
-msgstr "leiti port %s"
+msgstr "leiti pordis %s"
+
+#: ../../network/netconnect.pm_.c:215
+msgid "Winmodem connection"
+msgstr "Ühendus \"Winmodemiga\""
+
+#: ../../network/netconnect.pm_.c:215 ../../network/netconnect.pm_.c:217
+msgid "detected"
+msgstr "tuvastati"
 
-#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
+#: ../../network/netconnect.pm_.c:216
 msgid "ISDN connection"
-msgstr "ISDN �hendus"
+msgstr "ISDN ühendus"
 
-#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
+#: ../../network/netconnect.pm_.c:216
 #, c-format
 msgid "detected %s"
 msgstr "tuvastati %s"
 
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
-#, fuzzy
+#: ../../network/netconnect.pm_.c:217
 msgid "ADSL connection"
-msgstr "LAN �hendus"
+msgstr "ADSL ühendus"
 
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
-#, c-format
-msgid "detected on interface %s"
-msgstr "leiti liidesel %s"
-
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
+#: ../../network/netconnect.pm_.c:218
 msgid "Cable connection"
-msgstr "Kaabli�hendus"
+msgstr "Kaabliühendus"
 
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
-#, fuzzy
+#: ../../network/netconnect.pm_.c:218
 msgid "cable connection detected"
-msgstr "Kaabli�hendus"
+msgstr "leiti kaabliühendus"
 
-#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
+#: ../../network/netconnect.pm_.c:219
 msgid "LAN connection"
-msgstr "LAN �hendus"
+msgstr "LAN ühendus"
 
-#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
+#: ../../network/netconnect.pm_.c:219
 msgid "ethernet card(s) detected"
-msgstr "v�rgukaart(i) leiti �les"
+msgstr "võrgukaart(i) leiti üles"
 
-#: ../../network/netconnect.pm_.c:201
-#, fuzzy
+#: ../../network/netconnect.pm_.c:222
 msgid "Choose the connection you want to configure"
-msgstr "Valige kasutatav vahend"
+msgstr "Valige ühendus, mida seadistada"
 
-#: ../../network/netconnect.pm_.c:225
+#: ../../network/netconnect.pm_.c:246
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
 "\n"
 msgstr ""
+"Olete seadistanud mitu võimalust Internetiga ühendumiseks.\n"
+"Valige palun see, mida soovite kasutada.\n"
+"\n"
 
-#: ../../network/netconnect.pm_.c:226
-#, fuzzy
+#: ../../network/netconnect.pm_.c:247
 msgid "Internet connection"
-msgstr "Interneti�henduse jagamine"
+msgstr "Internetiühendus"
 
-#: ../../network/netconnect.pm_.c:232
+#: ../../network/netconnect.pm_.c:253
 msgid "Do you want to start the connection at boot?"
-msgstr "Kas soovite luua �henduse juba alglaadimisel?"
+msgstr "Kas soovite luua ühenduse juba alglaadimisel?"
 
-#: ../../network/netconnect.pm_.c:246
+#: ../../network/netconnect.pm_.c:267
 msgid "Network configuration"
-msgstr "V�rgus�tted"
+msgstr "Võrgusätted"
 
-#: ../../network/netconnect.pm_.c:247
+#: ../../network/netconnect.pm_.c:268
 msgid "The network needs to be restarted"
-msgstr ""
+msgstr "Võrk tuleb uuesti käivitada"
 
-#: ../../network/netconnect.pm_.c:251
-#, fuzzy, c-format
+#: ../../network/netconnect.pm_.c:272
+#, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
 "\n"
 "%s"
-msgstr "Kas soovite v�rgu�hendust taask�ivitada?"
+msgstr ""
+"Võrgu taaskäivitusel juhtus viga: \n"
+"\n"
+"%s"
 
-#: ../../network/netconnect.pm_.c:261
+#: ../../network/netconnect.pm_.c:282
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
 "The configuration will now be applied to your system.\n"
 "\n"
 msgstr ""
-"�nnitleme, v�rgundus ja interneti�hendus on seadistatud.\n"
+"Õnnitleme, võrk ja internetiühendus on seadistatud.\n"
+"Sätted salvestatakse nüüd.\n"
 "\n"
-"S�tted salvestatakse n��d.\n"
 
-#: ../../network/netconnect.pm_.c:265
+#: ../../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"
+"Soovitame taaskäivitada ka X keskkonna, et vältida võimalikke\n"
 "masinanime muutmisest tingitud probleeme."
 
-#: ../../network/netconnect.pm_.c:266
+#: ../../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."
 
-#: ../../network/network.pm_.c:291
+#: ../../network/network.pm_.c:278
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
@@ -7037,56 +7410,72 @@ msgid ""
 "Modifying the fields below will override this configuration."
 msgstr ""
 "HOIATUS: See seade on juba seadistatud Interneti jaoks.\n"
-"Valige lihtsalt OK, et s�tteid mitte muuta."
+"Valige lihtsalt Olgu, et sätteid mitte muuta.\n"
+"All toodud väljade muutmine tühistab varasemad sätted."
 
-#: ../../network/network.pm_.c:296
+#: ../../network/network.pm_.c:283
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
 "notation (for example, 1.2.3.4)."
 msgstr ""
 "Palun andke IP parameetrid selle masina jaoks.\n"
-"K�ik read tuleb sisestada IP-aadressi kujul\n"
-"(N�iteks 12.34.56.78)"
+"Kõik read tuleb sisestada IP-aadressi kujul\n"
+"(näiteks 12.34.56.78)"
 
-#: ../../network/network.pm_.c:306 ../../network/network.pm_.c:307
+#: ../../network/network.pm_.c:293 ../../network/network.pm_.c:294
 #, c-format
 msgid "Configuring network device %s"
-msgstr "Seadistame v�rgukaardi %s"
+msgstr "Seadistame võrgukaardi %s"
 
-#: ../../network/network.pm_.c:307
+#: ../../network/network.pm_.c:294
 #, c-format
 msgid " (driver %s)"
-msgstr " (juhtprogramm %s)"
+msgstr " (draiver %s)"
 
-#: ../../network/network.pm_.c:309 ../../standalone/drakconnect_.c:231
-#: ../../standalone/drakconnect_.c:467
+#: ../../network/network.pm_.c:296 ../../standalone/drakconnect_.c:228
+#: ../../standalone/drakconnect_.c:464
 msgid "IP address"
-msgstr "IP-aadress"
+msgstr "IP aadress"
 
-#: ../../network/network.pm_.c:310 ../../standalone/drakconnect_.c:468
-#: ../../standalone/drakgw_.c:295
+#: ../../network/network.pm_.c:297 ../../standalone/drakconnect_.c:465
+#: ../../standalone/drakgw_.c:291
 msgid "Netmask"
-msgstr "V�rgu mask"
+msgstr "Võrgumask"
 
-#: ../../network/network.pm_.c:311
+#: ../../network/network.pm_.c:298
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network/network.pm_.c:311
+#: ../../network/network.pm_.c:298
 msgid "Automatic IP"
 msgstr "Automaatne IP"
 
-#: ../../network/network.pm_.c:312
-#, fuzzy
+#: ../../network/network.pm_.c:299
 msgid "Start at boot"
-msgstr "K�ivitub laadimisel"
+msgstr "Käivitub alglaadimisel"
 
-#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:875
+#: ../../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 formaadis 1.2.3.4"
+msgstr "IP aadress peab olema kujul 1.2.3.4"
 
-#: ../../network/network.pm_.c:363
+#: ../../network/network.pm_.c:326
+msgid ""
+"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
+"frequency), or add enough '0'."
+msgstr ""
+"Sagedus peab sisaldama suffiksit k, M või G (näiteks \"2.46G\" - 2,46 GHz "
+"sagedusel), või lisage piisavalt nulle."
+
+#: ../../network/network.pm_.c:330
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0'."
+msgstr ""
+"Kiirus peab sisaldama suffiksit k, M või G (näiteks \"11M\"), või lisage "
+"piisavalt nulle."
+
+#: ../../network/network.pm_.c:350
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -7094,220 +7483,214 @@ msgid ""
 "You may also enter the IP address of the gateway if you have one"
 msgstr ""
 "Palun sisestage oma masina nimi.\n"
-"Masina nimi peab olema esitatud t�iskujul,\n"
-"nagu ``minumasin.minufirma.ee''.\n"
-"Kui Teil on vaikimisi l��s, siis sisestage ka selle IP-aadress"
+"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"
 
-#: ../../network/network.pm_.c:368
+#: ../../network/network.pm_.c:355
 msgid "DNS server"
 msgstr "Nimeserver"
 
-#: ../../network/network.pm_.c:369
+#: ../../network/network.pm_.c:356
 #, c-format
 msgid "Gateway (e.g. %s)"
-msgstr ""
+msgstr "Vaikelüüs (nt %s)"
 
-#: ../../network/network.pm_.c:371
+#: ../../network/network.pm_.c:358
 msgid "Gateway device"
-msgstr "L��sipoolne seade"
+msgstr "Lüüsipoolne seade"
 
-#: ../../network/network.pm_.c:376
-#, fuzzy
+#: ../../network/network.pm_.c:363
 msgid "DNS server address should be in format 1.2.3.4"
-msgstr "IP-aadress peab olema formaadis 1.2.3.4"
+msgstr "Nimeserveri aadress peab olema kujul 1.2.3.4"
 
-#: ../../network/network.pm_.c:380
-#, fuzzy
+#: ../../network/network.pm_.c:367
 msgid "Gateway address should be in format 1.2.3.4"
-msgstr "IP-aadress peab olema formaadis 1.2.3.4"
+msgstr "Lüüsi aadress peab olema kujul 1.2.3.4"
 
-#: ../../network/network.pm_.c:394
+#: ../../network/network.pm_.c:381
 msgid "Proxies configuration"
-msgstr "Vahendajate s�tted"
+msgstr "Vahendajate sätted"
 
-#: ../../network/network.pm_.c:395
+#: ../../network/network.pm_.c:382
 msgid "HTTP proxy"
 msgstr "HTTP vahendaja"
 
-#: ../../network/network.pm_.c:396
+#: ../../network/network.pm_.c:383
 msgid "FTP proxy"
 msgstr "FTP vahendaja"
 
-#: ../../network/network.pm_.c:397
+#: ../../network/network.pm_.c:384
 msgid "Track network card id (useful for laptops)"
-msgstr ""
+msgstr "Võrgukaadi id tuvastus (kasulik sülearvutite puhul)"
 
-#: ../../network/network.pm_.c:400
+#: ../../network/network.pm_.c:387
 msgid "Proxy should be http://..."
 msgstr "Vahendaja peab olema kujul http://..."
 
-#: ../../network/network.pm_.c:401 ../../proxy.pm_.c:65
-#, fuzzy
+#: ../../network/network.pm_.c:388
 msgid "Url should begin with 'ftp:' or 'http:'"
-msgstr "Vahendaja peab olema kujul http://..."
+msgstr "URLi alguses peab olema 'ftp:' või 'http:'"
 
 #
-#: ../../network/shorewall.pm_.c:25
+#: ../../network/shorewall.pm_.c:26
 msgid "Firewalling configuration detected!"
-msgstr "Leitud tulem��ri s�tted!"
+msgstr "Leitud tulemüüri sätted!"
 
-#: ../../network/shorewall.pm_.c:26
+#: ../../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 vaatame."
+"Hoiatus! Leiti olemasolevad tulemüüri sätted. Tõenäoliselt peaksite need "
+"hiljem üle vaatama."
 
-#: ../../network/tools.pm_.c:41
+#: ../../network/tools.pm_.c:57
 msgid "Internet configuration"
-msgstr "Interneti s�tted"
+msgstr "Interneti sätted"
 
-#: ../../network/tools.pm_.c:42
+#: ../../network/tools.pm_.c:58
 msgid "Do you want to try to connect to the Internet now?"
-msgstr "Kas soovite oma interneti�hendust proovida?"
+msgstr "Kas soovite oma internetiühendust proovida?"
 
-#: ../../network/tools.pm_.c:46 ../../standalone/drakconnect_.c:196
+#: ../../network/tools.pm_.c:61 ../../standalone/drakconnect_.c:193
 msgid "Testing your connection..."
-msgstr "Testime Teie �hendust..."
+msgstr "Testime Teie ühendust..."
 
-#: ../../network/tools.pm_.c:56
+#: ../../network/tools.pm_.c:70
 msgid "The system is now connected to Internet."
-msgstr "S�steem on n��d Internetti �hendatud"
+msgstr "Süsteem on nüüd Internetti ühendatud."
 
-#: ../../network/tools.pm_.c:57
+#: ../../network/tools.pm_.c:71
 msgid "For security reason, it will be disconnected now."
-msgstr "Turvakaalutlusel katkestan n��d �henduse."
+msgstr "Turvakaalutlusel katkestan nüüd ühenduse."
 
-#: ../../network/tools.pm_.c:58
+#: ../../network/tools.pm_.c:72
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
 msgstr ""
-"Paistab, et s�steem ei ole Internetti �hendatud.\n"
-"Palun seadistage �hendus uuesti."
+"Paistab, et süsteem ei ole Internetti ühendatud.\n"
+"Palun seadistage ühendus uuesti."
 
-#: ../../network/tools.pm_.c:82
+#: ../../network/tools.pm_.c:96
 msgid "Connection Configuration"
-msgstr "Interneti�henduse s�tted"
+msgstr "Internetiühenduse sätted"
 
-#: ../../network/tools.pm_.c:83
+#: ../../network/tools.pm_.c:97
 msgid "Please fill or check the field below"
-msgstr "Palun t�ida allpool olev v�li"
+msgstr "Palun täitke allpool olev väli"
 
-#: ../../network/tools.pm_.c:85 ../../standalone/drakconnect_.c:607
+#: ../../network/tools.pm_.c:99 ../../standalone/drakconnect_.c:605
 msgid "Card IRQ"
 msgstr "Kaardi IRQ"
 
-#: ../../network/tools.pm_.c:86 ../../standalone/drakconnect_.c:608
+#: ../../network/tools.pm_.c:100 ../../standalone/drakconnect_.c:606
 msgid "Card mem (DMA)"
-msgstr "Kaardi m�lu (DMA)"
+msgstr "Kaardi mälu (DMA)"
 
-#: ../../network/tools.pm_.c:87 ../../standalone/drakconnect_.c:609
+#: ../../network/tools.pm_.c:101 ../../standalone/drakconnect_.c:607
 msgid "Card IO"
 msgstr "Kaardi IO"
 
-#: ../../network/tools.pm_.c:88 ../../standalone/drakconnect_.c:610
+#: ../../network/tools.pm_.c:102 ../../standalone/drakconnect_.c:608
 msgid "Card IO_0"
 msgstr "Kaardi IO_0"
 
-#: ../../network/tools.pm_.c:89 ../../standalone/drakconnect_.c:611
+#: ../../network/tools.pm_.c:103 ../../standalone/drakconnect_.c:609
 msgid "Card IO_1"
 msgstr "Kaardi IO_1"
 
-#: ../../network/tools.pm_.c:90 ../../standalone/drakconnect_.c:612
+#: ../../network/tools.pm_.c:104 ../../standalone/drakconnect_.c:610
 msgid "Your personal phone number"
 msgstr "Teie telefoninumber"
 
-#: ../../network/tools.pm_.c:91 ../../standalone/drakconnect_.c:613
+#: ../../network/tools.pm_.c:105 ../../standalone/drakconnect_.c:611
 msgid "Provider name (ex provider.net)"
-msgstr "Teenusepakkuja tunnus (n�iteks minuisp.ee)"
+msgstr "Teenusepakkuja tunnus (näiteks minuisp.ee)"
 
-#: ../../network/tools.pm_.c:92 ../../standalone/drakconnect_.c:614
+#: ../../network/tools.pm_.c:106 ../../standalone/drakconnect_.c:612
 msgid "Provider phone number"
 msgstr "Sissehelistamiskeskuse number"
 
-#: ../../network/tools.pm_.c:93 ../../standalone/drakconnect_.c:615
+#: ../../network/tools.pm_.c:107 ../../standalone/drakconnect_.c:613
 msgid "Provider dns 1 (optional)"
-msgstr "DNS 1 (v�ib j�tta t�hjaks)"
+msgstr "DNS 1 (võib jätta tühjaks)"
 
-#: ../../network/tools.pm_.c:94 ../../standalone/drakconnect_.c:616
+#: ../../network/tools.pm_.c:108 ../../standalone/drakconnect_.c:614
 msgid "Provider dns 2 (optional)"
-msgstr "DNS 2 (v�ib j�tta t�hjaks)"
+msgstr "DNS 2 (võib jätta tühjaks)"
 
-#: ../../network/tools.pm_.c:95
-#, fuzzy
+#: ../../network/tools.pm_.c:109
 msgid "Choose your country"
-msgstr "Klaviatuuri valik"
+msgstr "Valige riik"
 
-#: ../../network/tools.pm_.c:96 ../../standalone/drakconnect_.c:619
+#: ../../network/tools.pm_.c:110 ../../standalone/drakconnect_.c:617
 msgid "Dialing mode"
 msgstr "Valimisviis"
 
-#: ../../network/tools.pm_.c:97 ../../standalone/drakconnect_.c:631
-#, fuzzy
+#: ../../network/tools.pm_.c:111 ../../standalone/drakconnect_.c:629
 msgid "Connection speed"
-msgstr "�henduse t��p: "
+msgstr "Ühenduse kiirus"
 
-#: ../../network/tools.pm_.c:98 ../../standalone/drakconnect_.c:632
-#, fuzzy
+#: ../../network/tools.pm_.c:112 ../../standalone/drakconnect_.c:630
 msgid "Connection timeout (in sec)"
-msgstr "�henduse t��p: "
+msgstr "Ühenduse aegumine (sekundites)"
 
-#: ../../network/tools.pm_.c:99 ../../standalone/drakconnect_.c:617
+#: ../../network/tools.pm_.c:113 ../../standalone/drakconnect_.c:615
 msgid "Account Login (user name)"
 msgstr "Kasutajatunnus"
 
-#: ../../network/tools.pm_.c:100 ../../standalone/drakconnect_.c:618
-#: ../../standalone/drakconnect_.c:649
+#: ../../network/tools.pm_.c:114 ../../standalone/drakconnect_.c:616
+#: ../../standalone/drakconnect_.c:647
 msgid "Account Password"
-msgstr "Salas�na"
+msgstr "Salasõna"
 
-#: ../../network/tools.pm_.c:104 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:118 ../../network/tools.pm_.c:132
 msgid "United Kingdom"
-msgstr ""
+msgstr "Suurbritannia"
 
-#: ../../partition_table.pm_.c:602
+#: ../../partition_table.pm_.c:603
 msgid "mount failed: "
-msgstr "�hendamine eba�nnestus: "
+msgstr "haakimine ebaõnnestus: "
 
-#: ../../partition_table.pm_.c:666
+#: ../../partition_table.pm_.c:667
 msgid "Extended partition not supported on this platform"
-msgstr "Sellel platformil ei saa laiendatud partitsiooni luua"
+msgstr "Sellel platvormil ei saa laiendatud partitsiooni luua"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:685
 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"
+"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."
 
 #: ../../partition_table.pm_.c:774
 #, c-format
 msgid "Restoring from file %s failed: %s"
-msgstr "Taastamine failist %s eba�nnestus: %s"
+msgstr "Taastamine failist %s ebaõnnestus: %s"
 
 #: ../../partition_table.pm_.c:776
 msgid "Bad backup file"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Kõlbmatu varukoopia"
 
-#: ../../partition_table.pm_.c:798
+#: ../../partition_table.pm_.c:796
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Viga faili %s kirjutamisel"
 
-#: ../../partition_table/raw.pm_.c:189
+#: ../../partition_table/raw.pm_.c:192
 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"
 msgstr ""
-"Teie k�vakettal juhtub imelikke asju. \n"
-"Andmete pidevuse kontroll eba�nnestus. \n"
-"See t�hendab, et kettale kirjutamisel tekivad jamad"
+"Teie kõvakettal juhtub imelikke asju. \n"
+"Andmete pidevuse kontroll ebaõnnestus. \n"
+"See tähendab, et kettale kirjutamisel tekivad jamad"
 
 #: ../../pkgs.pm_.c:26
 msgid "must have"
@@ -7315,11 +7698,11 @@ msgstr "vajalik"
 
 #: ../../pkgs.pm_.c:27
 msgid "important"
-msgstr "t�htis"
+msgstr "tähtis"
 
 #: ../../pkgs.pm_.c:28
 msgid "very nice"
-msgstr "v�ga kena"
+msgstr "väga kena"
 
 #: ../../pkgs.pm_.c:29
 msgid "nice"
@@ -7327,216 +7710,208 @@ msgstr "kena"
 
 #: ../../pkgs.pm_.c:30
 msgid "maybe"
-msgstr "v�ib olla"
+msgstr "võib olla"
 
-#: ../../printer.pm_.c:26
-msgid "CUPS - Common Unix Printing System"
-msgstr ""
+#: ../../printer/data.pm_.c:18
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - Trüki kohe"
 
-#: ../../printer.pm_.c:27
-msgid "LPRng - LPR New Generation"
-msgstr ""
+#: ../../printer/data.pm_.c:19
+msgid "PDQ"
+msgstr "PDQ"
 
-#: ../../printer.pm_.c:28
+#: ../../printer/data.pm_.c:30
 msgid "LPD - Line Printer Daemon"
-msgstr ""
+msgstr "LDP - Otsetrükkimisdeemon"
 
-#: ../../printer.pm_.c:29
-msgid "PDQ - Print, Don't Queue"
-msgstr ""
+#: ../../printer/data.pm_.c:31
+msgid "LPD"
+msgstr "LPD"
 
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1181
-msgid "CUPS"
-msgstr ""
+#: ../../printer/data.pm_.c:51
+msgid "LPRng - LPR New Generation"
+msgstr "LPRng - LPR, uus põlvkond"
 
-#: ../../printer.pm_.c:35
+#: ../../printer/data.pm_.c:52
 msgid "LPRng"
-msgstr ""
+msgstr "LPRng"
 
-#: ../../printer.pm_.c:36
-msgid "LPD"
-msgstr ""
+#: ../../printer/data.pm_.c:75
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - Tavaline UNIXi trükkimissüsteem"
 
-#: ../../printer.pm_.c:37
-msgid "PDQ"
-msgstr ""
+#: ../../printer/data.pm_.c:76 ../../printer/main.pm_.c:677
+msgid "CUPS"
+msgstr "CUPS"
+
+#: ../../printer/detect.pm_.c:80 ../../printer/detect.pm_.c:213
+#: ../../printer/detect.pm_.c:250
+msgid "Unknown Model"
+msgstr "Tundmatu mudel"
 
-#: ../../printer.pm_.c:49
+#: ../../printer/main.pm_.c:26
 msgid "Local printer"
 msgstr "Kohalik printer"
 
-#: ../../printer.pm_.c:50
+#: ../../printer/main.pm_.c:27
 msgid "Remote printer"
-msgstr "V�rguprinter"
+msgstr "Võrguprinter"
 
-#: ../../printer.pm_.c:51
-#, fuzzy
+#: ../../printer/main.pm_.c:28
 msgid "Printer on remote CUPS server"
 msgstr "CUPS printserver"
 
-#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:898
-#, fuzzy
+#: ../../printer/main.pm_.c:29 ../../printer/printerdrake.pm_.c:835
 msgid "Printer on remote lpd server"
 msgstr "lpd printserver"
 
-#: ../../printer.pm_.c:53
+#: ../../printer/main.pm_.c:30
 msgid "Network printer (TCP/Socket)"
-msgstr "V�rguprinter (TCP/Socket)"
+msgstr "Võrguprinter (TCP/Socket)"
 
-#: ../../printer.pm_.c:54
-#, fuzzy
+#: ../../printer/main.pm_.c:31
 msgid "Printer on SMB/Windows 95/98/NT server"
-msgstr "SMB/Windows 95/98/NT"
+msgstr "SMB/Windows 95/98/NT printserver"
 
-#: ../../printer.pm_.c:55
-#, fuzzy
+#: ../../printer/main.pm_.c:32
 msgid "Printer on NetWare server"
-msgstr "Printserver:"
+msgstr "NetWare printserver"
 
-#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:902
-#, fuzzy
+#: ../../printer/main.pm_.c:33 ../../printer/printerdrake.pm_.c:839
 msgid "Enter a printer device URI"
 msgstr "Printeri seadme URI"
 
-#: ../../printer.pm_.c:57
+#: ../../printer/main.pm_.c:34
 msgid "Pipe job into a command"
-msgstr ""
-
-#: ../../printer.pm_.c:346 ../../printer.pm_.c:388 ../../printer.pm_.c:570
-msgid "Unknown Model"
-msgstr ""
+msgstr "Töö toru kaudu käsuks"
 
-#: ../../printer.pm_.c:791 ../../printer.pm_.c:982 ../../printer.pm_.c:1374
-#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3471
+#: ../../printer/main.pm_.c:290 ../../printer/main.pm_.c:478
+#: ../../printer/main.pm_.c:794 ../../printer/printerdrake.pm_.c:3228
 msgid "Unknown model"
-msgstr ""
+msgstr "Tundmatu mudel"
 
-#: ../../printer.pm_.c:819
-#, fuzzy
+#: ../../printer/main.pm_.c:317
 msgid "Local Printers"
-msgstr "Kohalik printer"
+msgstr "Kohalikud printerid"
 
-#: ../../printer.pm_.c:821 ../../printer.pm_.c:1182
-#, fuzzy
+#: ../../printer/main.pm_.c:319 ../../printer/main.pm_.c:678
 msgid "Remote Printers"
-msgstr "V�rguprinter"
+msgstr "Võrguprinterid"
 
-#: ../../printer.pm_.c:828 ../../printerdrake.pm_.c:417
+#: ../../printer/main.pm_.c:326 ../../printer/printerdrake.pm_.c:381
 #, c-format
 msgid " on parallel port \\/*%s"
-msgstr ""
+msgstr " paralleelpordis \\/*%s"
 
-#: ../../printer.pm_.c:831 ../../printerdrake.pm_.c:419
+#: ../../printer/main.pm_.c:329 ../../printer/printerdrake.pm_.c:383
 #, c-format
 msgid ", USB printer \\/*%s"
-msgstr ""
+msgstr ", USB printer \\/*%s"
 
-#: ../../printer.pm_.c:836
+#: ../../printer/main.pm_.c:334
 #, c-format
 msgid ", multi-function device on parallel port \\/*%s"
-msgstr ""
+msgstr ", mitme funktsiooniga seade paralleelpordis \\/*%s"
 
-#: ../../printer.pm_.c:839
+#: ../../printer/main.pm_.c:337
 msgid ", multi-function device on USB"
-msgstr ""
+msgstr ", mitme funktsiooniga seade USB-l"
 
-#: ../../printer.pm_.c:841
+#: ../../printer/main.pm_.c:339
 msgid ", multi-function device on HP JetDirect"
-msgstr ""
+msgstr ", mitme funktsiooniga seade HP JetDirectil"
 
-#: ../../printer.pm_.c:843
+#: ../../printer/main.pm_.c:341
 msgid ", multi-function device"
-msgstr ""
+msgstr ", mitme funktsiooniga seade"
 
-#: ../../printer.pm_.c:846
-#, fuzzy, c-format
+#: ../../printer/main.pm_.c:344
+#, c-format
 msgid ", printing to %s"
-msgstr "Viga faili %s kirjutamisel"
+msgstr ", trükkimine masinal %s"
 
-#: ../../printer.pm_.c:848
+#: ../../printer/main.pm_.c:346
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
-msgstr ""
+msgstr " LPD serveril \"%s\", printer \"%s\""
 
-#: ../../printer.pm_.c:850
+#: ../../printer/main.pm_.c:348
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
-msgstr ""
+msgstr ", TCP/IP masinal \"%s\", port %s"
 
-#: ../../printer.pm_.c:854
+#: ../../printer/main.pm_.c:352
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
-msgstr ""
+msgstr " SMB/Windowsi serveril \"%s\", jagatud printer \"%s\""
 
-#: ../../printer.pm_.c:858
+#: ../../printer/main.pm_.c:356
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
-msgstr ""
+msgstr " Novelli serveril \"%s\", printer \"%s\""
 
-#: ../../printer.pm_.c:860
+#: ../../printer/main.pm_.c:358
 #, c-format
 msgid ", using command %s"
-msgstr ""
+msgstr ", kasutades käsku %s"
 
-#: ../../printer.pm_.c:979 ../../printerdrake.pm_.c:1701
+#: ../../printer/main.pm_.c:475 ../../printer/printerdrake.pm_.c:1603
 msgid "Raw printer (No driver)"
-msgstr ""
+msgstr "Toorprinter (draiverita)"
 
-#: ../../printer.pm_.c:1151
-#, fuzzy, c-format
+#: ../../printer/main.pm_.c:647
+#, c-format
 msgid "(on %s)"
-msgstr "(moodul %s)"
+msgstr "(masinal %s)"
 
-#: ../../printer.pm_.c:1153
+#: ../../printer/main.pm_.c:649
 msgid "(on this machine)"
-msgstr ""
+msgstr "(sellel masinal)"
 
-#: ../../printer.pm_.c:1178
-#, fuzzy, c-format
+#: ../../printer/main.pm_.c:674
+#, c-format
 msgid "On CUPS server \"%s\""
-msgstr "CUPS serveri IP"
+msgstr "CUPS serveril \"%s\""
 
-#: ../../printer.pm_.c:1184 ../../printerdrake.pm_.c:3123
-#: ../../printerdrake.pm_.c:3134 ../../printerdrake.pm_.c:3360
-#: ../../printerdrake.pm_.c:3412 ../../printerdrake.pm_.c:3438
-#: ../../printerdrake.pm_.c:3613 ../../printerdrake.pm_.c:3615
+#: ../../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)"
 
-#: ../../printerdrake.pm_.c:25
+#: ../../printer/printerdrake.pm_.c:27
 msgid "Select Printer Connection"
-msgstr "Vali printeri �hendusviis"
+msgstr "Valige printeri ühendusviis"
 
-#: ../../printerdrake.pm_.c:26
+#: ../../printer/printerdrake.pm_.c:28
 msgid "How is the printer connected?"
-msgstr "Kuidas on see printer �hendatud?"
+msgstr "Kuidas on see printer ühendatud?"
 
-#: ../../printerdrake.pm_.c:28
-#, fuzzy
+#: ../../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 ""
-"Kui v�rgus on CUPS server, siis ei ole Teil vaja siin\n"
+"\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\"."
 
-#: ../../printerdrake.pm_.c:36
+#: ../../printer/printerdrake.pm_.c:38
 msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
-msgstr ""
+msgstr "Printeri automaattuvastus (kohalikud, TCP/Socketi ja SMB printerid)"
 
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3187
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:81 ../../printer/printerdrake.pm_.c:2950
 msgid "CUPS configuration"
-msgstr "LAN s�tted"
+msgstr "CUPSi sätted"
 
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3188
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:82 ../../printer/printerdrake.pm_.c:2951
 msgid "Specify CUPS server"
-msgstr "CUPS printserver"
+msgstr "CUPS serveri määramine"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printer/printerdrake.pm_.c:83
 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 "
@@ -7546,8 +7921,15 @@ msgid ""
 "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."
 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."
 
-#: ../../printerdrake.pm_.c:87
+#: ../../printer/printerdrake.pm_.c:84
 msgid ""
 "\n"
 "Normally, CUPS is automatically configured according to your network "
@@ -7556,154 +7938,170 @@ msgid ""
 "configuration\" and edit your file /etc/cups/cupsd.conf manually. Do not "
 "forget to restart CUPS afterwards (command: \"service cups restart\")."
 msgstr ""
+"\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\")."
 
-#: ../../printerdrake.pm_.c:91
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:88
 msgid "The IP address should look like 192.168.1.20"
-msgstr "IP-aadress peab olema formaadis 1.2.3.4"
+msgstr "IP aadress peab välja nägema umbes nii: 192.168.1.20"
 
-#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1109
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:92 ../../printer/printerdrake.pm_.c:1041
 msgid "The port number should be an integer!"
-msgstr "Pordi number peab olema ikkagi number"
+msgstr "Pordi number peab olema täisarv!"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printer/printerdrake.pm_.c:99
 msgid "CUPS server IP"
 msgstr "CUPS serveri IP"
 
-#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1129
+#: ../../printer/printerdrake.pm_.c:100 ../../printer/printerdrake.pm_.c:1061
+#: ../../standalone/harddrake2_.c:63
 msgid "Port"
 msgstr "Port"
 
-#: ../../printerdrake.pm_.c:105
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:102
 msgid "Automatic CUPS configuration"
-msgstr "Alglaaduri stiil"
-
-#: ../../printerdrake.pm_.c:177 ../../printerdrake.pm_.c:247
-#: ../../printerdrake.pm_.c:1574 ../../printerdrake.pm_.c:1578
-#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
-#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
-#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
-#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2792
-#: ../../printerdrake.pm_.c:2797 ../../printerdrake.pm_.c:2831
-#: ../../printerdrake.pm_.c:2836 ../../printerdrake.pm_.c:2873
-#: ../../printerdrake.pm_.c:2926 ../../printerdrake.pm_.c:2946
-#: ../../printerdrake.pm_.c:2960 ../../printerdrake.pm_.c:2994
-#: ../../printerdrake.pm_.c:3040 ../../printerdrake.pm_.c:3058
-#: ../../printerdrake.pm_.c:3147 ../../printerdrake.pm_.c:3226
-#: ../../printerdrake.pm_.c:3528 ../../printerdrake.pm_.c:3583
-#: ../../printerdrake.pm_.c:3636 ../../standalone/printerdrake_.c:57
-msgid "Printerdrake"
-msgstr "PrinterDrake"
+msgstr "CUPSi automaatne seadistamine"
 
-#: ../../printerdrake.pm_.c:178
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:159
 msgid "Checking your system..."
-msgstr "Millist printimiss�steemi soovite kasutada?"
+msgstr "Süsteemi kontrollimine..."
+
+#: ../../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"
 
-#: ../../printerdrake.pm_.c:186
+#: ../../printer/printerdrake.pm_.c:167
 msgid ""
 "There are no printers found which are directly connected to your machine"
-msgstr ""
+msgstr "Ei leitud ühtegi printerit, mis oleks masinaga otse ühendatud"
 
-#: ../../printerdrake.pm_.c:198
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:179
 msgid ""
 "The following printers\n"
 "\n"
-msgstr "Eemaldamiseks on valitud j�rgmised paketid"
+msgstr ""
+"Järgmised printerid\n"
+"\n"
 
-#: ../../printerdrake.pm_.c:199
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:180
 msgid ""
 "The following printer\n"
 "\n"
-msgstr "Eemaldamiseks on valitud j�rgmised paketid"
+msgstr ""
+"Järgmine printer\n"
+"\n"
 
-#: ../../printerdrake.pm_.c:201
+#: ../../printer/printerdrake.pm_.c:182
 msgid ""
 "\n"
 "and one unknown printer are "
 msgstr ""
+"\n"
+"ja üks tundmatu printer on "
 
-#: ../../printerdrake.pm_.c:203
+#: ../../printer/printerdrake.pm_.c:184
 #, c-format
 msgid ""
 "\n"
 "and %d unknown printers are "
 msgstr ""
+"\n"
+"ja %d tundmatut printerit on "
 
-#: ../../printerdrake.pm_.c:207
+#: ../../printer/printerdrake.pm_.c:187
 msgid ""
 "\n"
 "are "
 msgstr ""
+"\n"
+"on "
 
-#: ../../printerdrake.pm_.c:208
+#: ../../printer/printerdrake.pm_.c:187
 msgid ""
 "\n"
 "is "
 msgstr ""
+"\n"
+"on "
 
-#: ../../printerdrake.pm_.c:210
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:189
 msgid "directly connected to your system"
-msgstr "Teie s�steemis ei ole v�rgukaarti!"
+msgstr "Teie süsteemi otse ühendatud"
 
-#: ../../printerdrake.pm_.c:213
+#: ../../printer/printerdrake.pm_.c:192
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
 msgstr ""
+"\n"
+"Üks tundmatu printer on Teie süsteemi otse ühendatud"
 
-#: ../../printerdrake.pm_.c:215
+#: ../../printer/printerdrake.pm_.c:194
 #, 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"
 
-#: ../../printerdrake.pm_.c:221
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:200
 msgid " (Make sure that all your printers are connected and turned on).\n"
-msgstr "Millisesse seerialporti on Teie modem �hendatud?"
+msgstr " (Kontrollige, et kõik printerid on ühendatud ja sisse lülitatud).\n"
 
-#: ../../printerdrake.pm_.c:235
+#: ../../printer/printerdrake.pm_.c:214
 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"
 
-#: ../../printerdrake.pm_.c:236
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:215
 msgid "Do you want to enable printing on printers in the local network?\n"
-msgstr "Kas soovite seadistusi proovida?"
+msgstr "Kas soovite trükkimist lubada printeritel Teie kohtvõrgus?\n"
 
-#: ../../printerdrake.pm_.c:238
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:217
 msgid "Do you want to enable printing on the printers mentioned above?\n"
-msgstr "Kas soovite luua �henduse juba alglaadimisel?"
+msgstr "Kas soovite trükkimist lubada ülalmainitud printeritel?\n"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printer/printerdrake.pm_.c:218
 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"
 
-#: ../../printerdrake.pm_.c:240
+#: ../../printer/printerdrake.pm_.c:219
 #, 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."
 
-#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
-#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3169
-#: ../../printerdrake.pm_.c:3299
-#, fuzzy
+#: ../../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 "Printerit ei ole"
+msgstr "Lisa uus printer"
 
-#: ../../printerdrake.pm_.c:280
+#: ../../printer/printerdrake.pm_.c:259
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7715,8 +8113,17 @@ msgid ""
 "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."
 
-#: ../../printerdrake.pm_.c:293
+#: ../../printer/printerdrake.pm_.c:272
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7737,8 +8144,26 @@ msgid ""
 " Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
 "want to set up your printer(s) now."
 msgstr ""
+"\n"
+"Printeri seadistamine nõustaja\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"
+"\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õ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"
+"\n"
+"Kui olete valmis, vajutage \"Järgmine\", või \"Katkesta\", kui Te ei soovi "
+"printeri(te) seadistamisega praegu tegelda."
 
-#: ../../printerdrake.pm_.c:302 ../../printerdrake.pm_.c:319
+#: ../../printer/printerdrake.pm_.c:281 ../../printer/printerdrake.pm_.c:298
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7752,8 +8177,20 @@ msgid ""
 " Click on \"Next\" when you are ready, and on \"Cancel\" when 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.\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."
 
-#: ../../printerdrake.pm_.c:310
+#: ../../printer/printerdrake.pm_.c:289
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -7772,21 +8209,36 @@ msgid ""
 " Click on \"Next\" when you are ready, and on \"Cancel\" when you do not "
 "want to set up your printer(s) now."
 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"
+"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."
 
-#: ../../printerdrake.pm_.c:328
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:307
 msgid "Auto-detect printers connected to this machine"
-msgstr "V�rguprinter"
+msgstr "Selle masinaga ühendatud printerite automaattuvastus"
 
-#: ../../printerdrake.pm_.c:331
+#: ../../printer/printerdrake.pm_.c:310
 msgid "Auto-detect printers connected directly to the local network"
-msgstr ""
+msgstr "Kohtvõrku ühendatud printerite automaattuvastus"
 
-#: ../../printerdrake.pm_.c:334
+#: ../../printer/printerdrake.pm_.c:313
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
-msgstr ""
+msgstr "Microsoft Windowsi masinatega ühendatud printerite automaattuvastus"
 
-#: ../../printerdrake.pm_.c:362
+#: ../../printer/printerdrake.pm_.c:329
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -7799,244 +8251,259 @@ msgid ""
 "select \"Printer\" in the \"Hardware\" section of the Mandrake Control "
 "Center."
 msgstr ""
+"\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\"."
 
-#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:590
-#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
-#, fuzzy
+#: ../../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 "Kasuta automaattuvastust"
+msgstr "Printeri automaattuvastus"
 
-#: ../../printerdrake.pm_.c:421
+#: ../../printer/printerdrake.pm_.c:385
 #, c-format
 msgid ", network printer \"%s\", port %s"
-msgstr ""
+msgstr ", võrguprinter \"%s\", port %s"
 
-#: ../../printerdrake.pm_.c:423
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:387
+#, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "SMB/Windows 95/98/NT"
+msgstr ", printer \"%s\" SMB/Windows serveril \"%s\""
 
-#: ../../printerdrake.pm_.c:429
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:391
+#, c-format
 msgid "Detected %s"
-msgstr "tuvastati %s"
+msgstr "Tuvastati %s"
 
-#: ../../printerdrake.pm_.c:433 ../../printerdrake.pm_.c:464
-#: ../../printerdrake.pm_.c:483
+#: ../../printer/printerdrake.pm_.c:395 ../../printer/printerdrake.pm_.c:423
+#: ../../printer/printerdrake.pm_.c:440
 #, c-format
 msgid "Printer on parallel port \\/*%s"
-msgstr ""
+msgstr "Printer paralleelpordis \\/*%s"
 
-#: ../../printerdrake.pm_.c:435 ../../printerdrake.pm_.c:466
-#: ../../printerdrake.pm_.c:488
+#: ../../printer/printerdrake.pm_.c:397 ../../printer/printerdrake.pm_.c:425
+#: ../../printer/printerdrake.pm_.c:443
 #, c-format
 msgid "USB printer \\/*%s"
-msgstr ""
+msgstr "USB printer \\/*%s"
 
-#: ../../printerdrake.pm_.c:437
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:399
+#, c-format
 msgid "Network printer \"%s\", port %s"
-msgstr "V�rguprinter (TCP/Socket)"
+msgstr "Võrguprinter \"%s\", port %s"
 
-#: ../../printerdrake.pm_.c:439
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:401
+#, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
-msgstr "SMB/Windows 95/98/NT"
+msgstr "Printer \"%s\" SMB/Windows serveril \"%s\""
 
-#: ../../printerdrake.pm_.c:575 ../../printerdrake.pm_.c:600
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:525 ../../printer/printerdrake.pm_.c:547
 msgid "Local Printer"
 msgstr "Kohalik printer"
 
-#: ../../printerdrake.pm_.c:576
+#: ../../printer/printerdrake.pm_.c:526
 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, ...)."
 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...)"
 
-#: ../../printerdrake.pm_.c:580
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:530
 msgid "You must enter a device or file name!"
-msgstr "Printeri seadme URI"
+msgstr "Seadme- või failinime sisestamine on kohustuslik!"
 
-#: ../../printerdrake.pm_.c:591
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:539
 msgid "No printer found!"
-msgstr "Kohalik printer"
+msgstr "Printerit ei leitud!"
 
-#: ../../printerdrake.pm_.c:601
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:548
 msgid "Available printers"
-msgstr "K�ttesaadavad paketid"
+msgstr "Saadaolevad printerid"
 
-#: ../../printerdrake.pm_.c:605
+#: ../../printer/printerdrake.pm_.c:552
 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"
 msgstr ""
+"Järgmine printer tuvastati automaatselt; kui see ei ole printer, mida "
+"soovite seadistada, kirjutage sisendireale seadmenimi/failinimi"
 
-#: ../../printerdrake.pm_.c:606
+#: ../../printer/printerdrake.pm_.c:553
 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"
 msgstr ""
+"See on loend kõigist automaatselt tuvastatud printeritest. Valige palun "
+"printer, mida soovite seadistada, või kirjutage sisendireale seadmenimi/"
+"failinimi"
 
-#: ../../printerdrake.pm_.c:608
+#: ../../printer/printerdrake.pm_.c:555
 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\"."
 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\"."
 
-#: ../../printerdrake.pm_.c:609
+#: ../../printer/printerdrake.pm_.c:556
 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\"."
 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\"."
 
-#: ../../printerdrake.pm_.c:611
+#: ../../printer/printerdrake.pm_.c:558
 msgid ""
 "Please choose the port where your printer is connected to or enter a device "
 "name/file name in the input line"
 msgstr ""
+"Valige palun port, kuhu printer on ühendatud, või kirjutage sisendireale "
+"seadmenimi/failinimi"
 
-#: ../../printerdrake.pm_.c:612
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:559
 msgid "Please choose the port where your printer is connected to."
-msgstr "Millisesse seerialporti on Teie modem �hendatud?"
+msgstr "Valige palun port, kuhu Teie printer on ühendatud."
 
-#: ../../printerdrake.pm_.c:614
+#: ../../printer/printerdrake.pm_.c:561
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
 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...)"
 
-#: ../../printerdrake.pm_.c:619
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:565
 msgid "You must choose/enter a printer/device!"
-msgstr "Printeri seadme URI"
+msgstr "Printeri/seadme valimine/sisestamine on kohustuslik!"
 
-#: ../../printerdrake.pm_.c:639
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:584
 msgid "Manual configuration"
-msgstr "Seadistused"
+msgstr "Käsitsiseadistamine"
 
-#: ../../printerdrake.pm_.c:693
+#: ../../printer/printerdrake.pm_.c:633
 msgid "Remote lpd Printer Options"
-msgstr "V�rguprinteri s�tted"
+msgstr "Võrguprinteri (lpd) sätted"
 
-#: ../../printerdrake.pm_.c:694
-#, fuzzy
+#: ../../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."
 msgstr ""
-"Et kasutada teise masina lpd printerit, peate sisestama\n"
-"printserveri nime ja prindij�rjekorra nime, mida soovite\n"
-"serveril kasutada."
+"Et kasutada teise masina lpd printerit, peate sisestama printserveri nime ja "
+"serveril kasutatava printeri nime."
 
-#: ../../printerdrake.pm_.c:695
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:635
 msgid "Remote host name"
-msgstr "Printserveri nimi:"
+msgstr "Kaugarvuti nimi"
 
-#: ../../printerdrake.pm_.c:696
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:636
 msgid "Remote printer name"
-msgstr "V�rguprinter"
+msgstr "Võrguprinteri nimi"
 
-#: ../../printerdrake.pm_.c:699
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:639
 msgid "Remote host name missing!"
-msgstr "Printserveri nimi:"
+msgstr "Kaugarvuti nimi puudub!"
 
-#: ../../printerdrake.pm_.c:703
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:643
 msgid "Remote printer name missing!"
-msgstr "Printserveri nimi:"
+msgstr "Võrguprinteri nimi puudub!"
 
-#: ../../printerdrake.pm_.c:727 ../../printerdrake.pm_.c:1244
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:665 ../../printer/printerdrake.pm_.c:1170
+#, c-format
 msgid "Detected model: %s %s"
-msgstr "tuvastati %s"
+msgstr "Tuvastati mudel: %s %s"
 
-#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:742 ../../printer/printerdrake.pm_.c:978
 msgid "Scanning network..."
-msgstr "Testime Teie �hendust..."
+msgstr "Võrgu uurimine..."
 
-#: ../../printerdrake.pm_.c:814 ../../printerdrake.pm_.c:835
+#: ../../printer/printerdrake.pm_.c:751 ../../printer/printerdrake.pm_.c:772
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
-msgstr ""
+msgstr ", printer \"%s\" serveril \"%s\""
 
-#: ../../printerdrake.pm_.c:817 ../../printerdrake.pm_.c:838
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:754 ../../printer/printerdrake.pm_.c:775
+#, c-format
 msgid "Printer \"%s\" on server \"%s\""
-msgstr "Seiskame v�rguliidesed"
+msgstr "Printer \"%s\" serveril \"%s\""
 
-#: ../../printerdrake.pm_.c:858
+#: ../../printer/printerdrake.pm_.c:795
 msgid "SMB (Windows 9x/NT) Printer Options"
-msgstr "SMB (Windows 9x/NT) printeri s�tted"
+msgstr "SMB (Windows 9x/NT) printeri sätted"
 
-#: ../../printerdrake.pm_.c:859
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:796
 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."
 msgstr ""
-"Et printida SMB printerile, peate andma vastava server SMB nimi\n"
-"(NB! See ei pruugi kokku langeda TCP/IP nimega!) ja v�ibolla ka\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"
+"nime ning serveri poolt aktsepteeritud kasutajatunnuse, salasõna ja töögrupi."
 
-#: ../../printerdrake.pm_.c:860
+#: ../../printer/printerdrake.pm_.c:797
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
 "and then add user name, password, and/or workgroup if needed."
 msgstr ""
+" Kui soovitud printer tuvastati automaatselt, valige see loendist ning "
+"lisage siis vajadusel kasutajatunnus, parool ja/või töögrupp."
 
-#: ../../printerdrake.pm_.c:861
+#: ../../printer/printerdrake.pm_.c:799
 msgid "SMB server host"
 msgstr "SMB serveri nimi"
 
-#: ../../printerdrake.pm_.c:862
+#: ../../printer/printerdrake.pm_.c:800
 msgid "SMB server IP"
 msgstr "SMB serveri IP"
 
-#: ../../printerdrake.pm_.c:863
+#: ../../printer/printerdrake.pm_.c:801
 msgid "Share name"
 msgstr "Jagatav printer"
 
-#: ../../printerdrake.pm_.c:866
+#: ../../printer/printerdrake.pm_.c:804
 msgid "Workgroup"
-msgstr "T��grupp"
+msgstr "Töögrupp"
 
-#: ../../printerdrake.pm_.c:868
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:806
 msgid "Auto-detected"
-msgstr "Kasuta automaattuvastust"
+msgstr "Automaatselt tuvastatud"
 
-#: ../../printerdrake.pm_.c:879
+#: ../../printer/printerdrake.pm_.c:816
 msgid "Either the server name or the server's IP must be given!"
-msgstr ""
+msgstr "Andma peab kas serveri nime või serveri IP!"
 
-#: ../../printerdrake.pm_.c:883
+#: ../../printer/printerdrake.pm_.c:820
 msgid "Samba share name missing!"
-msgstr ""
+msgstr "Samba jagatava printeri nimi puudub!"
 
-#: ../../printerdrake.pm_.c:889
+#: ../../printer/printerdrake.pm_.c:826
 msgid "SECURITY WARNING!"
-msgstr ""
+msgstr "TURVAHOIATUS!"
 
-#: ../../printerdrake.pm_.c:890
+#: ../../printer/printerdrake.pm_.c:827
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -8059,8 +8526,26 @@ msgid ""
 "type in Printerdrake.\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"
+"\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"
 
-#: ../../printerdrake.pm_.c:900
+#: ../../printer/printerdrake.pm_.c:837
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -8068,134 +8553,148 @@ msgid ""
 "type in Printerdrake.\n"
 "\n"
 msgstr ""
+"Seadistage oma Windows-server nii, et printer oleks kättesaadav IPP "
+"protokolliga, ning seadistage trükkimine sellelt masinalt \"%s\" "
+"ühendustüübiga Printerdrakes.\n"
+"\n"
 
-#: ../../printerdrake.pm_.c:903
+#: ../../printer/printerdrake.pm_.c:840
 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?"
 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?"
 
-#: ../../printerdrake.pm_.c:975
+#: ../../printer/printerdrake.pm_.c:911
 msgid "NetWare Printer Options"
-msgstr "NetWare printeri s�tted"
+msgstr "NetWare printeri sätted"
 
-#: ../../printerdrake.pm_.c:976
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:912
 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."
 msgstr ""
-"Et kasutada NetWare printerit, peate sisestama NetWare printserveri\n"
-"nime (NB! See v�ib olla erinev tema TCP/IP nimest!) samuti nagu ka\n"
-"prindij�rjekorra nime serveril ning kasutajatunnuse ja salas�na"
+"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."
 
-#: ../../printerdrake.pm_.c:977
+#: ../../printer/printerdrake.pm_.c:913
 msgid "Printer Server"
-msgstr "Printserver:"
+msgstr "Printserver"
 
-#: ../../printerdrake.pm_.c:978
+#: ../../printer/printerdrake.pm_.c:914
 msgid "Print Queue Name"
-msgstr "Prindij�rjekorra nimi:"
+msgstr "Trükijärjekorra nimi"
 
-#: ../../printerdrake.pm_.c:983
+#: ../../printer/printerdrake.pm_.c:919
 msgid "NCP server name missing!"
-msgstr ""
+msgstr "NCP serveri nimi puudub!"
 
-#: ../../printerdrake.pm_.c:987
+#: ../../printer/printerdrake.pm_.c:923
 msgid "NCP queue name missing!"
-msgstr ""
+msgstr "NCP järjekorra nimi puudub!"
 
-#: ../../printerdrake.pm_.c:1054 ../../printerdrake.pm_.c:1074
+#: ../../printer/printerdrake.pm_.c:987 ../../printer/printerdrake.pm_.c:1007
 #, c-format
 msgid ", host \"%s\", port %s"
-msgstr ""
+msgstr ", masin \"%s\", port %s"
 
-#: ../../printerdrake.pm_.c:1057 ../../printerdrake.pm_.c:1077
+#: ../../printer/printerdrake.pm_.c:990 ../../printer/printerdrake.pm_.c:1010
 #, c-format
 msgid "Host \"%s\", port %s"
-msgstr ""
+msgstr "Masin \"%s\", port %s"
 
-#: ../../printerdrake.pm_.c:1097
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1030
 msgid "TCP/Socket Printer Options"
-msgstr "Pistikprinteri s�tted"
+msgstr "TCP/Socket printeri sätted"
 
-#: ../../printerdrake.pm_.c:1099
+#: ../../printer/printerdrake.pm_.c:1032
 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."
 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)."
 
-#: ../../printerdrake.pm_.c:1100
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1033
 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."
 msgstr ""
-"Sisestage palun printeri masinanimi ja v�imaluse\n"
-"korral pordi number"
+"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."
 
-#: ../../printerdrake.pm_.c:1105
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1037
 msgid "Printer host name or IP missing!"
-msgstr "Printeri nimi"
+msgstr "Printeri masinanimi või IP puudub!"
 
-#: ../../printerdrake.pm_.c:1127
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1059
 msgid "Printer host name or IP"
-msgstr "Printeri nimi"
+msgstr "Printeri masinanimi või IP"
 
-#: ../../printerdrake.pm_.c:1177 ../../printerdrake.pm_.c:1179
+#: ../../printer/printerdrake.pm_.c:1107 ../../printer/printerdrake.pm_.c:1109
 msgid "Printer Device URI"
 msgstr "Printeri seadme URI"
 
-#: ../../printerdrake.pm_.c:1178
+#: ../../printer/printerdrake.pm_.c:1108
 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 ""
+"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."
 
-#: ../../printerdrake.pm_.c:1193
+#: ../../printer/printerdrake.pm_.c:1123
 msgid "A valid URI must be entered!"
-msgstr ""
+msgstr "Sisestama peab sobiva URI!"
 
-#: ../../printerdrake.pm_.c:1560
+#: ../../printer/printerdrake.pm_.c:1463
 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."
 msgstr ""
+"Iga printer vajab nime (näiteks \"printer\"). Kirjelduse ja asukoha välja ei "
+"ole vaja tingimata täita, need on vaid kommentaarid kasutajatele."
 
-#: ../../printerdrake.pm_.c:1561
+#: ../../printer/printerdrake.pm_.c:1464
 msgid "Name of printer"
 msgstr "Printeri nimi"
 
-#: ../../printerdrake.pm_.c:1563
+#: ../../printer/printerdrake.pm_.c:1465 ../../standalone/harddrake2_.c:38
+msgid "Description"
+msgstr "Kirjeldus"
+
+#: ../../printer/printerdrake.pm_.c:1466
 msgid "Location"
 msgstr "Asukoht"
 
-#: ../../printerdrake.pm_.c:1575 ../../printerdrake.pm_.c:1697
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1478 ../../printer/printerdrake.pm_.c:1599
 msgid "Reading printer database..."
-msgstr "Loetakse CUPS juhtprogramme"
+msgstr "Printeri andmebaasi lugemine..."
 
-#: ../../printerdrake.pm_.c:1579
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1482
 msgid "Preparing printer database..."
-msgstr "Loetakse CUPS juhtprogramme"
+msgstr "Printeri andmebaasi ettevalmistamine..."
 
-#: ../../printerdrake.pm_.c:1676
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1578
 msgid "Your printer model"
-msgstr "V�rguprinter"
+msgstr "Teie printeri mudel"
 
-#: ../../printerdrake.pm_.c:1677
+#: ../../printer/printerdrake.pm_.c:1579
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -8209,29 +8708,36 @@ msgid ""
 "\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"
+"\n"
+"Teie printeri puhul leidis Printerdrake:\n"
+"\n"
+"%s"
 
-#: ../../printerdrake.pm_.c:1682 ../../printerdrake.pm_.c:1685
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1584 ../../printer/printerdrake.pm_.c:1587
 msgid "The model is correct"
-msgstr "Kas see on sobiv?"
+msgstr "Mudel õige"
 
-#: ../../printerdrake.pm_.c:1683 ../../printerdrake.pm_.c:1684
-#: ../../printerdrake.pm_.c:1687
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1585 ../../printer/printerdrake.pm_.c:1586
+#: ../../printer/printerdrake.pm_.c:1589
 msgid "Select model manually"
-msgstr "V�rguprinter"
+msgstr "Mudeli valik käsitsi"
 
-#: ../../printerdrake.pm_.c:1704
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1606
 msgid "Printer model selection"
-msgstr "Printeri �hendusviis"
+msgstr "Printeri mudeli valik"
 
-#: ../../printerdrake.pm_.c:1705
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1607
 msgid "Which printer model do you have?"
-msgstr "Mis t��pi printer see on?"
+msgstr "Milline on Teie printeri mudel?"
 
-#: ../../printerdrake.pm_.c:1706
+#: ../../printer/printerdrake.pm_.c:1608
 msgid ""
 "\n"
 "\n"
@@ -8239,19 +8745,25 @@ msgid ""
 "model correctly. Search the correct model in the list when the cursor is "
 "standing on a wrong model or on \"Raw printer\"."
 msgstr ""
+"\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."
 
-#: ../../printerdrake.pm_.c:1709
+#: ../../printer/printerdrake.pm_.c:1611
 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."
 
-#: ../../printerdrake.pm_.c:1786
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1697
 msgid "OKI winprinter configuration"
-msgstr "Interneti s�tted"
+msgstr "OKI winprinteri sätted"
 
-#: ../../printerdrake.pm_.c:1787
+#: ../../printer/printerdrake.pm_.c:1698
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
 "use a very special communication protocol and therefore they work only when "
@@ -8260,21 +8772,30 @@ msgid ""
 "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."
 
-#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1857
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:1718 ../../printer/printerdrake.pm_.c:1745
 msgid "Lexmark inkjet configuration"
-msgstr "Interneti s�tted"
+msgstr "Lexmark inkjeti sätted"
 
-#: ../../printerdrake.pm_.c:1831
+#: ../../printer/printerdrake.pm_.c:1719
 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."
 
-#: ../../printerdrake.pm_.c:1858
+#: ../../printer/printerdrake.pm_.c:1746
 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."
@@ -8285,12 +8806,21 @@ msgid ""
 "agreement. Then print printhead alignment pages with \"lexmarkmaintain\" and "
 "adjust the head alignment settings with this program."
 msgstr ""
-
-#: ../../printerdrake.pm_.c:1861
+"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_.c:1749
 msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
-msgstr ""
+msgstr "GDI laserprinter Zenographics ZJ-Stream vorminguga"
 
-#: ../../printerdrake.pm_.c:1862
+#: ../../printer/printerdrake.pm_.c:1750
 msgid ""
 "Your printer belongs to the group of GDI laser printers (winprinters) sold "
 "by different manufacturers which uses the Zenographics ZJ-stream raster "
@@ -8312,8 +8842,25 @@ msgid ""
 "The first command can be given by any normal user, the second must be given "
 "as root. After having done so you can print normally.\n"
 msgstr ""
+"Teie printer kuulub GDI laserprinterite (winprinterid) rühma. Neid müüvad "
+"erinevad tootjad, kes kasutavad andmete saatmiseks printerile Zenographicsi "
+"ZJ-stream rasteri vormingut. Nende printerite draiver on veel väga "
+"algusjärgus ega pruugi seetõttu sugugi alati töötada. Väga usutav on see, et "
+"printer töötab ainult siis, kui valite paberi suuruseks A4.\n"
+"\n"
+"Mõned sellised printerid, näiteks HP LaserJet 1000, mille jaoks see draiver "
+"algselt loodigi, vajavad pärast sisselülitamist tootjapoolse tarkvara "
+"paigaldamist. HP LaserJet 1000 puhul tuleb teil otsida printeri Windowsi "
+"draiveri CD-lt või kõvaketta Windowsi partitsioonilt faili \"sihp1000.img\" "
+"ning laadida see printerile ühega järgnevatest käskudest:\n"
+"\n"
+"     lpr -o raw sihp1000.img\n"
+"     cat sihp1000.img > /dev/usb/lp0\n"
+"\n"
+"Esimese käsu võib anda suvaline kasutaja, teise andmiseks on vaja olla "
+"administraator. Pärast seda võite normaalselt trükkida.\n"
 
-#: ../../printerdrake.pm_.c:2085
+#: ../../printer/printerdrake.pm_.c:1972
 msgid ""
 "Printer default settings\n"
 "\n"
@@ -8322,82 +8869,88 @@ msgid ""
 "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."
 
-#: ../../printerdrake.pm_.c:2094
+#: ../../printer/printerdrake.pm_.c:1981
 #, c-format
 msgid "Option %s must be an integer number!"
-msgstr ""
+msgstr "Võti %s peab olema täisarv!"
 
-#: ../../printerdrake.pm_.c:2098
+#: ../../printer/printerdrake.pm_.c:1985
 #, c-format
 msgid "Option %s must be a number!"
-msgstr ""
+msgstr "Võti %s peab olema arv!"
 
-#: ../../printerdrake.pm_.c:2103
+#: ../../printer/printerdrake.pm_.c:1989
 #, c-format
 msgid "Option %s out of range!"
-msgstr ""
+msgstr "Võti %s väljub piiridest!"
 
-#: ../../printerdrake.pm_.c:2142
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:2028
+#, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
 "as the default printer?"
-msgstr "Kas soovite seadistusi proovida?"
+msgstr ""
+"Kas soovite määrata selle printeri (\"%s\")\n"
+"vaikeprinteriks?"
 
-#: ../../printerdrake.pm_.c:2165
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2051
 msgid "Test pages"
-msgstr "Proovin porte"
+msgstr "Testleheküljed"
 
-#: ../../printerdrake.pm_.c:2166
+#: ../../printer/printerdrake.pm_.c:2052
 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."
 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."
 
-#: ../../printerdrake.pm_.c:2170
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2056
 msgid "No test pages"
-msgstr "Jah, tr�ki m�lemad testlehek�ljed"
+msgstr "Ära trüki"
 
-#: ../../printerdrake.pm_.c:2171
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2057
 msgid "Print"
-msgstr "Printer"
+msgstr "Trüki"
 
-#: ../../printerdrake.pm_.c:2228
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2114
 msgid "Standard test page"
-msgstr "Standardt��riistad"
+msgstr "Tavaline testlehekülg"
 
-#: ../../printerdrake.pm_.c:2231
+#: ../../printer/printerdrake.pm_.c:2117
 msgid "Alternative test page (Letter)"
-msgstr ""
+msgstr "Alternatiivne testlehekülg (Letter)"
 
-#: ../../printerdrake.pm_.c:2234
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2120
 msgid "Alternative test page (A4)"
-msgstr "Tr�kitakse testlehek�lg(i)..."
+msgstr "Alternatiivne testlehekülg (A4)"
 
-#: ../../printerdrake.pm_.c:2236
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2122
 msgid "Photo test page"
-msgstr "Tr�kitakse testlehek�lg(i)..."
+msgstr "Fototestlehekülg"
 
-#: ../../printerdrake.pm_.c:2240
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2126
 msgid "Do not print any test page"
-msgstr "Tr�kitakse testlehek�lg(i)..."
+msgstr "Ära trüki ühtegi testlehekülge"
 
-#: ../../printerdrake.pm_.c:2249 ../../printerdrake.pm_.c:2402
+#: ../../printer/printerdrake.pm_.c:2134 ../../printer/printerdrake.pm_.c:2285
 msgid "Printing test page(s)..."
-msgstr "Tr�kitakse testlehek�lg(i)..."
+msgstr "Trükitakse testlehekülg(i)..."
 
-#: ../../printerdrake.pm_.c:2274
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:2159
+#, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
@@ -8405,36 +8958,29 @@ msgid ""
 "%s\n"
 "\n"
 msgstr ""
-"Testlehek�lg on saadetus tr�kideemonile.\n"
-"N��d v�ib minna natuke aega.\n"
+"Testlehekülg on saadetud printerile.\n"
+"Nüüd võib minna natuke aega, enne kui printer alustab.\n"
 "Staatus:\n"
 "%s\n"
 "\n"
-"Kas tulemust on juba n�ha?"
 
-#: ../../printerdrake.pm_.c:2278
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2163
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
 msgstr ""
-"Testlehek�lg on saadetud tr�kideemonile.\n"
-"N��d v�ib minna natuke aega.\n"
-"Staatus:\n"
-"%s\n"
-"\n"
-"Kas tulemust on juba n�ha?"
+"Testlehekülg on saadetud printerile.\n"
+"Nüüd võib minna natuke aega, enne kui printer alustab.\n"
 
-#: ../../printerdrake.pm_.c:2285
+#: ../../printer/printerdrake.pm_.c:2170
 msgid "Did it work properly?"
-msgstr ""
+msgstr "Kas kõik oli korras?"
 
-#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3473
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2190 ../../printer/printerdrake.pm_.c:3229
 msgid "Raw printer"
-msgstr "Printerit ei ole"
+msgstr "Toorprinter"
 
-#: ../../printerdrake.pm_.c:2333
+#: ../../printer/printerdrake.pm_.c:2216
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -8442,16 +8988,23 @@ msgid ""
 "\"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"
 
-#: ../../printerdrake.pm_.c:2335
+#: ../../printer/printerdrake.pm_.c:2218
 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"
 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"
 
-#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2355
-#: ../../printerdrake.pm_.c:2365
+#: ../../printer/printerdrake.pm_.c:2221 ../../printer/printerdrake.pm_.c:2238
+#: ../../printer/printerdrake.pm_.c:2248
 #, c-format
 msgid ""
 "\n"
@@ -8459,50 +9012,67 @@ msgid ""
 "particular printing job. Simply add the desired settings to the command "
 "line, e. g. \"%s <file>\". "
 msgstr ""
+"\n"
+"Käsk \"%s\" võimaldab muuta ka konkreetse trükkimistöö valikuid. Selleks "
+"lisage vaid soovitud valik käsureale, nt \"%s <fail>\". "
 
-#: ../../printerdrake.pm_.c:2341 ../../printerdrake.pm_.c:2381
+#: ../../printer/printerdrake.pm_.c:2224 ../../printer/printerdrake.pm_.c:2264
 #, 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"
 "\n"
 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"
+"\n"
 
-#: ../../printerdrake.pm_.c:2345
+#: ../../printer/printerdrake.pm_.c:2228
 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"
 
-#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2360
+#: ../../printer/printerdrake.pm_.c:2233 ../../printer/printerdrake.pm_.c:2243
 #, 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"
 
-#: ../../printerdrake.pm_.c:2352 ../../printerdrake.pm_.c:2362
-#: ../../printerdrake.pm_.c:2372
+#: ../../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"
 
-#: ../../printerdrake.pm_.c:2357 ../../printerdrake.pm_.c:2367
+#: ../../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\"."
 
-#: ../../printerdrake.pm_.c:2370
+#: ../../printer/printerdrake.pm_.c:2253
 #, 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"
 
-#: ../../printerdrake.pm_.c:2374
+#: ../../printer/printerdrake.pm_.c:2257
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
 "handling printing jobs.\n"
@@ -8511,8 +9081,13 @@ msgid ""
 "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"
 
-#: ../../printerdrake.pm_.c:2378
+#: ../../printer/printerdrake.pm_.c:2261
 #, c-format
 msgid ""
 "\n"
@@ -8520,43 +9095,45 @@ msgid ""
 "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"
 
-#: ../../printerdrake.pm_.c:2388
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:2271
+#, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
-msgstr "Seiskame v�rguliidesed"
+msgstr "Trükkimine/skaneerimine/fotokaardid seadmel \"%s\""
 
-#: ../../printerdrake.pm_.c:2389
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:2272
+#, c-format
 msgid "Printing/Scanning on \"%s\""
-msgstr "Seiskame v�rguliidesed"
+msgstr "Trükkimine/skaneerimine seadmel \"%s\""
 
-#: ../../printerdrake.pm_.c:2391
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:2274
+#, c-format
 msgid "Printing/Photo Card Access on \"%s\""
-msgstr "Seiskame v�rguliidesed"
+msgstr "Trükkimine/fotokaartide ligipääs seadmel \"%s\""
 
-#: ../../printerdrake.pm_.c:2392
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:2275
+#, c-format
 msgid "Printing on the printer \"%s\""
-msgstr "Seiskame v�rguliidesed"
-
-#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
-#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
-#: ../../printerdrake.pm_.c:3457 ../../standalone/drakTermServ_.c:248
-#: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
-#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
-#: ../../standalone/drakfont_.c:1014
-#, fuzzy
+msgstr "Trükkimine printeril \"%s\""
+
+#: ../../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 "Hiir"
+msgstr "Sulge"
 
-#: ../../printerdrake.pm_.c:2398
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2281
 msgid "Print option list"
-msgstr "Otse �hendatud printeri s�tted"
+msgstr "Trükkimisvalikute loend"
 
-#: ../../printerdrake.pm_.c:2418
+#: ../../printer/printerdrake.pm_.c:2301
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -8569,8 +9146,16 @@ msgid ""
 "\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!"
 
-#: ../../printerdrake.pm_.c:2439
+#: ../../printer/printerdrake.pm_.c:2322
 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 "
@@ -8582,20 +9167,27 @@ msgid ""
 "can switch between drive letters with the field at the upper-right corners "
 "of the file lists."
 msgstr ""
-
-#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2927
-#: ../../printerdrake.pm_.c:3227
-#, fuzzy
+"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:2344 ../../printer/printerdrake.pm_.c:2702
+#: ../../printer/printerdrake.pm_.c:2990
 msgid "Reading printer data..."
-msgstr "Loetakse CUPS juhtprogramme"
+msgstr "Printeri andmete lugemine..."
 
-#: ../../printerdrake.pm_.c:2481 ../../printerdrake.pm_.c:2509
-#: ../../printerdrake.pm_.c:2544
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2364 ../../printer/printerdrake.pm_.c:2391
+#: ../../printer/printerdrake.pm_.c:2426
 msgid "Transfer printer configuration"
-msgstr "Interneti s�tted"
+msgstr "Printeri sätete ülekandmine"
 
-#: ../../printerdrake.pm_.c:2482
+#: ../../printer/printerdrake.pm_.c:2365
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -8604,128 +9196,148 @@ msgid ""
 "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"
 
-#: ../../printerdrake.pm_.c:2485
+#: ../../printer/printerdrake.pm_.c:2368
 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"
 
-#: ../../printerdrake.pm_.c:2487
+#: ../../printer/printerdrake.pm_.c:2370
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
 msgstr ""
+"PDQ toetab ainult kohalikke printereid, võrguprintereid (LPD) ning Socket/"
+"TCP printereid.\n"
 
-#: ../../printerdrake.pm_.c:2489
+#: ../../printer/printerdrake.pm_.c:2372
 msgid "LPD and LPRng do not support IPP printers.\n"
-msgstr ""
+msgstr "LPD ja LPRng ei toeta IPP printereid.\n"
 
-#: ../../printerdrake.pm_.c:2491
+#: ../../printer/printerdrake.pm_.c:2374
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
 msgstr ""
+"Lisaks sellele ei saa üle kanda järjekordi, mis on loodud käesoleva "
+"programmi või \"foomatic-configure\" poolt."
 
-#: ../../printerdrake.pm_.c:2492
+#: ../../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."
 
-#: ../../printerdrake.pm_.c:2493
+#: ../../printer/printerdrake.pm_.c:2376
 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\"."
 
-#: ../../printerdrake.pm_.c:2496
+#: ../../printer/printerdrake.pm_.c:2379
 msgid "Do not transfer printers"
-msgstr ""
+msgstr "Ära kanna printereid üle"
 
-#: ../../printerdrake.pm_.c:2497 ../../printerdrake.pm_.c:2514
+#: ../../printer/printerdrake.pm_.c:2380 ../../printer/printerdrake.pm_.c:2396
 msgid "Transfer"
-msgstr ""
+msgstr "Kanna üle"
 
-#: ../../printerdrake.pm_.c:2510
+#: ../../printer/printerdrake.pm_.c:2392
 #, 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."
 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."
 
-#: ../../printerdrake.pm_.c:2518
+#: ../../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"
+msgstr "Printeri nimi tohib sisaldada vaid tähti, numbreid ja alakriipsu"
 
-#: ../../printerdrake.pm_.c:2523
+#: ../../printer/printerdrake.pm_.c:2405
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
 "do you really want to overwrite its configuration?"
 msgstr ""
+"Printer \"%s\" on juba olemas,\n"
+"kas tõesti kirjutada selle sätted üle?"
 
-#: ../../printerdrake.pm_.c:2531
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2413
 msgid "New printer name"
-msgstr "Printerit ei ole"
+msgstr "Uus printeri nimi"
 
-#: ../../printerdrake.pm_.c:2534
+#: ../../printer/printerdrake.pm_.c:2416
 #, c-format
 msgid "Transferring %s..."
-msgstr ""
+msgstr "%s ülekandmine..."
 
-#: ../../printerdrake.pm_.c:2545
+#: ../../printer/printerdrake.pm_.c:2427
 #, 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?"
 
-#: ../../printerdrake.pm_.c:2555
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2437
 msgid "Refreshing printer data..."
-msgstr "Loetakse CUPS juhtprogramme"
+msgstr "Printeri andmete värskendamine..."
 
-#: ../../printerdrake.pm_.c:2563 ../../printerdrake.pm_.c:2638
-#: ../../printerdrake.pm_.c:2650
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2445 ../../printer/printerdrake.pm_.c:2516
+#: ../../printer/printerdrake.pm_.c:2528
 msgid "Configuration of a remote printer"
-msgstr "Sea printer"
+msgstr "Võrguprinteri seadistamine"
 
-#: ../../printerdrake.pm_.c:2564
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2446
 msgid "Starting network..."
-msgstr "Testime Teie �hendust..."
+msgstr "Võrgu käivitamine..."
 
-#: ../../printerdrake.pm_.c:2599 ../../printerdrake.pm_.c:2603
-#: ../../printerdrake.pm_.c:2605
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2479 ../../printer/printerdrake.pm_.c:2483
+#: ../../printer/printerdrake.pm_.c:2485
 msgid "Configure the network now"
-msgstr "V�rgus�tted"
+msgstr "Seadista võrk otsekohe"
 
-#: ../../printerdrake.pm_.c:2600
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2480
 msgid "Network functionality not configured"
-msgstr "Monitor ei ole seadistatud"
+msgstr "Võrguvalmidus on seadistamata"
 
-#: ../../printerdrake.pm_.c:2601
+#: ../../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?"
 
-#: ../../printerdrake.pm_.c:2604
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2484
 msgid "Go on without configuring the network"
-msgstr "V�rguseadistused"
+msgstr "Jätkama ilma võrku seadistamata"
 
-#: ../../printerdrake.pm_.c:2640
+#: ../../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 "
@@ -8734,35 +9346,39 @@ msgid ""
 "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\". "
 
-#: ../../printerdrake.pm_.c:2641
+#: ../../printer/printerdrake.pm_.c:2519
 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."
 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."
 
-#: ../../printerdrake.pm_.c:2651
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2529
 msgid "Restarting printing system..."
-msgstr "Millist printimiss�steemi soovite kasutada?"
+msgstr "Trükkimissüsteemi uuestikäivitamine..."
 
-#: ../../printerdrake.pm_.c:2689
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2568
 msgid "high"
-msgstr "K�rge"
+msgstr "kõrge"
 
-#: ../../printerdrake.pm_.c:2689
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2568
 msgid "paranoid"
-msgstr "Paranoiline"
+msgstr "paranoiline"
 
-#: ../../printerdrake.pm_.c:2690
+#: ../../printer/printerdrake.pm_.c:2569
 #, c-format
 msgid "Installing a printing system in the %s security level"
-msgstr ""
+msgstr "Trükkimissüsteemi paigaldamine turvatasemel '%s'"
 
-#: ../../printerdrake.pm_.c:2691
+#: ../../printer/printerdrake.pm_.c:2570
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -8776,13 +9392,22 @@ msgid ""
 "\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"
+"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?"
 
-#: ../../printerdrake.pm_.c:2723
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2604
 msgid "Starting the printing system at boot time"
-msgstr "Millist printimiss�steemi soovite kasutada?"
+msgstr "Trükkimissüsteem käivitatakse alglaadimisel"
 
-#: ../../printerdrake.pm_.c:2724
+#: ../../printer/printerdrake.pm_.c:2605
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -8795,318 +9420,238 @@ msgid ""
 "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"
+"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"
+"Kas soovite trükkimissüsteemi automaatkäivituse taas sisse lülitada?"
 
-#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2793
-#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2874
-#: ../../printerdrake.pm_.c:2995
+#: ../../printer/printerdrake.pm_.c:2625 ../../printer/printerdrake.pm_.c:2765
 msgid "Checking installed software..."
-msgstr ""
+msgstr "Paigaldatud tarkvara kontroll..."
 
-#: ../../printerdrake.pm_.c:2798
-msgid "Removing LPRng..."
-msgstr ""
+#: ../../printer/printerdrake.pm_.c:2630
+#, c-format
+msgid "Removing %s ..."
+msgstr "%s eemaldamine..."
 
-#: ../../printerdrake.pm_.c:2837
-msgid "Removing LPD..."
-msgstr ""
+#: ../../printer/printerdrake.pm_.c:2636
+#, c-format
+msgid "Installing %s ..."
+msgstr "%s paigaldamine..."
 
-#: ../../printerdrake.pm_.c:2910
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2685
 msgid "Select Printer Spooler"
-msgstr "Vali printeri �hendusviis"
+msgstr "Printeri spuuleri valik"
 
-#: ../../printerdrake.pm_.c:2911
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2686
 msgid "Which printing system (spooler) do you want to use?"
-msgstr "Millist printimiss�steemi soovite kasutada?"
+msgstr "Millist trükkimissüsteemi (spuulerit) soovite kasutada?"
 
-#: ../../printerdrake.pm_.c:2947
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:2720
+#, c-format
 msgid "Configuring printer \"%s\"..."
-msgstr "Printeri s�tted"
+msgstr "Printeri \"%s\" seadistamine..."
 
-#: ../../printerdrake.pm_.c:2961
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2731
 msgid "Installing Foomatic..."
-msgstr "Paketi %s installimine"
+msgstr "Foomaticu paigaldamine..."
 
-#: ../../printerdrake.pm_.c:3031 ../../printerdrake.pm_.c:3072
-#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3547
+#: ../../printer/printerdrake.pm_.c:2800 ../../printer/printerdrake.pm_.c:2838
+#: ../../printer/printerdrake.pm_.c:3230 ../../printer/printerdrake.pm_.c:3300
 msgid "Printer options"
-msgstr "Otse �hendatud printeri s�tted"
+msgstr "Printeri valikud"
 
-#: ../../printerdrake.pm_.c:3041
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2810
 msgid "Preparing Printerdrake..."
-msgstr "Loetakse CUPS juhtprogramme"
+msgstr "Printerdrake ettevalmistamine..."
 
-#: ../../printerdrake.pm_.c:3059 ../../printerdrake.pm_.c:3637
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2825 ../../printer/printerdrake.pm_.c:3369
 msgid "Configuring applications..."
-msgstr "Printeri s�tted"
+msgstr "Rakenduste seadistamine..."
 
-#: ../../printerdrake.pm_.c:3079
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2845
 msgid "Would you like to configure printing?"
-msgstr "Kas soovite printerit seadistada?"
+msgstr "Kas soovite trükkimist seadistada?"
 
-#: ../../printerdrake.pm_.c:3091
+#: ../../printer/printerdrake.pm_.c:2857
 msgid "Printing system: "
-msgstr ""
+msgstr "Trükkimissüsteem: "
 
-#: ../../printerdrake.pm_.c:3151
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2915
 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 ""
-"Kirjeldatud on j�rgnevad prindij�rjekorrad.\n"
-"Te v�ite neid lisada ning olemasolevaid muuta."
+"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."
 
-#: ../../printerdrake.pm_.c:3152
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2916
 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."
 msgstr ""
-"Kirjeldatud on j�rgnevad prindij�rjekorrad.\n"
-"Te v�ite neid lisada ning olemasolevaid muuta."
+"Seadistatud on järgmised printerid. Topeltklõps printeril võimaldab muuta "
+"selle seadistusi, teha see vaikeprinteriks või vaadata selle infot."
 
-#: ../../printerdrake.pm_.c:3179
+#: ../../printer/printerdrake.pm_.c:2942
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
+"Värskenda printeriloendit (näitamaks kõiki saadaolevaid CUPS printserveri "
+"printereid)"
 
-#: ../../printerdrake.pm_.c:3197
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:2960
 msgid "Change the printing system"
-msgstr "V�rgus�tted"
+msgstr "Trükkimissüsteemi muutmine"
 
-#: ../../printerdrake.pm_.c:3202 ../../standalone/drakconnect_.c:277
+#: ../../printer/printerdrake.pm_.c:2965 ../../standalone/drakconnect_.c:274
 msgid "Normal Mode"
 msgstr "Tavakasutus"
 
-#: ../../printerdrake.pm_.c:3367 ../../printerdrake.pm_.c:3417
-#: ../../printerdrake.pm_.c:3630
-#, fuzzy
+#: ../../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 seadistusi proovida?"
+msgstr "Kas soovite seadistada mõne muu printeri?"
 
-#: ../../printerdrake.pm_.c:3452
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:3211
 msgid "Modify printer configuration"
-msgstr "Interneti s�tted"
+msgstr "Printeri seadistuste muutmine"
 
-#: ../../printerdrake.pm_.c:3454
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:3213
+#, c-format
 msgid ""
 "Printer %s\n"
 "What do you want to modify on this printer?"
-msgstr "Kas soovite seadistusi proovida?"
+msgstr ""
+"Printer %s\n"
+"Mida soovite muuta?"
 
-#: ../../printerdrake.pm_.c:3458
+#: ../../printer/printerdrake.pm_.c:3217
 msgid "Do it!"
-msgstr ""
+msgstr "Nüüd!"
 
-#: ../../printerdrake.pm_.c:3463 ../../printerdrake.pm_.c:3518
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:3222 ../../printer/printerdrake.pm_.c:3271
 msgid "Printer connection type"
-msgstr "Interneti�henduse jagamine"
+msgstr "Printeri ühendusviis"
 
-#: ../../printerdrake.pm_.c:3464 ../../printerdrake.pm_.c:3522
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:3223 ../../printer/printerdrake.pm_.c:3275
 msgid "Printer name, description, location"
-msgstr "Printeri �hendusviis"
+msgstr "Printeri nimi, kirjeldus, asukoht"
 
-#: ../../printerdrake.pm_.c:3466 ../../printerdrake.pm_.c:3540
+#: ../../printer/printerdrake.pm_.c:3225 ../../printer/printerdrake.pm_.c:3293
 msgid "Printer manufacturer, model, driver"
-msgstr ""
+msgstr "Printeri tootja, mudel, draiver"
 
-#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3541
+#: ../../printer/printerdrake.pm_.c:3226 ../../printer/printerdrake.pm_.c:3294
 msgid "Printer manufacturer, model"
-msgstr ""
+msgstr "Printeri tootja, mudel"
 
-#: ../../printerdrake.pm_.c:3476 ../../printerdrake.pm_.c:3551
+#: ../../printer/printerdrake.pm_.c:3232 ../../printer/printerdrake.pm_.c:3304
 msgid "Set this printer as the default"
-msgstr ""
+msgstr "Määra vaikeprinteriks"
 
-#: ../../printerdrake.pm_.c:3478 ../../printerdrake.pm_.c:3556
+#: ../../printer/printerdrake.pm_.c:3234 ../../printer/printerdrake.pm_.c:3309
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgstr "Lisa printer StarOffice/OpenOffice.org/GIMP-ile"
 
-#: ../../printerdrake.pm_.c:3479 ../../printerdrake.pm_.c:3565
+#: ../../printer/printerdrake.pm_.c:3235 ../../printer/printerdrake.pm_.c:3314
 msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgstr "Eemalda StarOffice/OpenOffice.org/GIMP-ilt"
 
-#: ../../printerdrake.pm_.c:3480 ../../printerdrake.pm_.c:3574
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:3236 ../../printer/printerdrake.pm_.c:3319
 msgid "Print test pages"
-msgstr "Tr�kitakse testlehek�lg(i)..."
+msgstr "Trüki testlehekülg(i)"
 
-#: ../../printerdrake.pm_.c:3481 ../../printerdrake.pm_.c:3576
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:3237 ../../printer/printerdrake.pm_.c:3321
 msgid "Know how to use this printer"
-msgstr "Kas soovite seadistusi proovida?"
+msgstr "Printeri kasutama õppimine"
 
-#: ../../printerdrake.pm_.c:3483 ../../printerdrake.pm_.c:3578
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:3238 ../../printer/printerdrake.pm_.c:3323
 msgid "Remove printer"
-msgstr "V�rguprinter"
+msgstr "Eemalda printer"
 
-#: ../../printerdrake.pm_.c:3529
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:3282
+#, c-format
 msgid "Removing old printer \"%s\"..."
-msgstr "Loetakse CUPS juhtprogramme"
+msgstr "Vana printeri \"%s\" eemaldamine..."
 
-#: ../../printerdrake.pm_.c:3554
-#, fuzzy
+#: ../../printer/printerdrake.pm_.c:3307
 msgid "Default printer"
-msgstr "Kohalik printer"
+msgstr "Vaikeprinter"
 
-#: ../../printerdrake.pm_.c:3555
+#: ../../printer/printerdrake.pm_.c:3308
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
-msgstr ""
+msgstr "Printer \"%s\" on määratud vaikeprinteriks."
 
-#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
+#: ../../printer/printerdrake.pm_.c:3310
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgstr "Printeri lisamine StarOffice/OpenOffice.org/GIMP-ile"
 
-#: ../../printerdrake.pm_.c:3560
+#: ../../printer/printerdrake.pm_.c:3312
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
-msgstr ""
+msgstr "Printer \"%s\" lisati edukalt StarOffice/OpenOffice.org/GIMP-ile."
 
-#: ../../printerdrake.pm_.c:3563
+#: ../../printer/printerdrake.pm_.c:3313
 #, 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."
 
-#: ../../printerdrake.pm_.c:3568 ../../printerdrake.pm_.c:3571
+#: ../../printer/printerdrake.pm_.c:3315
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
-msgstr ""
+msgstr "Printeri eemaldamine StarOffice/OpenOffice.org/GIMP-ilt"
 
-#: ../../printerdrake.pm_.c:3569
+#: ../../printer/printerdrake.pm_.c:3317
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
-msgstr ""
+msgstr "Printer \"%s\" eemaldati edukalt StarOffice/OpenOffice.org/GIMP-ilt."
 
-#: ../../printerdrake.pm_.c:3572
+#: ../../printer/printerdrake.pm_.c:3318
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr ""
+"Printeri \"%s\" eemaldamine StarOffice/OpenOffice.org/GIMP-ilt ebaõnnestus."
 
-#: ../../printerdrake.pm_.c:3580
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:3325
+#, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
-msgstr "Kas soovite v�rgu�hendust taask�ivitada?"
+msgstr "Kas tõesti eemaldada printer \"%s\"?"
 
-#: ../../printerdrake.pm_.c:3584
-#, fuzzy, c-format
+#: ../../printer/printerdrake.pm_.c:3329
+#, c-format
 msgid "Removing printer \"%s\"..."
-msgstr "Loetakse CUPS juhtprogramme"
-
-#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
-#: ../../proxy.pm_.c:78
-#, fuzzy
-msgid "Proxy configuration"
-msgstr "Vahendajate s�tted"
-
-#: ../../proxy.pm_.c:30
-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 ""
-
-#: ../../proxy.pm_.c:38
-msgid ""
-"Please fill in the http proxy informations\n"
-"Leave it blank if you don't want an http proxy"
-msgstr ""
-
-#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
-msgid "URL"
-msgstr ""
-
-#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
-#, fuzzy
-msgid "port"
-msgstr "Port"
-
-#: ../../proxy.pm_.c:44
-#, fuzzy
-msgid "Url should begin with 'http:'"
-msgstr "Vahendaja peab olema kujul http://..."
-
-#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
-#, fuzzy
-msgid "The port part should be numeric"
-msgstr "Pordi number peab olema ikkagi number"
-
-#: ../../proxy.pm_.c:59
-msgid ""
-"Please fill in the ftp proxy informations\n"
-"Leave it blank if you don't want an ftp proxy"
-msgstr ""
-
-#: ../../proxy.pm_.c:79
-msgid ""
-"Please enter proxy login and password, if any.\n"
-"Leave it blank if you don't want login/passwd"
-msgstr ""
-
-#: ../../proxy.pm_.c:80
-#, fuzzy
-msgid "login"
-msgstr "Vaikimisi sisenemine"
-
-#: ../../proxy.pm_.c:82
-#, fuzzy
-msgid "password"
-msgstr "Salas�na"
-
-#: ../../proxy.pm_.c:84
-#, fuzzy
-msgid "re-type password"
-msgstr "Salas�na puudub"
-
-#: ../../proxy.pm_.c:88
-#, fuzzy
-msgid "The passwords don't match. Try again!"
-msgstr "Salas�nad ei klapi"
+msgstr "Printeri \"%s\" eemaldamine..."
 
 #: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Juba vormindatud RAID-ile (md%d) ei saa partitsiooni lisada"
 
-#: ../../raid.pm_.c:108
-#, c-format
-msgid "Can't write file %s"
-msgstr "Ei saa kirjutada faili %s"
-
 #: ../../raid.pm_.c:137
 msgid "mkraid failed"
-msgstr "mkraid eba�nnestus"
+msgstr "mkraid ebaõnnestus"
 
 #: ../../raid.pm_.c:137
 msgid "mkraid failed (maybe raidtools are missing?)"
-msgstr "mkraid eba�nnestus (puudub 'raidtools'?)"
+msgstr "mkraid ebaõnnestus (võib-olla puudub 'raidtools'?)"
 
 #: ../../raid.pm_.c:153
 #, c-format
 msgid "Not enough partitions for RAID level %d\n"
-msgstr "Ei ole piisavalt partitsiooni RAID-%d jaoks\n"
+msgstr "Ei ole piisavalt partitsioone RAID-%d jaoks\n"
 
-#: ../../security/main.pm_.c:35
+#: ../../security/main.pm_.c:36
 msgid ""
 "Standard: This is the standard security recommended for a computer that will "
 "be used to connect\n"
@@ -9130,122 +9675,136 @@ msgid ""
 "be sent to this user (username or\n"
 "\t       email)"
 msgstr ""
+"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"
+"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"
+"Turvaadministraator:\n"
+"               Kui valitud on võimalus 'Turvahoiatused', saadetakse "
+"turvahoiatused sellele kasutajale (kasutajanimele\n"
+"\t       või e-posti aadressile)"
 
-#: ../../security/main.pm_.c:65
-#, fuzzy
+#: ../../security/main.pm_.c:66
 msgid "Security Level:"
-msgstr "Turvataseme seadmine"
+msgstr "Turvatase:"
+
+#: ../../security/main.pm_.c:77
+#, c-format
+msgid " (default value: %s)"
+msgstr " (vaikeväärtus: %s)"
 
-#: ../../security/main.pm_.c:99
-#, fuzzy
+#: ../../security/main.pm_.c:113
 msgid "Security Alerts:"
-msgstr "Turvataseme seadmine"
+msgstr "Turvahoiatused:"
 
-#: ../../security/main.pm_.c:101
-#, fuzzy
+#: ../../security/main.pm_.c:115
 msgid "Security Administrator:"
-msgstr "V�rguprinteri s�tted"
+msgstr "Turvaadministraator:"
 
-#: ../../security/main.pm_.c:114
-#, fuzzy
+#: ../../security/main.pm_.c:128
 msgid "Network Options"
-msgstr "Mooduli parameetrid:"
+msgstr "Võrguparameetrid"
 
-#: ../../security/main.pm_.c:114
-#, fuzzy
+#: ../../security/main.pm_.c:128
 msgid "System Options"
-msgstr "Mooduli parameetrid:"
+msgstr "Süsteemi parameetrid"
 
-#: ../../security/main.pm_.c:119 ../../security/main.pm_.c:148
+#: ../../security/main.pm_.c:133 ../../security/main.pm_.c:164
 msgid ""
 "The following options can be set to customize your\n"
 "system security. If you need explanations, click on Help.\n"
 msgstr ""
+"Süsteemi turvalisuse kohandamiseks saab seadistada\n"
+"järgmisi parameetreid. Seletuste saamiseks vajutage 'Abi'.\n"
 
-#: ../../security/main.pm_.c:137
-#, fuzzy, c-format
-msgid " (default: %s)"
-msgstr " ? (vaikimisi %s) "
-
-#: ../../security/main.pm_.c:161
-msgid "Periodic Checks 2"
-msgstr ""
-
-#: ../../security/main.pm_.c:162
+#: ../../security/main.pm_.c:177
 msgid "Periodic Checks"
-msgstr ""
+msgstr "Perioodiline kontroll"
 
-#: ../../security/main.pm_.c:176
-#, fuzzy
+#: ../../security/main.pm_.c:191
 msgid "Please wait, setting security level..."
-msgstr "Turvataseme seadmine"
+msgstr "Palun oodake, sätin turvataseme..."
 
-#: ../../security/main.pm_.c:182
-#, fuzzy
+#: ../../security/main.pm_.c:197
 msgid "Please wait, setting security options..."
-msgstr "Palun oodake, valmistun installimiseks"
+msgstr "Palun oodake, sätin turvaparameetrid..."
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:19
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
-msgstr ""
+msgstr "Helisüsteemi ALSA (Advanced Linux Sound Architecture) käivitamine"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:20
 msgid "Anacron a periodic command scheduler."
 msgstr ""
-"Anacron k�ivitab programme perioodiliselt analoogiliselt cron-ile.\n"
-"Kasutage seda juhul kui Teie arvuti ei t��ta 24h."
+"Anacron käivitab programme perioodiliselt analoogiliselt cron-ile.\n"
+"Kasutage seda juhul, kui Teie arvuti ei tööta 24h."
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:21
 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."
 msgstr ""
-"apmd on kasutusel p�hiliselt s�learvutites, akude t�ituvuse j�lgimiseks.\n"
-"Samuti suudab see aku t�hjenemisel s�steemi viisakalt maha v�tta."
+"apmd on kasutusel põhiliselt sülearvutites akude täituvuse jälgimiseks.\n"
+"Samuti suudab see aku tühjenemisel süsteemi viisakalt seisata."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:23
 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."
+"Laseb käivitada ühekordseid käske etteantud ajal või ootab süsteemi\n"
+"koormuse laskumist käsu käivitamiseks piisavale tasemele."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:25
 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."
 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. Soovitav s�steemile mis t��tab 24h"
+"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."
 
-#: ../../services.pm_.c:23
+#: ../../services.pm_.c:28
 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."
+"GPM annab võimaluse kasutada hiirt ka tekstikonsoolil. Lisaks tavalisele\n"
+"lõikamisele/kleepimisele saab kasutada ka menüüsüsteeme."
 
-#: ../../services.pm_.c:26
+#: ../../services.pm_.c:31
 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."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:33
 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."
+"Apache on maailma juhtiv veebiserveri programm. Tõenäoliselt\n"
+"ka võimsaim."
 
-#: ../../services.pm_.c:29
+#: ../../services.pm_.c:34
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -9254,281 +9813,286 @@ msgid ""
 "disables\n"
 "all of the services it is responsible for."
 msgstr ""
-"Interneti \"superserver\", nimega inetd laseb k�ivitada mitmeid v�rgu-\n"
-"teenustel, nagu telnet, ftp, rsh, rlogin jne."
+"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."
 
-#: ../../services.pm_.c:33
+#: ../../services.pm_.c:38
 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."
 
-#: ../../services.pm_.c:35
+#: ../../services.pm_.c:40
 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."
 msgstr ""
-"See programm laeb s�steemi k�ivitumisel klaviatuuripaigutuse vastavalt\n"
-"failis /etc/sysconfig/keyboard kirjeldatule."
+"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."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:43
 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"
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:45
 msgid "Automatic detection and configuration of hardware at boot."
-msgstr ""
+msgstr "Riistvara automaatne tuvastamine ja seadistamine alglaadimisel."
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:46
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
 msgstr ""
+"Linuxconf sooritab mõnikord alglaadimise ajal mitmesuguseid\n"
+"asju süsteemi seadistuse säilitamiseks."
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:48
 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 printida."
+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."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:50
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
 msgstr ""
+"Linuxi virtuaalserver, mis on mõeldud veatult töötavaks ja igati\n"
+"kättesaadavaks serveriks."
 
-#: ../../services.pm_.c:47
-#, fuzzy
+#: ../../services.pm_.c:52
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
 "names to IP addresses."
 msgstr ""
-"named (BIND) on kasutusel nimeserverites, mis teenindavad DNS\n"
-"hierarhiat, t�lkimaks nimesid IP-aadressideks"
+"named (BIND) on kasutusel nimeserverites, mis teenindavad DNS hierarhiat, "
+"tõlkimaks nimesid IP-aadressideks."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:53
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
 msgstr ""
-"�hendab ja lahutab k�iki v�rgufailis�steeme (nii NFS, SMB\n"
-"kui ka NCP)"
+"Haagib ja lahutab kõiki võrgufailisüsteeme\n"
+"(nii NFS, SMB kui ka NCP)."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:55
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
-msgstr "Aktiveerib s�steemi laadimisel Teile vajalikud v�rguliidesed."
+msgstr "Aktiveerib süsteemi alglaadimisel kõik vajalikud võrguliidesed."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:57
 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."
 msgstr ""
-"NFS on UNIXi keskkonna standardne failijaotusprotokoll. See programm t�idab\n"
-"NFS serveri funktsioone, ja konfigureeritakse failis /etc/exports."
+"NFS on UNIXi keskkonna standardne failijaotusprotokoll.\n"
+"See täidab NFS serveri funktsioone ja seadistatakse failis /etc/exports."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:60
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
 msgstr ""
-"NFS on UNIXi keskkonna standardne failijaotusprotokoll. See programm t�idab\n"
-"NFS failide lukustamise funktsioone. Vajalik serveerimisel."
+"NFS on UNIXi keskkonna standardne failijaotusprotokoll.\n"
+"See programm täidab NFS failide lukustamise funktsioone.\n"
+"Vajalik serveerimisel."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:62
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
-msgstr ""
+msgstr "Lülitab automaatselt alglaadimise ajal sisse numlock-i."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:64
 msgid "Support the OKI 4w and compatible winprinters."
-msgstr ""
+msgstr "Toetab OKI 4w ja sellega ühilduvaid winprintereid."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:65
 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."
 msgstr ""
-"PCMCIA tugi on tavaliselt vajalik s�learvutitele v�rgu- ja modemiliideste\n"
-"lisamiseks."
+"PCMCIA tugi on tavaliselt vajalik sülearvutitele võrgu- ja\n"
+"modemiliideste lisamiseks."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:68
 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."
 msgstr ""
-"portmapper haldab RPC �hendusi, mida kasutavad NFS ja NIS. Neil \n"
-"serveritel on see h�davajalik."
+"portmapper haldab RPC ühendusi, mida kasutavad NFS ja NIS.\n"
+"Neil serveritel on see hädavajalik."
 
-#: ../../services.pm_.c:66
-#, fuzzy
+#: ../../services.pm_.c:71
 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 programm, mis\n"
-"toimetab meili �hest masinast teise."
+"Postfix on meili transpordiagent, see tähendab rakendus,\n"
+"mis toimetab meili ühest masinast teise."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:72
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
 msgstr ""
-"Salvestab ja taastab juhuarvude genereerimiseks vajaliku s�steemse\n"
-"entroopiasalve."
+"Salvestab ja taastab juhuarvude genereerimiseks vajaliku\n"
+"süsteemse entroopiasalve."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:74
 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"
 
-#: ../../services.pm_.c:71
+#: ../../services.pm_.c:76
 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 marsruutimis-\n"
-"infot. Kui Teil on RIP kasutusel, on vajalik ka routed."
+"routed on RIP deemon, mis vahetab selle protokolli alusel\n"
+"marsruutimisinfot. Kui Teil on RIP kasutusel, on vajalik ka routed."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:79
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
 msgstr ""
-"rstat protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
-"t�� kohta. Ettevaatust!"
+"rstat protokoll laseb üle võrgu saada informatsiooni\n"
+"süsteemi töö kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:81
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
 msgstr ""
-"rusers protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
-"kasutajate kohta. Ettevaatust!"
+"rusers protokoll laseb üle võrgu saada informatsiooni\n"
+"süsteemi kasutajate kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:78
+#: ../../services.pm_.c:83
 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 ""
-"rwho protokoll laseb �le v�rgu saada informatsiooni s�steemi\n"
-"kasutajate kohta. Ettevaatust!"
+"rwho protokoll laseb üle võrgu saada informatsiooni\n"
+"süsteemi kasutajate kohta. Ettevaatust!"
 
-#: ../../services.pm_.c:80
-#, fuzzy
+#: ../../services.pm_.c:85
 msgid "Launch the sound system on your machine"
-msgstr "K�ivita X-Windows alglaadimisel"
+msgstr "Käivitab helisüsteemi"
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:86
 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!"
+msgstr "Syslog-i kaudu toimub süsteemis toimiva logimine. Vajalik!"
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:88
 msgid "Load the drivers for your usb devices."
-msgstr ""
+msgstr "Laeb draiverid USB-seadmete tarbeks."
 
-#: ../../services.pm_.c:84
-#, fuzzy
+#: ../../services.pm_.c:89
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
-msgstr "Stardib X fondiserveri, selleta X ei k�ivitu."
+msgstr "Käivitab X fondiserveri, ilma milleta X lihtsalt ei lähe käima."
 
-#: ../../services.pm_.c:110 ../../services.pm_.c:152
+#: ../../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"
+msgstr "Valige, millised teenused tuleks alglaadimisel käivitada"
 
-#: ../../services.pm_.c:122
-#, fuzzy
+#: ../../services.pm_.c:127
 msgid "Printing"
-msgstr "Printer"
+msgstr "Trükkimine"
 
-#: ../../services.pm_.c:123
+#: ../../services.pm_.c:128
 msgid "Internet"
 msgstr "Internet"
 
-#: ../../services.pm_.c:126
+#: ../../services.pm_.c:131
 msgid "File sharing"
-msgstr ""
+msgstr "Failide jagamine"
 
-#: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:1746
-#, fuzzy
+#: ../../services.pm_.c:133 ../../standalone/drakbackup_.c:1709
 msgid "System"
-msgstr "T��mood"
+msgstr "Süsteem"
 
-#: ../../services.pm_.c:133
-#, fuzzy
+#: ../../services.pm_.c:138
 msgid "Remote Administration"
-msgstr "V�rguprinteri s�tted"
+msgstr "Kaughaldus"
 
-#: ../../services.pm_.c:141
-#, fuzzy
+#: ../../services.pm_.c:146
 msgid "Database Server"
-msgstr "Server, Andmebaasid"
+msgstr "Andmebaasi server"
 
-#: ../../services.pm_.c:170
+#: ../../services.pm_.c:175
 #, c-format
 msgid "Services: %d activated for %d registered"
-msgstr ""
+msgstr "Teenused: %d aktiveeritud, kokku %d"
 
-#: ../../services.pm_.c:186
-#, fuzzy
+#: ../../services.pm_.c:191
 msgid "Services"
-msgstr "seade"
+msgstr "Teenused"
 
-#: ../../services.pm_.c:198
+#: ../../services.pm_.c:203
 msgid "running"
-msgstr "k�imas"
+msgstr "töötab"
 
-#: ../../services.pm_.c:198
+#: ../../services.pm_.c:203
 msgid "stopped"
 msgstr "peatatud"
 
-#: ../../services.pm_.c:212
+#: ../../services.pm_.c:217
 msgid "Services and deamons"
 msgstr "Teenused ja deemonid"
 
-#: ../../services.pm_.c:217
+#: ../../services.pm_.c:222
 msgid ""
 "No additional information\n"
 "about this service, sorry."
 msgstr ""
-"Selle teenuse kohta ei oska\n"
-"lisainformatsiooni anda."
+"Selle teenuse kohta\n"
+"ei oska lisainfot anda."
 
-#: ../../services.pm_.c:224
+#: ../../services.pm_.c:229
 msgid "On boot"
 msgstr "Alglaadimisel"
 
-#: ../../services.pm_.c:236
-#, fuzzy
+#: ../../services.pm_.c:241
 msgid "Start"
-msgstr "Olek:"
+msgstr "Käivita"
 
-#: ../../services.pm_.c:236
-#, fuzzy
+#: ../../services.pm_.c:241
 msgid "Stop"
-msgstr "Sektor"
+msgstr "Peata"
 
 #: ../../share/advertising/01-thanks.pl_.c:9
 msgid "Thank you for choosing Mandrake Linux 9.0"
-msgstr ""
+msgstr "Täname, et valisite Mandrake Linux 9.0"
 
 #: ../../share/advertising/01-thanks.pl_.c:10
 msgid "Welcome to the Open Source world"
-msgstr ""
+msgstr "Tere tulemast avatud tarkvara maailma"
 
 #: ../../share/advertising/01-thanks.pl_.c:11
 msgid ""
@@ -9536,26 +10100,28 @@ msgid ""
 "Your new operating system is the result of collaborative work on the part of "
 "the worldwide Linux Community"
 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
-#, fuzzy
 msgid "Get involved in the Free Software world"
-msgstr "�lej��nud maailm"
+msgstr "Liituge vaba tarkvara maailmaga"
 
 #: ../../share/advertising/02-community.pl_.c:10
 msgid "Want to know more about the Open Source community?"
-msgstr ""
+msgstr "Kas soovite avatud tarkvara kogukonnast rohkem teada saada?"
 
 #: ../../share/advertising/02-community.pl_.c:11
 msgid ""
 "To share your own knowledge and help build Linux tools, join the discussion "
 "forums you'll find on our \"Community\" webpages"
 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
-#, fuzzy
 msgid "Get the most from the Internet"
-msgstr "Loo interneti�hendus"
+msgstr "Võtke Internetist viimane välja"
 
 #: ../../share/advertising/03-internet.pl_.c:10
 msgid ""
@@ -9563,111 +10129,129 @@ msgid ""
 "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 "
+"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 ""
+msgstr "Avastage uusimad ja parimad graafika- ja multimeediavahendid!"
 
 #: ../../share/advertising/04-multimedia.pl_.c:10
 msgid "Push multimedia to its limits!"
-msgstr ""
+msgstr "Võtke multimeediast kõik, mida võtta annab!"
 
 #: ../../share/advertising/04-multimedia.pl_.c:11
 msgid ""
 "Mandrake Linux 9.0 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 "
+"mängimiseks, piltide või fotode töötlemiseks ning videode vaatamiseks"
 
 #: ../../share/advertising/05-games.pl_.c:9
 msgid "Games"
-msgstr "M�ngud"
+msgstr "Mängud"
 
 #: ../../share/advertising/05-games.pl_.c:10
 msgid ""
 "Mandrake Linux 9.0 provides the best Open Source games - arcade, action, "
 "strategy, ..."
 msgstr ""
+"Mandrake Linux 9.0 pakub parimaid avatud tarkvara mänge - põnevust, "
+"seiklusi, strateegiat..."
 
-#: ../../share/advertising/06-mcc.pl_.c:9 ../../standalone/drakbug_.c:69
-#, fuzzy
+#: ../../share/advertising/06-mcc.pl_.c:9 ../../standalone/drakbug_.c:49
 msgid "Mandrake Control Center"
-msgstr "Juhtimiskeskus"
+msgstr "Mandrake juhtimiskeskus"
 
 #: ../../share/advertising/06-mcc.pl_.c:10
 msgid ""
 "Mandrake Linux 9.0 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 "
+"seadistada"
 
 #: ../../share/advertising/07-desktop.pl_.c:9
-#, fuzzy
 msgid "User interfaces"
-msgstr "V�rguliides"
+msgstr "Kasutajaliidesed"
 
 #: ../../share/advertising/07-desktop.pl_.c:10
 msgid ""
 "Mandrake Linux 9.0 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 "
+"kohandada: KDE 3, GNOME 2, WindowMaker..."
 
 #: ../../share/advertising/08-development.pl_.c:9
-#, fuzzy
 msgid "Development simplified"
-msgstr "Arendus"
+msgstr "Arendus lihtsamat moodi"
 
 #: ../../share/advertising/08-development.pl_.c:10
 msgid "Mandrake Linux 9.0 is the ultimate development platform"
-msgstr ""
+msgstr "Mandrake Linux 9.0 kujutab endast täiuslikku arendusplatvormi"
 
 #: ../../share/advertising/08-development.pl_.c:11
 msgid ""
 "Use the full power of the GNU gcc 3 compiler as well as the best Open Source "
 "development environments"
 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 ""
+msgstr "Muutke oma masin usaldust väärivaks serveriks"
 
 #: ../../share/advertising/09-server.pl_.c:10
 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, ..."
 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 ""
+msgstr "Turvalisus, nagu Teile meeldib"
 
 #: ../../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_.c:11
 msgid ""
 "This firewall product includes network features that allow you to fulfill "
 "all your security needs"
 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 ""
+msgstr "See toode on saadaval MandrakeStore veebisaidil"
 
 #: ../../share/advertising/11-mdkstore.pl_.c:9
 msgid "The official MandrakeSoft store"
-msgstr ""
+msgstr "MandrakeSofti ametlik kauplusladu"
 
 #: ../../share/advertising/11-mdkstore.pl_.c:10
 msgid ""
 "Our full range of Linux solutions, as well as special offers on products and "
 "other \"goodies,\" are available online on our e-store:"
 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 ""
+msgstr "Strateegilised partnerid"
 
 #: ../../share/advertising/12-mdkstore.pl_.c:10
 msgid ""
@@ -9675,20 +10259,25 @@ msgid ""
 "solutions compatible with Mandrake Linux. A list of these partners is "
 "available on the MandrakeStore"
 msgstr ""
+"MandrakeSoft teeb koostööd mitme firmaga, kes pakuvad Mandrake Linuxiga "
+"ü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 ""
+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 ""
+msgstr "Hankige endale Linuxi sertifikaat"
 
 #: ../../share/advertising/13-mdkcampus.pl_.c:12
 msgid ""
@@ -9696,17 +10285,20 @@ msgid ""
 "partners, the Linux-Campus catalogue prepares you for the acknowledged LPI "
 "certification program (worldwide professional technical certification)"
 msgstr ""
+"Hoolimata sellest, kas kavatsete teadmisi omandada võrgus või meie "
+"õppepartnerite võrgustiku vahendusel, valmistab Linux-Campus Teid ette "
+"tunnustatud LPI sertifitseerimisprogrammi läbimiseks (see on üleilmne "
+"tehnilise professionaalsuse sertifikaat)"
 
 #: ../../share/advertising/14-mdkexpert.pl_.c:9
-#, fuzzy
 msgid "Become a MandrakeExpert"
-msgstr "ekspert"
+msgstr "Omandage Mandrake eksperdi kuulsus"
 
 #: ../../share/advertising/14-mdkexpert.pl_.c:10
 msgid ""
 "Find the solutions of your problems via MandrakeSoft's online support "
 "platform"
-msgstr ""
+msgstr "Leidke oma probleemidele lahendus MandrakeSofti internetitoe abil"
 
 #: ../../share/advertising/14-mdkexpert.pl_.c:11
 msgid ""
@@ -9714,25 +10306,29 @@ msgid ""
 "your knowledge and help others by becoming a recognized Expert on the online "
 "technical support website:"
 msgstr ""
+"Ühinege MandrakeSofti tugimeeskondadega ning Linuxi kogukonnaga Internetis, "
+"et jagada oma kogemusi ning aidata ka teistel saada tunnustatud ekspertideks "
+"tehnilise toe veebileheküljel:"
 
 #: ../../share/advertising/15-mdkexpert-corporate.pl_.c:9
-#, fuzzy
 msgid "MandrakeExpert Corporate"
-msgstr "ekspert"
+msgstr "Mandrake äriekspert"
 
 #: ../../share/advertising/15-mdkexpert-corporate.pl_.c:10
 msgid "An online platform to respond to company's specific support needs"
-msgstr ""
+msgstr "Internetiplatvorm, mis vastab firmade spetsiifilistele tugivajadustele"
 
 #: ../../share/advertising/15-mdkexpert-corporate.pl_.c:11
 msgid ""
 "All incidents will be followed up by a single qualified MandrakeSoft "
 "technical expert."
 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 ""
+msgstr "Avastage Mandrake klubi ja Mandrake äriklubi"
 
 #: ../../share/advertising/17-mdkclub.pl_.c:10
 msgid ""
@@ -9743,199 +10339,789 @@ msgid ""
 "competititve edge, if you want to support Mandrake Linux development, join "
 "MandrakeClub!"
 msgstr ""
+"Mandrake klubi ja Mandrake äriklubi loodi Mandrake Linuxi äri- ja "
+"erakasutajatele, kes soovivad otseselt toetada meelepärast Linuxi "
+"distributsiooni ning saada vastutasuks erillisi privileege. Kui meie toode "
+"Teile meeldib, kui Teie firma on meie toodete abil saavutanud ärilist edu, "
+"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"
+
+#: ../../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"
+
+#: ../../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.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.pm_.c:68
+msgid ""
+"[OPTIONS]...\n"
+"\t      --debug         print debugging information"
+msgstr ""
+"[VÕTMED}...\n"
+"\t      --debug         näitab veateateid"
+
+#: ../../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.pm_.c:82
+msgid "[keyboard]"
+msgstr "[klaviatuur]"
+
+#: ../../standalone.pm_.c:83
+msgid "[--file=myfyle] [--word=myword] [--explain=regexp] [--alert]"
+msgstr ""
+"[--file=minufail] [--word=minusõna] [--explain=regulaaravaldis] [--alert]"
+
+#: ../../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.pm_.c:93
+msgid " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+
+#: ../../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.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.pm_.c:100
+msgid ""
+" [everything]\n"
+"       XFdrake [--noauto] monitor\n"
+"       XFdrake resolution"
+msgstr ""
+" [kõik]\n"
+"       XFDrake [--noauto] monitor\n"
+"       XFDrake kuvatihedus"
+
+#: ../../standalone.pm_.c:114
+#, c-format
+msgid ""
+"\n"
+"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
+msgstr ""
+"\n"
+"Kasutamine: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version]"
 
-#: ../../standalone.pm_.c:49
-#, fuzzy
+#: ../../standalone.pm_.c:168
 msgid "Installing packages..."
-msgstr "Paketi %s installimine"
+msgstr "Pakettide paigaldamine..."
 
-#: ../../standalone/XFdrake_.c:148
+#: ../../standalone/XFdrake_.c:138
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
-msgstr "Palun v�ljuge ja vajutage siis Ctrl-Alt-BackSpace"
+msgstr "Palun väljuge ja vajutage siis Ctrl-Alt-BackSpace"
 
 # c-format
-#: ../../standalone/XFdrake_.c:152
+#: ../../standalone/XFdrake_.c:142
 #, c-format
 msgid "Please relog into %s to activate the changes"
-msgstr "Muudatuste aktiveerimiseks k�ivitage %s uuesti"
+msgstr "Muudatuste aktiveerimiseks käivitage %s uuesti"
 
-#: ../../standalone/drakTermServ_.c:188
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:239
 msgid "Mandrake Terminal Server Configuration"
-msgstr "Interneti s�tted"
+msgstr "Mandrake terminaliserveri sätted"
 
-#: ../../standalone/drakTermServ_.c:203
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:253
 msgid "Enable Server"
-msgstr "Server, Andmebaasid"
+msgstr "Serveri lubamine"
 
-#: ../../standalone/drakTermServ_.c:210
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:260
 msgid "Disable Server"
-msgstr "Server, Andmebaasid"
+msgstr "Serveri keelamine"
 
-#: ../../standalone/drakTermServ_.c:218
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:268
 msgid "Start Server"
-msgstr "NIS server:"
+msgstr "Serveri käivitamine"
 
-#: ../../standalone/drakTermServ_.c:225
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:275
 msgid "Stop Server"
-msgstr "NIS server:"
+msgstr "Serveri peatamine"
 
-#: ../../standalone/drakTermServ_.c:233
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:283
 msgid "Etherboot Floppy/ISO"
-msgstr "Loo alglaadimisflopi"
+msgstr "Etherboot flopi/ISO"
 
-#: ../../standalone/drakTermServ_.c:235
+#: ../../standalone/drakTermServ_.c:288
 msgid "Net Boot Images"
-msgstr ""
+msgstr "Võrgu alglaadepildid"
 
-#: ../../standalone/drakTermServ_.c:239
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:294
 msgid "Add/Del Users"
-msgstr "Lisa kasutaja"
+msgstr "Lisa/kustuta kasutaja"
 
-#: ../../standalone/drakTermServ_.c:241
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:299
 msgid "Add/Del Clients"
-msgstr "DHCP klient"
+msgstr "Lisa/kustuta klient"
+
+#: ../../standalone/drakTermServ_.c:328
+msgid ""
+"\n"
+" Copyright (C) 2002 by MandrakeSoft \n"
+"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
+"\n"
+msgstr ""
+"\n"
+" Copyright (C) 2002: MandrakeSoft \n"
+"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
+"\n"
+
+#: ../../standalone/drakTermServ_.c:332
+msgid ""
+"\n"
+"\n"
+" Thanks:\n"
+"\t- LTSP Project http://www.ltsp.org\n"
+"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
+"\n"
+msgstr ""
+"\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:365
+msgid ""
+"drakTermServ Overview\n"
+"\t\t\t   \n"
+"        - Create Etherboot Enabled Boot Images:\n"
+"        \t\tTo boot a kernel via etherboot, a special kernel/initrdrd image "
+"must be created.\n"
+"        \t\tmkinitrd-net does much of this work and drakTermServ is just a "
+"graphical interface\n"
+"        \t\tto help manage/customize these images.\n"
+"\n"
+"        - Maintain /etc/dhcpd.conf:\n"
+"        \t\tTo net boot clients, each client needs a dhcpd.conf entry, "
+"assigning an IP address\n"
+"        \t\tand net boot images to the machine. drakTermServ helps create/"
+"remove these entries.\n"
+"\t\t\t\n"
+"        \t\t(PCI cards may omit the image - etherboot will request the "
+"correct image. You should\n"
+"        \t\talso consider that when etherboot looks for the images, it "
+"expects names like\n"
+"        \t\tboot-3c59x.nbi, rather than boot-3c59x.2.4.19-16mdk.nbi).\n"
+"\t\t\t \n"
+"        \t\tA typical dhcpd.conf stanza to support a diskless client looks "
+"like:\n"
+"        \t\t\n"
+"\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\tfilename                      \"i386/boot/boot-3c509.2.4.18-6mdk."
+"nbi\";\n"
+"\t\t\t\t}\n"
+"\t\t\t\n"
+"\t\t\tWhile you can use a pool of IP addresses, rather than setup a specific "
+"entry for\n"
+"\t\t\ta client machine, using a fixed address scheme facilitates using the "
+"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\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\\$\\"
+"$IP=client_ip\\$\\$ is\n"
+"\t\t\twritten for thin clients. System config files xdm-config, kdmrc, and "
+"gdm.conf are modified\n"
+"\t\t\tif thin clients are used, to enable xdmcp. Since there are security "
+"issues in using xdmcp,\n"
+"\t\t\thosts.deny and hosts.allow are modified to limit access to the local "
+"subnet.\n"
+"\t\t\t\n"
+"\t\t\tNote: You must stop/start the server after adding or changing "
+"clients.\n"
+"\t\t\t\n"
+"        - Maintain /etc/exports:\n"
+"        \t\tClusternfs allows export of the root filesystem to diskless "
+"clients. drakTermServ\n"
+"        \t\tsets up the correct entry to allow anonymous access to the root "
+"filesystem from\n"
+"        \t\tdiskless clients.\n"
+"\n"
+"        \t\tA typical exports entry for clusternfs is:\n"
+"        \t\t\n"
+"        \t\t/                  (ro,all_squash)\n"
+"        \t\t/home              SUBNET/MASK(rw,root_squash)\n"
+"\t\t\t\n"
+"\t\t\tWith SUBNET/MASK being defined for your network.\n"
+"        \t\t\n"
+"        - Maintain /etc/shadow\\$\\$CLIENT\\$\\$:\n"
+"        \t\tFor users to be able to log into the system from a diskless "
+"client, their entry in\n"
+"        \t\t/etc/shadow needs to be duplicated in /etc/shadow\\$\\$CLIENTS\\$"
+"\\$. drakTermServ helps\n"
+"        \t\tin this respect by adding or removing system users from this "
+"file.\n"
+"\n"
+"        - Per client /etc/X11XF86Config-4\\$\\$IP-ADDRESS\\$\\$:\n"
+"        \t\tThrough clusternfs, each diskless client can have it's own "
+"unique configuration files\n"
+"        \t\ton the root filesystem of the server. In the future drakTermServ "
+"will help create these\n"
+"        \t\tfiles.\n"
+"\n"
+"        - Per client system configuration files:\n"
+"        \t\tThrough clusternfs, each diskless client can have it's own "
+"unique configuration files\n"
+"        \t\ton the root filesystem of the server. In the future, "
+"drakTermServ can help create files\n"
+"        \t\tsuch as /etc/modules.conf, /etc/sysconfig/mouse, /etc/sysconfig/"
+"keyboard on a per-client\n"
+"        \t\tbasis.\n"
+"\n"
+"        - /etc/xinetd.d/tftp:\n"
+"        \t\tdrakTermServ will configure this file to work in conjunction "
+"with the images created by\n"
+"        \t\tmkinitrd-net, and the entries in /etc/dhcpd.conf, to serve up "
+"the boot image to each\n"
+"        \t\tdiskless client.\n"
+"\n"
+"        \t\tA typical tftp configuration file looks like:\n"
+"        \t\t\n"
+"        \t\tservice tftp\n"
+"        \t\t(\n"
+"                        disable         = no\n"
+"                        socket_type  = dgram\n"
+"                        protocol        = udp\n"
+"                        wait             = yes\n"
+"                        user             = root\n"
+"                        server          = /usr/sbin/in.tftpd\n"
+"                        server_args  = -s /var/lib/tftpboot\n"
+"        \t\t}\n"
+"        \t\t\n"
+"        \t\tThe changes here from the default installation are changing the "
+"disable flag to\n"
+"        \t\t'no' and changing the directory path to /var/lib/tftpboot, where "
+"mkinitrd-net\n"
+"        \t\tputs it's images.\n"
+"\n"
+"        - Create etherboot floppies/CDs:\n"
+"        \t\tThe diskless client machines need either ROM images on the NIC, "
+"or a boot floppy\n"
+"        \t\tor CD to initate the boot sequence.  drakTermServ will help "
+"generate these images,\n"
+"        \t\tbased on the NIC in the client machine.\n"
+"        \t\t\n"
+"        \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"
+" \n"
+"\n"
+msgstr ""
+"drakTermServi ülevaade\n"
+"\t\t\t   \n"
+"        - Etherboot-suutlike laadepiltide loomine:\n"
+"        \t\tKerneli alglaadimiseks etherboodi vahendusel tuleb luua eriline "
+"kernel/initrdrd laadepilt.\n"
+"        \t\tSuure osa tööst teeb ära mkinitrd ning drakTermServ on vaid "
+"graafiline\n"
+"        \t\tkasutajaliides, aitamaks neid laadepilte hallata ja/või "
+"kohandada.\n"
+"\n"
+"         - /etc/dhcpd.conf haldamine:\n"
+"        \t\tEt klient saaks teha alglaadimise võrgust, vajab iga klient "
+"kirjet failis dhcpd.conf,\n"
+"        \t\tmis omistab masinale IP aadressi ja võrgulaadepildi. "
+"drakServTerm aitab neid\n"
+"        \t\tkirjeid luua/eemaldada.\n"
+"\t\t\t\n"
+"        \t\t(PCI kaartidel võib laadepilt puududa - etherboot nõuab "
+"korrektset laadepilti.\n"
+"        \t\tSilmas võiks pidada ka seda, et kui etherboot laadepilti ootab, "
+"eeldab ta nime\n"
+"        \t\tkujul boot-3c59x.nbi, mitte aga boot-3c59x.2.4.19-16mdk.nbi).\n"
+"\t\t\t\n"
+"        \t\tTüüpiline dhcpd.conf-i lõik, mis toetab kettata tööjaama, näeb "
+"välja selline:\n"
+"        \t\t\n"
+"\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\tfilename                     \"i386/boot/boot-3c509.2.4.18-6mdk.nbi"
+"\";\n"
+"\t\t\t\t}\n"
+"\t\t\t\n"
+"\t\t\tKuigi võib kasutada ka IP aadresside valimikku, selle asemel et "
+"määrata igale\n"
+"\t\t\tkliendi masinale eraldi kirje, võimaldab fikseeritud aadress "
+"kasutamine siiski\n"
+"\t\t\tpruukida ClusterNFS pakutavaid kliendikeskseid seadistustefaile.\n"
+"\t\t\t\n"
+"\t\t\tMärkus: kirjet \"/*type\" kasutab ainult drakTermServ.  Kliendid "
+"võivad olla \n"
+"\t\t\tkas \"thin\"*/ või 'fat'.  \"Õhuke\" klient kasutab enamikku tarkvara "
+"serveril xdmcp\n"
+"\t\t\tvahendusel, \"paksud\" kliendid aga jooksutavad takrvara enamasti "
+"kliendi\n"
+"\t\t\tmasinal. Õhukeste klientide jaoks kirjutatakse eraldi inittab-fail\n"
+"\t\t\t/etc/inittab\\$\\$IP=kliendi_IP\\$\\$. Õhukeste klientide puhul "
+"muudetakse xdmcp\n"
+"\t\t\tvõimaldamiseks süsteemi seadetefaile xdm-config, kdmrc ja gdm.conf. "
+"Kuivõrd\n"
+"\t\t\txdmcp kasutamisega kaasnevad teatud turvaprobleemid, muudetakse faile\n"
+"\t\t\thosts.deny ja hosts.allow, et piirata ligipääsu kohalikule "
+"alamvõrgule.\n"
+"\t\t\t\n"
+"\t\t\tMärkus: server tuleb peatada/käivitada pärast kliendi lisamist või "
+"muutmist.\n"
+"\t\t\t\n"
+"        - /etc/exports haldamine:\n"
+"        \t\tClusterNFS võimaldab eksportida juurfailisüsteemi kettata "
+"tööjaamadele.\n"
+"        \t\tdrakTermServ loob korrektse kirje, mis võimaldab kettata "
+"tööjaamadele\n"
+"        \t\tanonüümset ligipääsu juurfailisüsteemile.\n"
+"\n"
+"        \t\tTüüpiline ekspordikirje ClusterNFS tarbeks näeb välja selline:\n"
+"        \t\t\n"
+"        \t\t/                  (ro,all_squash)\n"
+"        \t\t/home              SUBNET/MASK(rw,root_squash)\n"
+"\t\t\t\n"
+"\t\t\tkus SUBNET/MASK määrab Teie võrku.\n"
+"        \t\t\n"
+"        - /etc/shadow\\$\\$CLIENT\\$\\$ haldamine:\n"
+"        \t\tEt kasutajad saaksid kettata tööjaamalt süsteemi logida, peab "
+"nende kirje\n"
+"        \t\tfailis /etc/shadow leiduma ka failis /etc/shadow\\$\\$CLIENTS\\$"
+"\\$.\n"
+"        \t\tdrakTermServ aitab süsteemi kasutajaid faili lisada või sealt "
+"eemaldada.\n"
+"\n"
+"        - Kliendi failid /etc/X11XF86Config-4\\$\\$IP-ADDRESS\\$\\$:\n"
+"        \t\tClusterNFS abil võivad igal kettata tööjaamal olla oma "
+"unikaalsed seadetefailid\n"
+"        \t\tserveri juurfailisüsteemis. Tulevikus aitab drakTermServ neid "
+"luua.\n"
+"\n"
+"        - Kliendi süsteemi seadetefailid:\n"
+"        \t\tClusterNFS abil võivad igal kettata tööjaamal olla oma "
+"unikaalsed seadetefailid\n"
+"        \t\tserveri juurfailisüsteemis. Tulevikus aitab drakTermServ luua "
+"iga kliendi kohta\n"
+"        \t\tselliseid faile, nagu /etc/modules.conf, /etc/sysconfig/mouse, /"
+"etc/sysconfig/keyboard.\n"
+"\n"
+"        - /etc/xinetd.d/tftp:\n"
+"        \t\tdrakTermServ seadistab selle faili, et see saaks töötada koos "
+"laadepildega, mille\n"
+"        \t\ttekitab mkinitrd-net, samuti kirjed failis /etc/dhcpd.conf, et "
+"pakkuda igale kettata\n"
+"        \t\ttööjaamale alglaadimiseks laadepilti.\n"
+"\n"
+"        \t\tTüüpiline tftp seadetefail näeb välja selline:\n"
+"        \t\t\n"
+"        \t\tservice tftp\n"
+"        \t\t{\n"
+"                        disable         = no\n"
+"                        socket_type  = dgram\n"
+"                        protocol        = udp\n"
+"                        wait             = yes\n"
+"                        user             = root\n"
+"                        server          = /usr/sbin/in.tftpd\n"
+"                        server_args  = -s /var/lib/tftpboot\n"
+"        \t\t}\n"
+"        \t\t\n"
+"        \t\tSiin tehtud muudatused võrreldes vaikepaigaldusega muudavad "
+"tühistamislipu\n"
+"        \t\tväärtuseks 'no' ning kataloogirajaks muudetakse /var/lib/"
+"tftpboot, kuhu mkinitrd\n"
+"        \t\tsalvestab oma laadepildid.\n"
+"\n"
+"        - Etherbooti flopide/CD-de loomine:\n"
+"        \t\tKettata tööjaamad vajavad kas ROM-laadepilti võrguliidesel või "
+"alglaadimisflopit\n"
+"        \t\tvõi -CD-d alglaadimise käivitamiseks.  drakTermServ aitab neid "
+"laadepilte luua,\n"
+"        \t\ttuginedes kliendi masina võrguliidesele.\n"
+"        \t\t\n"
+"        \t\tLihtne näide alglaadimisflopi loomisest käsitsi 3com 3c509 "
+"jaoks:\n"
+"        \t\t\n"
+"        \t\tcat /usr/lib/etherboot/boot1a.bin /\\n        \t\t\t/usr/lib/"
+"etherboot/lzrom/3c509.lzrom > /dev/fd0\n"
+" \n"
+"\n"
 
-#: ../../standalone/drakTermServ_.c:436
+#: ../../standalone/drakTermServ_.c:488
 msgid "Boot Floppy"
-msgstr ""
+msgstr "Alglaadimisflopi"
 
-#: ../../standalone/drakTermServ_.c:438
+#: ../../standalone/drakTermServ_.c:490
 msgid "Boot ISO"
-msgstr ""
+msgstr "Alglaadimis-ISO"
 
-#: ../../standalone/drakTermServ_.c:507
+#: ../../standalone/drakTermServ_.c:559
 msgid "Build Whole Kernel -->"
-msgstr ""
+msgstr "Loo terve kernel -->"
 
-#: ../../standalone/drakTermServ_.c:509 ../../standalone/drakTermServ_.c:539
+#: ../../standalone/drakTermServ_.c:561 ../../standalone/drakTermServ_.c:591
 msgid "This will take a few minutes."
-msgstr ""
+msgstr "Selleks kulub päris mitu minutit."
 
-#: ../../standalone/drakTermServ_.c:521
+#: ../../standalone/drakTermServ_.c:573
 msgid "No kernel selected!"
-msgstr ""
+msgstr "Kernelit pole valitud!"
 
-#: ../../standalone/drakTermServ_.c:524
+#: ../../standalone/drakTermServ_.c:576
 msgid "Build Single NIC -->"
-msgstr ""
+msgstr "Loo ainus võrgukaart -->"
 
-#: ../../standalone/drakTermServ_.c:535
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:587
 msgid "No nic selected!"
-msgstr "Ei ole �hendatud"
+msgstr "Võrgukaarti pole valitud!"
 
-#: ../../standalone/drakTermServ_.c:538
+#: ../../standalone/drakTermServ_.c:590
 msgid "Build All Kernels -->"
-msgstr ""
+msgstr "Loo kõik kernelid -->"
 
-#: ../../standalone/drakTermServ_.c:552
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:604
 msgid "<-- Delete"
-msgstr "Kustuta"
+msgstr "<-- Kustuta"
 
-#: ../../standalone/drakTermServ_.c:559
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:611
 msgid "Delete All NBIs"
-msgstr "Valige fail"
+msgstr "Kustuta kõik võrgu alglaadepildid"
+
+#: ../../standalone/drakTermServ_.c:668
+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."
+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:621
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:673
 msgid "Add User -->"
-msgstr "Lisa kasutaja"
+msgstr "Lisa kasutaja -->"
 
-#: ../../standalone/drakTermServ_.c:629
+#: ../../standalone/drakTermServ_.c:681
 msgid "<-- Del User"
-msgstr ""
+msgstr "<-- Kustuta kasutaja"
 
-#: ../../standalone/drakTermServ_.c:694
+#: ../../standalone/drakTermServ_.c:720
+#, c-format
+msgid "type: %s"
+msgstr "tüüp: %s"
+
+#: ../../standalone/drakTermServ_.c:753
 msgid "No net boot images created!"
-msgstr ""
+msgstr "Võrgu alglaadepilte pole loodud!"
+
+#: ../../standalone/drakTermServ_.c:773
+msgid "Thin Client"
+msgstr "Õhuke Klient"
 
-#: ../../standalone/drakTermServ_.c:710
+#: ../../standalone/drakTermServ_.c:775
+msgid "Allow Thin Clients"
+msgstr "Luba õhukesi kliente"
+
+#: ../../standalone/drakTermServ_.c:778
 msgid "Add Client -->"
-msgstr ""
+msgstr "Lisa klient -->"
 
-#: ../../standalone/drakTermServ_.c:742
-#, fuzzy
-msgid "<-- Del Client"
-msgstr "DHCP klient"
+#: ../../standalone/drakTermServ_.c:821
+msgid "<-- Edit Client"
+msgstr "<-- Muuda klienti"
+
+#: ../../standalone/drakTermServ_.c:837
+msgid "Delete Client"
+msgstr "Kustuta klient"
 
-#: ../../standalone/drakTermServ_.c:748
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:843
 msgid "dhcpd Config..."
-msgstr "Seadista..."
+msgstr "Dhcpd seadistamine..."
 
-#: ../../standalone/drakTermServ_.c:873
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:876
+msgid ""
+"Need to restart the Display Manager for full changes to take effect. \n"
+"(service dm restart - at the console)"
+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:"
+
+#: ../../standalone/drakTermServ_.c:922
+msgid "Broadcast Address:"
+msgstr "Üldlevi aadress:"
+
+#: ../../standalone/drakTermServ_.c:929
+msgid "Domain Name:"
+msgstr "Domeeninimi:"
+
+#: ../../standalone/drakTermServ_.c:937
+msgid "Name Servers:"
+msgstr "Nimeserverid:"
+
+#: ../../standalone/drakTermServ_.c:948
+msgid "IP Range Start:"
+msgstr "IP vahemiku algus:"
+
+#: ../../standalone/drakTermServ_.c:949
+msgid "IP Range End:"
+msgstr "IP vahemiku lõpp:"
+
+#: ../../standalone/drakTermServ_.c:1001
 msgid "dhcpd Server Configuration"
-msgstr "ISDN s�tted"
+msgstr "Dhcpd serveri seadistamine"
 
-#: ../../standalone/drakTermServ_.c:874
+#: ../../standalone/drakTermServ_.c:1002
 msgid ""
 "Most of these values were extracted\n"
-"from your running system. You can modify as needed."
+"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_.c:875
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:1005
+msgid "Dynamic IP Address Pool:"
+msgstr "Dünaamiline IP-aadresside vahemik:"
+
+#: ../../standalone/drakTermServ_.c:1018
 msgid "Write Config"
-msgstr "seadista uuesti"
+msgstr "Salvesta seadistus"
 
-#: ../../standalone/drakTermServ_.c:965
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:1120
 msgid "Please insert floppy disk:"
-msgstr "Pane flopi seadmesse %s"
+msgstr "Sisestage palun flopi:"
 
-#: ../../standalone/drakTermServ_.c:969
+#: ../../standalone/drakTermServ_.c:1124
 msgid "Couldn't access the floppy!"
-msgstr ""
+msgstr "Ei suuda flopit leida!"
 
-#: ../../standalone/drakTermServ_.c:971
+#: ../../standalone/drakTermServ_.c:1126
 msgid "Floppy can be removed now"
-msgstr ""
+msgstr "Flopi võib nüüd välja võtta"
 
-#: ../../standalone/drakTermServ_.c:974
-#, fuzzy
+#: ../../standalone/drakTermServ_.c:1129
 msgid "No floppy drive available!"
-msgstr "Flopiseade ei ole k�ttesaadav"
+msgstr "Flopiseade ei ole kättesaadav!"
 
-#: ../../standalone/drakTermServ_.c:983
+#: ../../standalone/drakTermServ_.c:1138
 #, c-format
 msgid "Etherboot ISO image is %s"
-msgstr ""
+msgstr "Etherboot ISO-tõmmis on %s"
 
-#: ../../standalone/drakTermServ_.c:985
+#: ../../standalone/drakTermServ_.c:1140
 msgid "Something went wrong! - Is mkisofs installed?"
-msgstr ""
+msgstr "Midagi läks valesti! - Kas mkisofs on ikka paigaldatud?"
 
-#: ../../standalone/drakTermServ_.c:1004
+#: ../../standalone/drakTermServ_.c:1159
 msgid "Need to create /etc/dhcpd.conf first!"
-msgstr ""
+msgstr "Esmalt tuleb luua /etc/dhcpd.conf!"
 
-#: ../../standalone/drakautoinst_.c:43
-#, fuzzy
+#: ../../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_.c:40
 msgid "Error!"
-msgstr "Viga"
+msgstr "Viga!"
 
-#: ../../standalone/drakautoinst_.c:44
+#: ../../standalone/drakautoinst_.c:41
 #, c-format
 msgid "I can't find needed image file `%s'."
-msgstr ""
+msgstr "Ei suuda leida tõmmisefaili '%s'."
 
-#: ../../standalone/drakautoinst_.c:46
-#, fuzzy
+#: ../../standalone/drakautoinst_.c:43
 msgid "Auto Install Configurator"
-msgstr "Paigaldusj�rgsed s�tted"
+msgstr "Automaatpaigalduse seadistaja"
 
-#: ../../standalone/drakautoinst_.c:47
+#: ../../standalone/drakautoinst_.c:44
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
 "dangerous and must be used circumspectly.\n"
@@ -9949,104 +11135,135 @@ msgid ""
 "\n"
 "Do you want to continue?"
 msgstr ""
+"Püüate hakata seadistama automaatpaigalduse flopit. See on natuke ohtlik "
+"tegevus, mida tuleb teha väga ettevaatlikult.\n"
+"\n"
+"Seda võimalust kasutades saate korrata arvutile tehtud paigaldust ning mõne "
+"sammu puhul ka ise kaasa rääkida, et üksikuid väärtusi muuta.\n"
+"\n"
+"Täieliku turvalisuse huvides ei tuleks partitsioneerimist ja vormindamist "
+"kunagi lubada automaatselt sooritada, seda hoolimata sellest, millise "
+"võimaluse kasuks olete paigalduse algul otsustanud.\n"
+"\n"
+"Kas soovite nüüd jätkata?"
 
-#: ../../standalone/drakautoinst_.c:69
-#, fuzzy
+#: ../../standalone/drakautoinst_.c:62 ../../standalone/drakautoinst_.c:71
+msgid "manual"
+msgstr "käsitsi"
+
+#: ../../standalone/drakautoinst_.c:62
+msgid "replay"
+msgstr "korda"
+
+#: ../../standalone/drakautoinst_.c:66
 msgid "Automatic Steps Configuration"
-msgstr "Alglaaduri stiil"
+msgstr "Automaatsete sammude seadistamine"
 
-#: ../../standalone/drakautoinst_.c:70
+#: ../../standalone/drakautoinst_.c:67
 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:81 ../../standalone/drakautoinst_.c:82
-#, fuzzy
+#: ../../standalone/drakautoinst_.c:78 ../../standalone/drakautoinst_.c:79
 msgid "Creating auto install floppy"
-msgstr "Loon kiirpaigaldusflopi"
+msgstr "Automaatpaigaldusflopi loomine"
 
-#: ../../standalone/drakautoinst_.c:144
+#: ../../standalone/drakautoinst_.c:139
 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/drakautoinst_.c:239 ../../standalone/drakgw_.c:508
-#: ../../standalone/scannerdrake_.c:119
+#: ../../standalone/drakautoinst_.c:234 ../../standalone/drakgw_.c:504
+#: ../../standalone/scannerdrake_.c:117
 msgid "Congratulations!"
-msgstr "�nnitleme!"
+msgstr "Õnnitleme!"
 
-#: ../../standalone/drakautoinst_.c:240
+#: ../../standalone/drakautoinst_.c:235
 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/drakautoinst_.c:278
-#, fuzzy
+#: ../../standalone/drakautoinst_.c:273
 msgid "Auto Install"
-msgstr "Installimine"
+msgstr "Automaatpaigaldus"
 
-#: ../../standalone/drakautoinst_.c:348
-#, fuzzy
+#: ../../standalone/drakautoinst_.c:343
 msgid "Add an item"
-msgstr "Tavakasutaja"
+msgstr "Lisa element"
 
-#: ../../standalone/drakautoinst_.c:355
-#, fuzzy
+#: ../../standalone/drakautoinst_.c:350
 msgid "Remove the last item"
-msgstr "Vormindan loopback faili %s"
+msgstr "Eemalda viimane element"
 
-#: ../../standalone/drakbackup_.c:617
+#: ../../standalone/drakbackup_.c:580
 msgid "Cron not available yet as non-root"
-msgstr ""
+msgstr "Cron ei ole veel saadaval mitteadministraatorile"
 
-#: ../../standalone/drakbackup_.c:723
+#: ../../standalone/drakbackup_.c:690
 msgid "WARNING"
-msgstr ""
+msgstr "HOIATUS"
 
-#: ../../standalone/drakbackup_.c:724
-#, fuzzy
+#: ../../standalone/drakbackup_.c:691
 msgid "FATAL"
-msgstr "FAT"
+msgstr "SAATUSLIK"
 
-#: ../../standalone/drakbackup_.c:725
+#: ../../standalone/drakbackup_.c:692
 msgid "INFO"
-msgstr ""
+msgstr "INFO"
 
-#: ../../standalone/drakbackup_.c:737
+#: ../../standalone/drakbackup_.c:704
 msgid ""
 "\n"
 "                      DrakBackup Report \n"
 "\n"
 msgstr ""
+"\n"
+"                      DrakBackupi raport \n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:738
+#: ../../standalone/drakbackup_.c:705
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
 "\n"
 "\n"
 msgstr ""
+"\n"
+"                      DrakBackup deemoni raport\n"
+"\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:742
+#: ../../standalone/drakbackup_.c:709
 msgid ""
 "\n"
 "                    DrakBackup Report Details\n"
 "\n"
 "\n"
 msgstr ""
+"\n"
+"                      DrakBackupi raporti üksikasjad\n"
+"\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:763 ../../standalone/drakbackup_.c:836
-#: ../../standalone/drakbackup_.c:891
-#, fuzzy
+#: ../../standalone/drakbackup_.c:730 ../../standalone/drakbackup_.c:803
+#: ../../standalone/drakbackup_.c:859
 msgid "Total progess"
-msgstr "Proovin porte"
+msgstr "Edenemine kokku"
 
-#: ../../standalone/drakbackup_.c:818
+#: ../../standalone/drakbackup_.c:785
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -10054,42 +11271,46 @@ msgid ""
 "Warning: If you've already done this process you'll probably\n"
 " need to purge the entry from authorized_keys on the server."
 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:827
+#: ../../standalone/drakbackup_.c:794
 msgid "This may take a moment to generate the keys."
-msgstr ""
+msgstr "Võtmete genereerimine võtab mõne hetke aega."
 
-#: ../../standalone/drakbackup_.c:834
+#: ../../standalone/drakbackup_.c:801
 #, c-format
 msgid "ERROR: Cannot spawn %s."
-msgstr ""
+msgstr "VIGA: %s tekitamine ebaõnnestus."
 
-#: ../../standalone/drakbackup_.c:851
+#: ../../standalone/drakbackup_.c:818
 #, c-format
 msgid "No password prompt on %s at port %s"
-msgstr ""
+msgstr "Parooli ei pärita masinal %s pordis %s"
 
-#: ../../standalone/drakbackup_.c:852
-#, fuzzy, c-format
+#: ../../standalone/drakbackup_.c:819
+#, c-format
 msgid "Bad password on %s"
-msgstr "Salas�na puudub"
+msgstr "Halb parool %s puhul"
 
-#: ../../standalone/drakbackup_.c:853
+#: ../../standalone/drakbackup_.c:820
 #, c-format
 msgid "Permission denied transferring %s to %s"
-msgstr ""
+msgstr "%s ülekandmiseks %s -le puudub luba"
 
-#: ../../standalone/drakbackup_.c:854
-#, fuzzy, c-format
+#: ../../standalone/drakbackup_.c:821
+#, c-format
 msgid "Can't find %s on %s"
-msgstr "V�rgukaart %s: %s"
+msgstr "%s leidmine %s -l ebaõnnestus"
 
-#: ../../standalone/drakbackup_.c:857
+#: ../../standalone/drakbackup_.c:824
 #, c-format
 msgid "%s not responding"
-msgstr ""
+msgstr "%s ei vasta"
 
-#: ../../standalone/drakbackup_.c:861
+#: ../../standalone/drakbackup_.c:828
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -10099,998 +11320,1000 @@ msgid ""
 "\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:905
+#: ../../standalone/drakbackup_.c:873
 msgid "WebDAV remote site already in sync!"
-msgstr ""
+msgstr "WebDAVi kaugsait on juba sünkroonis!"
 
-#: ../../standalone/drakbackup_.c:909
+#: ../../standalone/drakbackup_.c:877
 msgid "WebDAV transfer failed!"
-msgstr ""
+msgstr "WebDAVi ülekanne ebaõnnestus!"
 
-#: ../../standalone/drakbackup_.c:930
+#: ../../standalone/drakbackup_.c:898
 msgid "No CDR/DVDR in drive!"
-msgstr ""
+msgstr "CDR/DVDR ei ole seadmes!"
 
-#: ../../standalone/drakbackup_.c:934
+#: ../../standalone/drakbackup_.c:902
 msgid "Does not appear to be recordable media!"
-msgstr ""
+msgstr "See ei paista küll olevat kirjutatav andmekandja!"
 
-#: ../../standalone/drakbackup_.c:938
+#: ../../standalone/drakbackup_.c:906
 msgid "Not erasable media!"
-msgstr ""
+msgstr "Seda andmekandjat ei saa puhastada!"
 
-#: ../../standalone/drakbackup_.c:977
+#: ../../standalone/drakbackup_.c:945
 msgid "This may take a moment to erase the media."
-msgstr ""
+msgstr "Andmekandja puhastamine võtab mõni hetk aega."
 
-#: ../../standalone/drakbackup_.c:1062
+#: ../../standalone/drakbackup_.c:1033
 msgid "Permission problem accessing CD."
-msgstr ""
+msgstr "CD-le ligipääsul tekkis loaprobleem."
 
-#: ../../standalone/drakbackup_.c:1089
+#: ../../standalone/drakbackup_.c:1060
 #, c-format
 msgid "No tape in %s!"
-msgstr ""
+msgstr "Seadmes %s puudub lint!"
 
-#: ../../standalone/drakbackup_.c:1201 ../../standalone/drakbackup_.c:1250
+#: ../../standalone/drakbackup_.c:1174 ../../standalone/drakbackup_.c:1223
 msgid "Backup system files..."
-msgstr ""
+msgstr "Süsteemsete failide varundamine..."
 
-#: ../../standalone/drakbackup_.c:1251 ../../standalone/drakbackup_.c:1318
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1224 ../../standalone/drakbackup_.c:1291
 msgid "Hard Disk Backup files..."
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Kõvaketta varundamine..."
 
-#: ../../standalone/drakbackup_.c:1263
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1236
 msgid "Backup User files..."
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Kasutajafailide varundamine..."
 
-#: ../../standalone/drakbackup_.c:1264
+#: ../../standalone/drakbackup_.c:1237
 msgid "Hard Disk Backup Progress..."
-msgstr ""
+msgstr "Kõvaketta varundamise edenemine..."
 
-#: ../../standalone/drakbackup_.c:1317
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1290
 msgid "Backup Other files..."
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Muude failide varundamine..."
 
-#: ../../standalone/drakbackup_.c:1323
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1296
 msgid "No changes to backup!"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Varukoopiaga võrreldes pole mingeid muutusi!"
 
-#: ../../standalone/drakbackup_.c:1339 ../../standalone/drakbackup_.c:1362
+#: ../../standalone/drakbackup_.c:1312 ../../standalone/drakbackup_.c:1335
 #, c-format
 msgid ""
 "\n"
 "Drakbackup activities via %s:\n"
 "\n"
 msgstr ""
+"\n"
+"Drakbackupi tegevus %s vahendusel:\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:1346
+#: ../../standalone/drakbackup_.c:1319
 #, c-format
 msgid ""
 "file list sent by FTP: %s\n"
 " "
 msgstr ""
+"FTP kaudu saadetud faililoend: %s\n"
+" "
 
-#: ../../standalone/drakbackup_.c:1349
+#: ../../standalone/drakbackup_.c:1322
 msgid ""
 "\n"
 " FTP connection problem: It was not possible to send your backup files by "
 "FTP.\n"
 msgstr ""
+"\n"
+" FTP ühenduse probleem: FTP kaudu pole võimalik saata Teie varukoopiafaile.\n"
 
-#: ../../standalone/drakbackup_.c:1367
+#: ../../standalone/drakbackup_.c:1340
 msgid ""
 "\n"
 "Drakbackup activities via CD:\n"
 "\n"
 msgstr ""
+"\n"
+"Drakbackupi tegevus CD vahendusel:\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:1372
+#: ../../standalone/drakbackup_.c:1345
 msgid ""
 "\n"
 "Drakbackup activities via tape:\n"
 "\n"
 msgstr ""
+"\n"
+"Drakbackupi tegevus lindi vahendusel:\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:1381
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1354
 msgid " Error during mail sending. \n"
-msgstr "Viga faili %s lugemisel"
+msgstr " Viga meili saatmisel. \n"
 
-#: ../../standalone/drakbackup_.c:1406
+#: ../../standalone/drakbackup_.c:1380
 msgid "Can't create catalog!"
-msgstr ""
+msgstr "Kataloogi ei õnnestunud luua!"
 
-#: ../../standalone/drakbackup_.c:1519 ../../standalone/drakbackup_.c:1530
-#: ../../standalone/drakfont_.c:1004
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1490 ../../standalone/drakbackup_.c:1501
+#: ../../standalone/drakfont_.c:946
 msgid "File Selection"
-msgstr "Paketigruppide valik"
+msgstr "Failivalik"
 
-#: ../../standalone/drakbackup_.c:1558
+#: ../../standalone/drakbackup_.c:1529
 msgid "Select the files or directories and click on 'Add'"
-msgstr ""
+msgstr "Valige failid või kataloogid ja klõpsake 'Lisa'"
 
-#: ../../standalone/drakbackup_.c:1602
+#: ../../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_.c:1603
+#: ../../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_.c:1604
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1575
 msgid "Backup your System files. (/etc directory)"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Varunda süsteemsed failid (kataloog /etc)"
 
-#: ../../standalone/drakbackup_.c:1605
+#: ../../standalone/drakbackup_.c:1576
 msgid "Use incremental backup  (do not replace old backups)"
-msgstr ""
+msgstr "Muutvarunduse kasutamine  (vanu varukoopiaid ei asendata)"
 
-#: ../../standalone/drakbackup_.c:1606
+#: ../../standalone/drakbackup_.c:1577
 msgid "Do not include critical files (passwd, group, fstab)"
-msgstr ""
+msgstr "Kriitiliste failide kõrvalejätmine (passwd, group, fstab)"
 
-#: ../../standalone/drakbackup_.c:1607
+#: ../../standalone/drakbackup_.c:1578
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
-msgstr ""
+msgstr "Selle valikuga võite taastada kataloogi /etc suvalise versiooni."
 
-#: ../../standalone/drakbackup_.c:1624
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1595
 msgid "Please check all users that you want to include in your backup."
-msgstr "Palun valige paketid installimiseks"
+msgstr "Märkige palun kõik kasutajad, keda soovite varukoopiasse kaasata."
 
-#: ../../standalone/drakbackup_.c:1651
+#: ../../standalone/drakbackup_.c:1622
 msgid "Do not include the browser cache"
-msgstr ""
+msgstr "Veebilehitseja mälupuhvri kõrvalejätmine"
 
-#: ../../standalone/drakbackup_.c:1652 ../../standalone/drakbackup_.c:1676
+#: ../../standalone/drakbackup_.c:1623 ../../standalone/drakbackup_.c:1647
 msgid "Use Incremental Backups  (do not replace old backups)"
-msgstr ""
+msgstr "Muutvarunduse kasutamine (vanu varukoopiaid ei asendata)"
 
-#: ../../standalone/drakbackup_.c:1674 ../../standalone/drakfont_.c:1058
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1645 ../../standalone/drakfont_.c:1000
 msgid "Remove Selected"
-msgstr "Eemalda prindij�rjekord"
+msgstr "Eemalda valitud"
 
-#: ../../standalone/drakbackup_.c:1712
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1679
 msgid "Windows (FAT32)"
-msgstr "Eemalda Windows(TM)"
+msgstr "Windows (FAT32)"
 
-#: ../../standalone/drakbackup_.c:1751
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1714
 msgid "Users"
-msgstr "Kasutajatunnus"
+msgstr "Kasutajad"
 
-#: ../../standalone/drakbackup_.c:1777
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1740
 msgid "Use network connection to backup"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Võrguühenduse kasutamine varundamiseks"
 
-#: ../../standalone/drakbackup_.c:1779
+#: ../../standalone/drakbackup_.c:1742
 msgid "Net Method:"
-msgstr ""
+msgstr "Võrgumeetod:"
 
-#: ../../standalone/drakbackup_.c:1783
+#: ../../standalone/drakbackup_.c:1746
 msgid "Use Expect for SSH"
-msgstr ""
+msgstr "Expecti kasutamine SSH jaoks"
 
-#: ../../standalone/drakbackup_.c:1784
+#: ../../standalone/drakbackup_.c:1747
 msgid ""
 "Create/Transfer\n"
 "backup keys for SSH"
 msgstr ""
+"Loo/Kanna üle\n"
+"varundusvõtmed SSH jaoks"
 
-#: ../../standalone/drakbackup_.c:1785
+#: ../../standalone/drakbackup_.c:1748
 msgid ""
 "  Transfer  \n"
 "Now"
 msgstr ""
+"  Kanna üle  \n"
+"Nüüd"
 
-#: ../../standalone/drakbackup_.c:1786
+#: ../../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_.c:1790
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1753
 msgid "Please enter the host name or IP."
-msgstr "Palun testige hiirt"
+msgstr "Sisestage palun masinanimi või IP."
 
-#: ../../standalone/drakbackup_.c:1795
+#: ../../standalone/drakbackup_.c:1758
 msgid ""
 "Please enter the directory (or module) to\n"
 " put the backup on this host."
 msgstr ""
+"Sisestage palun kataloog (või moodul), kuhu\n"
+" sellel masinal varukoopia salvestada."
 
-#: ../../standalone/drakbackup_.c:1800
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1763
 msgid "Please enter your login"
-msgstr "Palun proovige veel"
+msgstr "Sisestage palun kasutajatunnus"
 
-#: ../../standalone/drakbackup_.c:1805
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1768
 msgid "Please enter your password"
-msgstr "Palun proovige veel"
+msgstr "Sisestage palun parool"
 
-#: ../../standalone/drakbackup_.c:1811
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1774
 msgid "Remember this password"
-msgstr "Salas�na puudub"
+msgstr "Jäta parool meelde"
 
-#: ../../standalone/drakbackup_.c:1822
+#: ../../standalone/drakbackup_.c:1785
 msgid "Need hostname, username and password!"
-msgstr ""
+msgstr "Vaja läheb masinanime, kasutajatunnust ja parooli!"
 
-#: ../../standalone/drakbackup_.c:1917
+#: ../../standalone/drakbackup_.c:1879
 msgid "Use CD/DVDROM to backup"
-msgstr ""
+msgstr "Varundamine CD/DVDROM-ile"
 
-#: ../../standalone/drakbackup_.c:1920
+#: ../../standalone/drakbackup_.c:1882
 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:1925
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1887
 msgid "Please choose your CD/DVD media size (Mb)"
-msgstr "Palun valige klaviatuuriasetus"
+msgstr "Valige palun CD/DVD andmekandja suurus (Mb)"
 
-#: ../../standalone/drakbackup_.c:1931
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1893
 msgid "Please check for multisession CD"
-msgstr "Palun valige partitsioon"
+msgstr "Märkige palun mitmeseansilise CD korral"
 
-#: ../../standalone/drakbackup_.c:1937
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1899
 msgid "Please check if you are using CDRW media"
-msgstr "Palun valige partitsioon"
+msgstr "Märkige palun, kui kasutate CDRW andmekandjat"
 
-#: ../../standalone/drakbackup_.c:1943
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1905
 msgid "Please check if you want to erase your RW media (1st Session)"
-msgstr "Palun valige partitsioon"
+msgstr ""
+"Märkige palun, kui soovite puhastada oma RW andmekandja (esimene seanss)"
 
-#: ../../standalone/drakbackup_.c:1944
+#: ../../standalone/drakbackup_.c:1906
 msgid " Erase Now "
-msgstr ""
+msgstr " Puhasta nüüd! "
 
-#: ../../standalone/drakbackup_.c:1950
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1912
 msgid "Please check if you are using a DVDR device"
-msgstr "Palun valige partitsioon"
+msgstr "Märkige palun, kui kasutate DVDR seadet"
 
-#: ../../standalone/drakbackup_.c:1956
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1918
 msgid "Please check if you are using a DVDRAM device"
-msgstr "Palun valige partitsioon"
+msgstr "Märkige palun, kui kasutate DVDRAM seadet"
 
-#: ../../standalone/drakbackup_.c:1969
+#: ../../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_.c:2002
-#, fuzzy
+#: ../../standalone/drakbackup_.c:1964
 msgid "No CD device defined!"
-msgstr "Valige fail"
+msgstr "CD-seade on määramata!"
 
-#: ../../standalone/drakbackup_.c:2050
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2012
 msgid "Use tape to backup"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Varundamine lindile"
 
-#: ../../standalone/drakbackup_.c:2053
+#: ../../standalone/drakbackup_.c:2015
 msgid "Please enter the device name to use for backup"
-msgstr ""
+msgstr "Sisestaga palun varundamiseks kasutatava seadme nimi"
 
-#: ../../standalone/drakbackup_.c:2059
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2021
 msgid "Please check if you want to use the non-rewinding device."
-msgstr "Palun valige paketid installimiseks"
+msgstr "Märkige palun, kui soovite kasutada tagasikerimisvõimaluseta seadet."
 
-#: ../../standalone/drakbackup_.c:2065
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2027
 msgid "Please check if you want to erase your tape before the backup."
-msgstr "Palun valige paketid installimiseks"
+msgstr "Märkige palun, kui soovite lindi enne varundamist puhastada."
 
-#: ../../standalone/drakbackup_.c:2071
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2033
 msgid "Please check if you want to eject your tape after the backup."
-msgstr "Palun valige paketid installimiseks"
+msgstr "Märkige palun, kui soovite pärast varundamist lindi väljastamist."
 
-#: ../../standalone/drakbackup_.c:2077 ../../standalone/drakbackup_.c:2151
-#: ../../standalone/drakbackup_.c:3118
+#: ../../standalone/drakbackup_.c:2039 ../../standalone/drakbackup_.c:2112
+#: ../../standalone/drakbackup_.c:3068
 msgid ""
 "Please enter the maximum size\n"
 " allowed for Drakbackup"
 msgstr ""
+"Sisestage palun Drakbackupi\n"
+" suurim lubatud suurus"
 
-#: ../../standalone/drakbackup_.c:2142
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2103
 msgid "Please enter the directory to save to:"
-msgstr "Palun testige hiirt"
+msgstr "Sisestage palun kataloog, kuhu salvestada:"
 
-#: ../../standalone/drakbackup_.c:2157 ../../standalone/drakbackup_.c:3124
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2118 ../../standalone/drakbackup_.c:3074
 msgid "Use quota for backup files."
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Kvootide kasutamine varukoopiafailidel."
 
-#: ../../standalone/drakbackup_.c:2223
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2180
 msgid "Network"
-msgstr "V�rgu mask:"
+msgstr "Võrk"
 
-#: ../../standalone/drakbackup_.c:2228
+#: ../../standalone/drakbackup_.c:2185
 msgid "CDROM / DVDROM"
-msgstr ""
+msgstr "CDROM / DVDROM"
 
-#: ../../standalone/drakbackup_.c:2233
+#: ../../standalone/drakbackup_.c:2190
 msgid "HardDrive / NFS"
-msgstr ""
+msgstr "Kõvaketas / NFS"
 
-#: ../../standalone/drakbackup_.c:2238
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2195
 msgid "Tape"
-msgstr "T��p"
+msgstr "Lint"
 
-#: ../../standalone/drakbackup_.c:2252 ../../standalone/drakbackup_.c:2256
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2208 ../../standalone/drakbackup_.c:2212
+#: ../../standalone/drakbackup_.c:2216
 msgid "hourly"
-msgstr ""
+msgstr "iga tund"
 
-#: ../../standalone/drakbackup_.c:2253 ../../standalone/drakbackup_.c:2257
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2209 ../../standalone/drakbackup_.c:2213
+#: ../../standalone/drakbackup_.c:2216
 msgid "daily"
-msgstr ""
+msgstr "iga päev"
 
-#: ../../standalone/drakbackup_.c:2254 ../../standalone/drakbackup_.c:2258
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2210 ../../standalone/drakbackup_.c:2214
+#: ../../standalone/drakbackup_.c:2216
 msgid "weekly"
-msgstr ""
+msgstr "iga nädal"
 
-#: ../../standalone/drakbackup_.c:2255 ../../standalone/drakbackup_.c:2259
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2211 ../../standalone/drakbackup_.c:2215
+#: ../../standalone/drakbackup_.c:2216
 msgid "monthly"
-msgstr ""
+msgstr "iga kuu"
 
-#: ../../standalone/drakbackup_.c:2273
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2229
 msgid "Use daemon"
-msgstr "Kasutajatunnus"
+msgstr "Deemoni kasutamine"
 
-#: ../../standalone/drakbackup_.c:2278
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2234
 msgid ""
 "Please choose the time \n"
 "interval between each backup"
-msgstr "Palun valige paketid installimiseks"
+msgstr ""
+"Valige palun varundamiste\n"
+"vaheline ajaline intervall"
 
-#: ../../standalone/drakbackup_.c:2284
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2240
 msgid ""
 "Please choose the\n"
 "media for backup."
-msgstr "Palun valige kasutatav keel"
+msgstr ""
+"Valige palun varundamiseks\n"
+"kasutatav andmekandja."
 
-#: ../../standalone/drakbackup_.c:2291
+#: ../../standalone/drakbackup_.c:2247
 msgid ""
 "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 ""
+"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:2328
+#: ../../standalone/drakbackup_.c:2283
 msgid "Send mail report after each backup to:"
-msgstr ""
+msgstr "Saada pärast iga varundamist meiliraport aadressile:"
 
-#: ../../standalone/drakbackup_.c:2334
+#: ../../standalone/drakbackup_.c:2289
 msgid "Delete Hard Drive tar files after backup to other media."
-msgstr ""
+msgstr "Kustuta tar-failid kõvakettalt pärast varundamist muule andmekandjale."
 
-#: ../../standalone/drakbackup_.c:2373
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2324
 msgid "What"
-msgstr "Oodake"
+msgstr "Mis"
 
-#: ../../standalone/drakbackup_.c:2378
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2329
 msgid "Where"
-msgstr "Ratas"
+msgstr "Kus"
 
-#: ../../standalone/drakbackup_.c:2383
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2334
 msgid "When"
-msgstr "Ratas"
+msgstr "Millal"
 
-#: ../../standalone/drakbackup_.c:2388
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2339
 msgid "More Options"
-msgstr "Mooduli parameetrid:"
+msgstr "Rohkem valikuid"
 
-#: ../../standalone/drakbackup_.c:2407 ../../standalone/drakbackup_.c:4532
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2358 ../../standalone/drakbackup_.c:4444
 msgid "Drakbackup Configuration"
-msgstr "V�rgu s�tted"
+msgstr "Drakbackupi sätted"
 
-#: ../../standalone/drakbackup_.c:2425
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2376
 msgid "Please choose where you want to backup"
-msgstr "Palun valige paketid installimiseks"
+msgstr "Valige palun, kuhu soovite varukoopia salvestada"
 
-#: ../../standalone/drakbackup_.c:2427
+#: ../../standalone/drakbackup_.c:2378
 msgid "on Hard Drive"
-msgstr ""
+msgstr "kõvakettale"
 
-#: ../../standalone/drakbackup_.c:2437
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2388
 msgid "across Network"
-msgstr "V�rgu mask:"
+msgstr "üle võrgu"
 
-#: ../../standalone/drakbackup_.c:2447
+#: ../../standalone/drakbackup_.c:2398
 msgid "on CDROM"
-msgstr ""
+msgstr "CDROM-ile"
 
-#: ../../standalone/drakbackup_.c:2455
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2406
 msgid "on Tape Device"
-msgstr "Printeri seade"
+msgstr "lindiseadmele"
 
-#: ../../standalone/drakbackup_.c:2498
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2449
 msgid "Please choose what you want to backup"
-msgstr "Palun valige paketid installimiseks"
+msgstr "Valige palun, mida soovite varundada"
 
-#: ../../standalone/drakbackup_.c:2499
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2450
 msgid "Backup system"
-msgstr "Failis�steemid"
+msgstr "süsteemseid faile"
 
-#: ../../standalone/drakbackup_.c:2500
+#: ../../standalone/drakbackup_.c:2451
 msgid "Backup Users"
-msgstr ""
+msgstr "kasutajate faile"
 
-#: ../../standalone/drakbackup_.c:2503
+#: ../../standalone/drakbackup_.c:2454
 msgid "Select user manually"
-msgstr ""
+msgstr "Kasutaja valik käsitsi"
 
-#: ../../standalone/drakbackup_.c:2586
+#: ../../standalone/drakbackup_.c:2537
 msgid ""
 "\n"
 "Backup Sources: \n"
 msgstr ""
+"\n"
+"Varundusallikad: \n"
 
-#: ../../standalone/drakbackup_.c:2587
+#: ../../standalone/drakbackup_.c:2538
 msgid ""
 "\n"
 "- System Files:\n"
 msgstr ""
+"\n"
+"- süsteemsed failid:\n"
 
-#: ../../standalone/drakbackup_.c:2589
+#: ../../standalone/drakbackup_.c:2540
 msgid ""
 "\n"
 "- User Files:\n"
 msgstr ""
+"\n"
+"- kasutaja failid.\n"
 
-#: ../../standalone/drakbackup_.c:2591
+#: ../../standalone/drakbackup_.c:2542
 msgid ""
 "\n"
 "- Other Files:\n"
 msgstr ""
+"\n"
+"- muud failid:\n"
 
-#: ../../standalone/drakbackup_.c:2593
+#: ../../standalone/drakbackup_.c:2544
 #, c-format
 msgid ""
 "\n"
 "- Save on Hard drive on path: %s\n"
 msgstr ""
+"\n"
+"- salvesta kõvakettale asukohta: %s\n"
 
-#: ../../standalone/drakbackup_.c:2596
+#: ../../standalone/drakbackup_.c:2547
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
 msgstr ""
+"\n"
+"- kustuta pärast varundamist kõvakettalt tar-failid.\n"
 
-#: ../../standalone/drakbackup_.c:2602
+#: ../../standalone/drakbackup_.c:2553
 msgid ""
 "\n"
 "- Burn to CD"
 msgstr ""
+"\n"
+"- kirjuta CD-le"
 
-#: ../../standalone/drakbackup_.c:2603
+#: ../../standalone/drakbackup_.c:2554
 msgid "RW"
-msgstr ""
+msgstr "RW"
 
-#: ../../standalone/drakbackup_.c:2604
-#, fuzzy, c-format
+#: ../../standalone/drakbackup_.c:2555
+#, c-format
 msgid " on device: %s"
-msgstr "Hiire port: %s\n"
+msgstr " seadmel: %s"
 
-#: ../../standalone/drakbackup_.c:2605
+#: ../../standalone/drakbackup_.c:2556
 msgid " (multi-session)"
-msgstr ""
+msgstr " (mitmeseansiline)"
 
-#: ../../standalone/drakbackup_.c:2606
+#: ../../standalone/drakbackup_.c:2557
 #, c-format
 msgid ""
 "\n"
 "- Save to Tape on device: %s"
 msgstr ""
+"\n"
+"- salvesta lindile seadmel: %s"
 
-#: ../../standalone/drakbackup_.c:2607
+#: ../../standalone/drakbackup_.c:2558
 #, c-format
 msgid "\t\tErase=%s"
-msgstr ""
+msgstr "\t\tPuhasta=%s"
 
-#: ../../standalone/drakbackup_.c:2610
+#: ../../standalone/drakbackup_.c:2561
 #, c-format
 msgid ""
 "\n"
 "- Save via %s on host: %s\n"
 msgstr ""
+"\n"
+"- salvesta %s vahendusel masinale: %s\n"
 
-#: ../../standalone/drakbackup_.c:2611
+#: ../../standalone/drakbackup_.c:2562
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
 "\t\t on path: %s \n"
 msgstr ""
+"\t\t kasutajatunnus: %s\n"
+"\t\t asukohas: %s \n"
 
-#: ../../standalone/drakbackup_.c:2612
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2563
 msgid ""
 "\n"
 "- Options:\n"
-msgstr "Eelistused"
+msgstr ""
+"\n"
+"- valikud:\n"
 
-#: ../../standalone/drakbackup_.c:2613
+#: ../../standalone/drakbackup_.c:2564
 msgid "\tDo not include System Files\n"
-msgstr ""
+msgstr "\tsüsteemsete failide kõrvalejätmine\n"
 
-#: ../../standalone/drakbackup_.c:2616
+#: ../../standalone/drakbackup_.c:2567
 msgid "\tBackups use tar and bzip2\n"
-msgstr ""
+msgstr "\tvarukoopiad tar- ja bzip2-vormingus\n"
 
-#: ../../standalone/drakbackup_.c:2618
+#: ../../standalone/drakbackup_.c:2569
 msgid "\tBackups use tar and gzip\n"
-msgstr ""
+msgstr "\tvarukoopiad tar- ja gzip-vormingus\n"
 
-#: ../../standalone/drakbackup_.c:2621
+#: ../../standalone/drakbackup_.c:2572
 #, c-format
 msgid ""
 "\n"
 "- Daemon (%s) include:\n"
 msgstr ""
+"\n"
+"- deemon (%s) sisaldab:\n"
 
-#: ../../standalone/drakbackup_.c:2622
+#: ../../standalone/drakbackup_.c:2573
 msgid "\t-Hard drive.\n"
-msgstr ""
+msgstr "\t-kõvaketas.\n"
 
-#: ../../standalone/drakbackup_.c:2623
+#: ../../standalone/drakbackup_.c:2574
 msgid "\t-CDROM.\n"
-msgstr ""
+msgstr "\t-CDROM.\n"
 
-#: ../../standalone/drakbackup_.c:2624
+#: ../../standalone/drakbackup_.c:2575
 msgid "\t-Tape \n"
-msgstr ""
+msgstr "\t-lint \n"
 
-#: ../../standalone/drakbackup_.c:2625
+#: ../../standalone/drakbackup_.c:2576
 msgid "\t-Network by FTP.\n"
-msgstr ""
+msgstr "\t-võrk FTP vahendusel.\n"
 
-#: ../../standalone/drakbackup_.c:2626
+#: ../../standalone/drakbackup_.c:2577
 msgid "\t-Network by SSH.\n"
-msgstr ""
+msgstr "\t-võrk SSH vahendusel.\n"
 
-#: ../../standalone/drakbackup_.c:2627
+#: ../../standalone/drakbackup_.c:2578
 msgid "\t-Network by rsync.\n"
-msgstr ""
+msgstr "\t-võrk rsync vahendusel.\n"
 
-#: ../../standalone/drakbackup_.c:2628
+#: ../../standalone/drakbackup_.c:2579
 msgid "\t-Network by webdav.\n"
-msgstr ""
+msgstr "\t-võrk webdavi vahendusel.\n"
 
-#: ../../standalone/drakbackup_.c:2630
+#: ../../standalone/drakbackup_.c:2581
 msgid "No configuration, please click Wizard or Advanced.\n"
-msgstr ""
+msgstr "Seadistus puudub, palun tehke klõps nupul Nõustaja või Muud.\n"
 
-#: ../../standalone/drakbackup_.c:2636
+#: ../../standalone/drakbackup_.c:2587
 msgid ""
 "List of data to restore:\n"
 "\n"
 msgstr ""
+"Taastatavate andmete loend:\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:2803
+#: ../../standalone/drakbackup_.c:2754
 msgid ""
 "List of data corrupted:\n"
 "\n"
 msgstr ""
+"Vigaste andmete loend:\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:2805
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2756
 msgid "Please uncheck or remove it on next time."
-msgstr "Millisesse seerialporti on Teie modem �hendatud?"
+msgstr "Palun tühistage valik või eemaldage järgmisel korral."
 
-#: ../../standalone/drakbackup_.c:2815
+#: ../../standalone/drakbackup_.c:2766
 msgid "Backup files are corrupted"
-msgstr ""
+msgstr "Varukoopia failid on vigased"
 
-#: ../../standalone/drakbackup_.c:2836
+#: ../../standalone/drakbackup_.c:2787
 msgid "          All of your selected data have been          "
-msgstr ""
+msgstr "          Kõik valitud andmed on           "
 
-#: ../../standalone/drakbackup_.c:2837
+#: ../../standalone/drakbackup_.c:2788
 #, c-format
 msgid "          Successfuly Restored on %s       "
-msgstr ""
+msgstr "         edukalt taastatud %s -l       "
 
-#: ../../standalone/drakbackup_.c:2955
-#, fuzzy
+#: ../../standalone/drakbackup_.c:2906
 msgid "         Restore Configuration       "
-msgstr "V�rgu s�tted"
+msgstr "         Taastamise seadistamine       "
 
-#: ../../standalone/drakbackup_.c:2973
+#: ../../standalone/drakbackup_.c:2924
 msgid "OK to restore the other files."
-msgstr ""
+msgstr "Muude failide taastamiseks vajuta 'Olgu'."
 
-#: ../../standalone/drakbackup_.c:2990
+#: ../../standalone/drakbackup_.c:2941
 msgid "User list to restore (only the most recent date per user is important)"
-msgstr ""
+msgstr "Taastatav kasutajate loend (olulised on ainult kõige uuemad andmed)"
 
-#: ../../standalone/drakbackup_.c:3068
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3019
 msgid "Backup the system files before:"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Varunda süsteemsed failid, mis on loodud enne:"
 
-#: ../../standalone/drakbackup_.c:3070
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3021
 msgid "please choose the date to restore"
-msgstr "Palun valige hiire t��p"
+msgstr "valige palun daatum, kust taastada"
 
-#: ../../standalone/drakbackup_.c:3107
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3057
 msgid "Use Hard Disk to backup"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Varundamine kõvakettale"
 
-#: ../../standalone/drakbackup_.c:3110
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3060
 msgid "Please enter the directory to save:"
-msgstr "Palun testige hiirt"
+msgstr "Sisestage palun kataloog, kuhu salvestada:"
 
-#: ../../standalone/drakbackup_.c:3153
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3103
 msgid "FTP Connection"
-msgstr "LAN �hendus"
+msgstr "FTP ühendus"
 
-#: ../../standalone/drakbackup_.c:3160
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3110
 msgid "Secure Connection"
-msgstr "Vali printeri �hendusviis"
+msgstr "Turvaline ühendus"
 
-#: ../../standalone/drakbackup_.c:3186
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3134
 msgid "Restore from Hard Disk."
-msgstr "Taasta flopilt"
+msgstr "Taastamine kõvakettalt."
 
-#: ../../standalone/drakbackup_.c:3188
+#: ../../standalone/drakbackup_.c:3136
 msgid "Please enter the directory where backups are stored"
-msgstr ""
+msgstr "Sisestage palun kataloog, kuhu varukoopiad on salvestatud"
 
-#: ../../standalone/drakbackup_.c:3256
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3204
 msgid "Select another media to restore from"
-msgstr "Palun valige hiire t��p"
+msgstr "Valige muu andmekandja, millelt taastada"
 
-#: ../../standalone/drakbackup_.c:3258
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3206
 msgid "Other Media"
-msgstr "Muu"
+msgstr "Muu andmekandja"
 
-#: ../../standalone/drakbackup_.c:3263
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3211
 msgid "Restore system"
-msgstr "S�steemi installimine"
+msgstr "Süsteemi taastamine"
 
-#: ../../standalone/drakbackup_.c:3264
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3212
 msgid "Restore Users"
-msgstr "Taasta failist"
+msgstr "Kasutajate taastamine"
 
-#: ../../standalone/drakbackup_.c:3265
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3213
 msgid "Restore Other"
-msgstr "Taasta failist"
+msgstr "Muu taastamine"
 
-#: ../../standalone/drakbackup_.c:3267
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3215
 msgid "select path to restore (instead of /)"
-msgstr "Palun valige hiire t��p"
+msgstr "valige asukoht, kuhu taastada (kui ei ole /)"
 
-#: ../../standalone/drakbackup_.c:3271
+#: ../../standalone/drakbackup_.c:3219
 msgid "Do new backup before restore (only for incremental backups.)"
-msgstr ""
+msgstr "Uus varundamine enne taastamist (ainult muutvarunduse puhul)"
 
-#: ../../standalone/drakbackup_.c:3273
+#: ../../standalone/drakbackup_.c:3221
 msgid "Remove user directories before restore."
-msgstr ""
+msgstr "Kasutaja kataloogide eemaldamine enne taastamist."
 
-#: ../../standalone/drakbackup_.c:3386
+#: ../../standalone/drakbackup_.c:3334
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
 msgstr ""
+"Taasta valitud\n"
+"kataloogikirje"
 
-#: ../../standalone/drakbackup_.c:3396
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3344
 msgid ""
 "Restore Selected\n"
 "Files"
-msgstr "Eemalda prindij�rjekord"
+msgstr ""
+"Taasta valitud\n"
+"failid"
 
-#: ../../standalone/drakbackup_.c:3413
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3361
 msgid ""
 "Change\n"
 "Restore Path"
-msgstr "Taasta failist"
+msgstr ""
+"Muuda\n"
+"taastamise asukohta"
 
-#: ../../standalone/drakbackup_.c:3479
+#: ../../standalone/drakbackup_.c:3427
 #, c-format
 msgid "Backup files not found at %s."
-msgstr ""
+msgstr "%s ei sisaldanud varukoopiafaile."
 
-#: ../../standalone/drakbackup_.c:3492
+#: ../../standalone/drakbackup_.c:3440
 #, 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"
 
-#: ../../standalone/drakbackup_.c:3492
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3440
 msgid "Restore From CD"
-msgstr "Taasta flopilt"
+msgstr "Taasta CD-lt"
 
-#: ../../standalone/drakbackup_.c:3494
+#: ../../standalone/drakbackup_.c:3442
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
-msgstr ""
+msgstr "CD nimi pole korrektne. Ketta nimi on %s."
 
-#: ../../standalone/drakbackup_.c:3504
+#: ../../standalone/drakbackup_.c:3452
 #, 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"
 
-#: ../../standalone/drakbackup_.c:3504
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3452
 msgid "Restore From Tape"
-msgstr "P��sta partitsioonitabel"
+msgstr "Taasta lindilt"
 
-#: ../../standalone/drakbackup_.c:3506
+#: ../../standalone/drakbackup_.c:3454
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
-msgstr ""
+msgstr "Lindi nimi pole korrektne. Lint kannab nime %s."
 
-#: ../../standalone/drakbackup_.c:3526
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3474
 msgid "Restore Via Network"
-msgstr "Seadista kohtv�rk uuesti"
+msgstr "Taasta võrgust"
 
-#: ../../standalone/drakbackup_.c:3526
+#: ../../standalone/drakbackup_.c:3474
 #, c-format
 msgid "Restore Via Network Protocol: %s"
-msgstr ""
+msgstr "Taasta võrguprotokolli abil: %s"
 
-#: ../../standalone/drakbackup_.c:3527
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3475
 msgid "Host Name"
 msgstr "Masinanimi"
 
-#: ../../standalone/drakbackup_.c:3528
+#: ../../standalone/drakbackup_.c:3476
 msgid "Host Path or Module"
-msgstr ""
+msgstr "Masina kataloog või moodul"
 
-#: ../../standalone/drakbackup_.c:3535
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3483
 msgid "Password required"
-msgstr "Salas�na"
+msgstr "Parooli nõudmine"
 
-#: ../../standalone/drakbackup_.c:3541
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3489
 msgid "Username required"
-msgstr "Kasutajatunnus"
+msgstr "Kasutajatunnuse nõudmine"
 
-#: ../../standalone/drakbackup_.c:3544
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3492
 msgid "Hostname required"
-msgstr "Masinanimi: "
+msgstr "Masinanime nõudmine"
 
-#: ../../standalone/drakbackup_.c:3549
+#: ../../standalone/drakbackup_.c:3497
 msgid "Path or Module required"
-msgstr ""
+msgstr "Kataloogi või mooduli nõudmine"
 
-#: ../../standalone/drakbackup_.c:3562
+#: ../../standalone/drakbackup_.c:3510
 msgid "Files Restored..."
-msgstr ""
+msgstr "Taastatud failid..."
 
-#: ../../standalone/drakbackup_.c:3565
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3513
 msgid "Restore Failed..."
-msgstr "Taasta failist"
+msgstr "Taastamine ebaõnnestus..."
 
-#: ../../standalone/drakbackup_.c:3803
+#: ../../standalone/drakbackup_.c:3751
 msgid "Restore all backups"
-msgstr ""
+msgstr "Taasta kõik varukoopiad"
 
-#: ../../standalone/drakbackup_.c:3812
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3760
 msgid "Custom Restore"
-msgstr "Isetehtud"
+msgstr "Taastamise kohandamine"
 
-#: ../../standalone/drakbackup_.c:3858
+#: ../../standalone/drakbackup_.c:3804
 msgid "CD in place - continue."
-msgstr ""
+msgstr "CD on kohal - jätka."
 
-#: ../../standalone/drakbackup_.c:3864
+#: ../../standalone/drakbackup_.c:3810
 msgid "Browse to new restore repository."
-msgstr ""
+msgstr "Lehitse uut taastamishoidlat."
 
-#: ../../standalone/drakbackup_.c:3867
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3813
 msgid "Restore From Catalog"
-msgstr "P��sta partitsioonitabel"
+msgstr "Taastamine kataloogist"
 
-#: ../../standalone/drakbackup_.c:3895
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3841
 msgid "Restore Progress"
-msgstr "Taasta failist"
-
-#: ../../standalone/drakbackup_.c:3937 ../../standalone/drakbackup_.c:3970
-#: ../../standalone/drakbackup_.c:3996 ../../standalone/drakbackup_.c:4023
-#: ../../standalone/drakbackup_.c:4050 ../../standalone/drakbackup_.c:4110
-#: ../../standalone/drakbackup_.c:4137 ../../standalone/drakbackup_.c:4167
-#: ../../standalone/drakbackup_.c:4193
-#, fuzzy
+msgstr "Taastamise edenemine"
+
+#: ../../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"
+msgstr "Eelmine"
 
-#: ../../standalone/drakbackup_.c:3941 ../../standalone/drakbackup_.c:4027
-#: ../../standalone/logdrake_.c:224
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3887 ../../standalone/drakbackup_.c:3973
+#: ../../standalone/logdrake_.c:203
 msgid "Save"
-msgstr "Olek:"
+msgstr "Salvesta"
 
-#: ../../standalone/drakbackup_.c:4000
-#, fuzzy
+#: ../../standalone/drakbackup_.c:3946
 msgid "Build Backup"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Varukoopia loomine"
 
-#: ../../standalone/drakbackup_.c:4054 ../../standalone/drakbackup_.c:4634
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4000 ../../standalone/drakbackup_.c:4544
 msgid "Restore"
-msgstr "Taasta failist"
+msgstr "Taastamine"
 
-#: ../../standalone/drakbackup_.c:4233
+#: ../../standalone/drakbackup_.c:4189
 msgid ""
 "Error during sendmail.\n"
 "  Your report mail was not sent.\n"
 "  Please configure sendmail"
 msgstr ""
+"Viga meili saatmisel.\n"
+"  Raportimeili ei õnnestunud saata.\n"
+"  Seadistage palun sendmail"
 
-#: ../../standalone/drakbackup_.c:4257
-#, fuzzy
-msgid ""
-"The following packages need to be installed:\n"
-" @list_of_rpm_to_install"
-msgstr "Installimiseks on valitud j�rgmised paketid"
-
-#: ../../standalone/drakbackup_.c:4280
+#: ../../standalone/drakbackup_.c:4195
 msgid ""
 "Error during sending file via FTP.\n"
 " Please correct your FTP configuration."
 msgstr ""
+"Viga faili saatmisel FTP kaudu.\n"
+" Palun korrigeerige FTP seadistusi."
+
+#: ../../standalone/drakbackup_.c:4209
+msgid ""
+"The following packages need to be installed:\n"
+" @list_of_rpm_to_install"
+msgstr ""
+"Paigaldada tuleb järgmised paketid:\n"
+" @paigaldamist_vajavate_rpm_pakettide_loend"
 
-#: ../../standalone/drakbackup_.c:4303
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4232
 msgid "Please select data to restore..."
-msgstr "Palun valige kasutatav keel"
+msgstr "Valige palun taastatavad andmed..."
 
-#: ../../standalone/drakbackup_.c:4324
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4267
 msgid "Please select media for backup..."
-msgstr "Palun valige kasutatav keel"
+msgstr "Valige palun varundamiseks andmekandja..."
 
-#: ../../standalone/drakbackup_.c:4346
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4275
 msgid "Please select data to backup..."
-msgstr "Palun valige kasutatav keel"
+msgstr "Valige palun varundamiseks andmed..."
 
-#: ../../standalone/drakbackup_.c:4368
+#: ../../standalone/drakbackup_.c:4293 ../../standalone/drakbackup_.c:4304
 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:4389
+#: ../../standalone/drakbackup_.c:4308
 msgid "Under Devel ... please wait."
-msgstr ""
+msgstr "Tegutsen ... palun oodake."
 
-#: ../../standalone/drakbackup_.c:4470
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4382
 msgid "Backup system files"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Süsteemsete failide varundamine"
 
-#: ../../standalone/drakbackup_.c:4472
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4384
 msgid "Backup user files"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Kasutaja failide varundamine"
 
-#: ../../standalone/drakbackup_.c:4474
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4386
 msgid "Backup other files"
-msgstr "K�lbmatu tagavarakoopia"
+msgstr "Muude failide varundamine"
 
-#: ../../standalone/drakbackup_.c:4476 ../../standalone/drakbackup_.c:4509
+#: ../../standalone/drakbackup_.c:4388 ../../standalone/drakbackup_.c:4421
 msgid "Total Progress"
-msgstr ""
+msgstr "Edenemine kokku"
 
-#: ../../standalone/drakbackup_.c:4500
+#: ../../standalone/drakbackup_.c:4412
 msgid "files sending by FTP"
-msgstr ""
+msgstr "failide saatmine FTP kaudu"
 
-#: ../../standalone/drakbackup_.c:4504
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4416
 msgid "Sending files..."
-msgstr "Salvesta faili"
+msgstr "Failide saatmine..."
 
-#: ../../standalone/drakbackup_.c:4590
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4500
 msgid "Backup Now from configuration file"
-msgstr "V�rgu s�tted"
+msgstr "Seadistustefaili varundamine nüüd!"
 
-#: ../../standalone/drakbackup_.c:4595
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4505
 msgid "View Backup Configuration."
-msgstr "V�rgu s�tted"
+msgstr "Varundamise sätete vaatamine."
 
-#: ../../standalone/drakbackup_.c:4616
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4526
 msgid "Wizard Configuration"
-msgstr "LAN s�tted"
+msgstr "Nõustaja sätted"
 
-#: ../../standalone/drakbackup_.c:4621
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4531
 msgid "Advanced Configuration"
-msgstr "ISDN s�tted"
+msgstr "Muud sätted"
 
-#: ../../standalone/drakbackup_.c:4626
-#, fuzzy
+#: ../../standalone/drakbackup_.c:4536
 msgid "Backup Now"
-msgstr "Failis�steemid"
+msgstr "Varunda nüüd!"
 
-#: ../../standalone/drakbackup_.c:4660
+#: ../../standalone/drakbackup_.c:4576
 msgid "Drakbackup"
-msgstr ""
+msgstr "Drakbackup"
 
-#: ../../standalone/drakbackup_.c:4711
+#: ../../standalone/drakbackup_.c:4624
 msgid ""
 "options description:\n"
 "\n"
@@ -11121,8 +12344,36 @@ msgid ""
 "      \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:4741
+#: ../../standalone/drakbackup_.c:4654
 msgid ""
 "\n"
 " Some errors during sendmail are caused by \n"
@@ -11130,8 +12381,14 @@ msgid ""
 " set myhostname or mydomain in /etc/postfix/main.cf\n"
 "\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"
 
-#: ../../standalone/drakbackup_.c:4749
+#: ../../standalone/drakbackup_.c:4662
 msgid ""
 "options description:\n"
 "\n"
@@ -11171,8 +12428,44 @@ msgid ""
 "\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"
+"\n"
 
-#: ../../standalone/drakbackup_.c:4788
+#: ../../standalone/drakbackup_.c:4701
 msgid ""
 "restore description:\n"
 " \n"
@@ -11199,35 +12492,43 @@ msgid ""
 "\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"
+"\n"
+"\n"
 
-#: ../../standalone/drakbackup_.c:4814 ../../standalone/drakbackup_.c:4891
+#: ../../standalone/drakbackup_.c:4727
 msgid ""
-" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
+" Copyright (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita."
+"fr>"
 msgstr ""
+" Copyright (C) 2001-2002 MandrakeSoft: DUPONT Sebastien <dupont_s\\@epita.fr>"
 
-#: ../../standalone/drakbackup_.c:4816 ../../standalone/drakbackup_.c:4893
+#: ../../standalone/drakbackup_.c:4729
 msgid ""
 " updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
 msgstr ""
+" uuendused 2002 MandrakeSoft: Stew Benedict <sbenedict\\@mandrakesoft.com>"
 
-#: ../../standalone/drakbackup_.c:4818 ../../standalone/drakbackup_.c:4895
-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."
-msgstr ""
-
-#: ../../standalone/drakbackup_.c:4832
+#: ../../standalone/drakbackup_.c:4732
 msgid ""
 "Description:\n"
 "\n"
@@ -11256,7 +12557,6 @@ msgid ""
 "  Configuration file:\n"
 "\t/etc/drakconf/drakbackup/drakbakup.conf\n"
 "\n"
-"\n"
 "Restore Step:\n"
 "  \n"
 "  During the restore step, DrakBackup will remove \n"
@@ -11266,8 +12566,44 @@ msgid ""
 "\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\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/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"
 
-#: ../../standalone/drakbackup_.c:4870
+#: ../../standalone/drakbackup_.c:4769
 msgid ""
 "options description:\n"
 "\n"
@@ -11277,8 +12613,14 @@ msgid ""
 "drive before sending it to the server.\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"
+"\n"
 
-#: ../../standalone/drakbackup_.c:4879
+#: ../../standalone/drakbackup_.c:4778
 msgid ""
 "\n"
 "Restore Backup Problems:\n"
@@ -11290,163 +12632,95 @@ msgid ""
 "data. It is important to be careful and not modify the \n"
 "backup data files by hand.\n"
 msgstr ""
-
-#: ../../standalone/drakbackup_.c:4909
-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"
+"Varukoopia taastamise probleemid:\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 ""
+"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:57
+#: ../../standalone/drakboot_.c:50
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
-msgstr "%s installimine eba�nnestus. Tekkis j�rgnev viga:"
-
-#: ../../standalone/drakbug_.c:40
-#, c-format
-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 ""
-
-#: ../../standalone/drakbug_.c:47
-msgid "  --help            - print this help message.\n"
-msgstr ""
-
-#: ../../standalone/drakbug_.c:48
-msgid "  --report          - program should be one of mandrake tools\n"
-msgstr ""
-
-#: ../../standalone/drakbug_.c:49
-msgid "  --incident        - program should be one of mandrake tools\n"
-msgstr ""
+msgstr "%s paigaldamine ebaõnnestus. Tekkis järgmine viga:"
 
-#: ../../standalone/drakbug_.c:64
+#: ../../standalone/drakbug_.c:45
 msgid "Mandrake Bug Report Tool"
-msgstr ""
+msgstr "Mandrake veateate abivahend"
 
-#: ../../standalone/drakbug_.c:70
+#: ../../standalone/drakbug_.c:50
 msgid "First Time Wizard"
-msgstr ""
+msgstr "Esimese korra nõustaja"
 
-#: ../../standalone/drakbug_.c:71
+#: ../../standalone/drakbug_.c:51
 msgid "Synchronization tool"
-msgstr ""
+msgstr "Sünkroniseerimisvahend"
 
-#: ../../standalone/drakbug_.c:72 ../../standalone/drakbug_.c:86
-#: ../../standalone/drakbug_.c:156 ../../standalone/drakbug_.c:158
-#: ../../standalone/drakbug_.c:162
-#, fuzzy
+#: ../../standalone/drakbug_.c:52 ../../standalone/drakbug_.c:66
+#: ../../standalone/drakbug_.c:133 ../../standalone/drakbug_.c:135
+#: ../../standalone/drakbug_.c:139
 msgid "Standalone Tools"
-msgstr "Konsooliprogrammid"
+msgstr "Autonoomsed vahendid"
 
-#: ../../standalone/drakbug_.c:73
+#: ../../standalone/drakbug_.c:53
 msgid "HardDrake"
-msgstr ""
+msgstr "HardDrake"
 
-#: ../../standalone/drakbug_.c:74
-#, fuzzy
+#: ../../standalone/drakbug_.c:54
 msgid "Mandrake Online"
-msgstr "Juhtimiskeskus"
+msgstr "Mandrake Online"
 
-#: ../../standalone/drakbug_.c:75
-#, fuzzy
+#: ../../standalone/drakbug_.c:55
 msgid "Menudrake"
-msgstr "kohustuslik"
+msgstr "Menudrake"
 
-#: ../../standalone/drakbug_.c:76
-#, fuzzy
+#: ../../standalone/drakbug_.c:56
 msgid "Msec"
-msgstr "Hiir"
+msgstr "Msec"
 
-#: ../../standalone/drakbug_.c:77
-#, fuzzy
+#: ../../standalone/drakbug_.c:57
 msgid "Remote Control"
-msgstr "V�rguprinter"
+msgstr "Kaugjuhtimine"
 
-#: ../../standalone/drakbug_.c:78
-#, fuzzy
+#: ../../standalone/drakbug_.c:58
 msgid "Software Manager"
-msgstr "Jagatav printer"
+msgstr "Tarkvarahaldur"
 
-#: ../../standalone/drakbug_.c:79
+#: ../../standalone/drakbug_.c:59
 msgid "Urpmi"
-msgstr ""
+msgstr "Urpmi"
 
-#: ../../standalone/drakbug_.c:80
-#, fuzzy
+#: ../../standalone/drakbug_.c:60
 msgid "Windows Migration tool"
-msgstr "Gnome t��jaam"
+msgstr "Windowsi ümberkolimise vahend"
 
-#: ../../standalone/drakbug_.c:81
-#, fuzzy
+#: ../../standalone/drakbug_.c:61
 msgid "Userdrake"
-msgstr "Kasuta diskdrake-i"
+msgstr "Userdrake"
 
-#: ../../standalone/drakbug_.c:82
-#, fuzzy
+#: ../../standalone/drakbug_.c:62
 msgid "Configuration Wizards"
-msgstr "V�rgu s�tete abimees"
+msgstr "Seadistamise nõustajad"
 
-#: ../../standalone/drakbug_.c:97
-#, fuzzy
+#: ../../standalone/drakbug_.c:75
 msgid "Application:"
-msgstr "Tegevused"
+msgstr "Rakendus:"
 
-#: ../../standalone/drakbug_.c:98
-#, fuzzy
+#: ../../standalone/drakbug_.c:76
 msgid "Package: "
-msgstr "Pakett"
+msgstr "Pakett:"
 
-#: ../../standalone/drakbug_.c:99
+#: ../../standalone/drakbug_.c:77
 msgid "Kernel:"
-msgstr ""
+msgstr "Kernel:"
 
-#: ../../standalone/drakbug_.c:100
-#, fuzzy
+#: ../../standalone/drakbug_.c:78
 msgid "Release: "
-msgstr "Palun oodake"
+msgstr "Väljalase: "
 
-#: ../../standalone/drakbug_.c:115
+#: ../../standalone/drakbug_.c:93
 msgid ""
 "\n"
 "\n"
@@ -11457,438 +12731,435 @@ msgid ""
 "transferred to that server\n"
 "\n"
 msgstr ""
+"\n"
+"\n"
+"Veateate edastamiseks vajutage nupule 'Raport'.\n"
+"See avab veebilehitseja akna aadressil https://drakbug.mandrakesoft.com,\n"
+"kus leiate eest täitmist ootava vormi. Ülal näidatud info kantakse\n"
+"serverile üle.\n"
+"\n"
 
-#: ../../standalone/drakbug_.c:134
-#, fuzzy
+#: ../../standalone/drakbug_.c:112
 msgid "Report"
-msgstr "Port"
+msgstr "Raport"
 
-#: ../../standalone/drakbug_.c:171
-#, fuzzy
+#: ../../standalone/drakbug_.c:148
 msgid "Not installed"
-msgstr "V�lju programmist"
+msgstr "Pole paigaldatud"
+
+#: ../../standalone/drakbug_.c:160
+msgid "Package not installed"
+msgstr "Pakett ei ole paigaldatud"
 
-#: ../../standalone/drakbug_.c:189
-#, fuzzy
+#: ../../standalone/drakbug_.c:173
 msgid "connecting to Bugzilla wizard ..."
-msgstr "Seadistan uuesti abimehega..."
+msgstr "loon ühendust Bugzilla nõustajaga ..."
 
-#: ../../standalone/drakbug_.c:196
-#, fuzzy
+#: ../../standalone/drakbug_.c:180
 msgid "No browser available! Please install one"
-msgstr "Teisi keeli saab valida p�rast installimist"
+msgstr "Brauserit ei leitud! Palun paigaldage mõni"
 
-#: ../../standalone/drakconnect_.c:79
+#: ../../standalone/drakconnect_.c:75
 #, c-format
 msgid "Network configuration (%d adapters)"
-msgstr "V�rgus�tted (%d liidest)"
+msgstr "Võrgusätted (%d liidest)"
 
-#: ../../standalone/drakconnect_.c:86 ../../standalone/drakconnect_.c:594
+#: ../../standalone/drakconnect_.c:83 ../../standalone/drakconnect_.c:591
 msgid "Profile: "
 msgstr "Profiil: "
 
-#: ../../standalone/drakconnect_.c:94
+#: ../../standalone/drakconnect_.c:91
 msgid "Del profile..."
 msgstr "Kustuta profiil..."
 
-#: ../../standalone/drakconnect_.c:100
+#: ../../standalone/drakconnect_.c:97
 msgid "Profile to delete:"
-msgstr "Profiil kustutamiseks:"
+msgstr "Kustutatav profiil:"
 
-#: ../../standalone/drakconnect_.c:128
+#: ../../standalone/drakconnect_.c:125
 msgid "New profile..."
 msgstr "Uus profiil..."
 
-#: ../../standalone/drakconnect_.c:134
+#: ../../standalone/drakconnect_.c:131
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one) :"
-msgstr ""
+msgstr "Loodava profiili nimi (uus profiil luuakse praeguse koopiana) :"
 
-#: ../../standalone/drakconnect_.c:160
+#: ../../standalone/drakconnect_.c:157
 msgid "Hostname: "
 msgstr "Masinanimi: "
 
-#: ../../standalone/drakconnect_.c:167
+#: ../../standalone/drakconnect_.c:164
 msgid "Internet access"
-msgstr "Interneti�hendus"
+msgstr "Internetiühendus"
 
-#: ../../standalone/drakconnect_.c:180
+#: ../../standalone/drakconnect_.c:177
 msgid "Type:"
-msgstr "T��p: "
+msgstr "Tüüp: "
 
-#: ../../standalone/drakconnect_.c:183 ../../standalone/drakconnect_.c:375
+#: ../../standalone/drakconnect_.c:180 ../../standalone/drakconnect_.c:372
 msgid "Gateway:"
-msgstr "Vaikel��s:"
+msgstr "Vaikelüüs:"
 
-#: ../../standalone/drakconnect_.c:183 ../../standalone/drakconnect_.c:375
+#: ../../standalone/drakconnect_.c:180 ../../standalone/drakconnect_.c:372
 msgid "Interface:"
 msgstr "Liides:"
 
-#: ../../standalone/drakconnect_.c:194
+#: ../../standalone/drakconnect_.c:191
 msgid "Status:"
 msgstr "Olek:"
 
-#: ../../standalone/drakconnect_.c:201
+#: ../../standalone/drakconnect_.c:198 ../../standalone/net_monitor_.c:145
 msgid "Wait please"
-msgstr ""
+msgstr "Palun oodake"
 
-#: ../../standalone/drakconnect_.c:219
+#: ../../standalone/drakconnect_.c:216
 msgid "Configure Internet Access..."
-msgstr "Seadiste interneti�hendus..."
+msgstr "Internetiühenduse seadistamine..."
 
-#: ../../standalone/drakconnect_.c:226 ../../standalone/drakconnect_.c:448
+#: ../../standalone/drakconnect_.c:223 ../../standalone/drakconnect_.c:445
 msgid "LAN configuration"
-msgstr "LAN s�tted"
+msgstr "LAN sätted"
 
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
 msgid "Driver"
-msgstr "Juhtprogramm"
+msgstr "Draiver"
 
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
 msgid "Interface"
 msgstr "Liides"
 
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../../standalone/drakconnect_.c:231
-#, fuzzy
+#: ../../standalone/drakconnect_.c:228
 msgid "State"
-msgstr "Olek:"
+msgstr "Olek"
 
-#: ../../standalone/drakconnect_.c:243
+#: ../../standalone/drakconnect_.c:240
 msgid "Configure Local Area Network..."
-msgstr "Seadista kohtv�rk (LAN) ..."
+msgstr "Kohtvõrgu (LAN) seadistamine..."
 
-#: ../../standalone/drakconnect_.c:255
+#: ../../standalone/drakconnect_.c:252
 msgid "Click here to launch the wizard ->"
-msgstr ""
+msgstr "Klõpsake siia nõustaja käivitamiseks ->"
 
-#: ../../standalone/drakconnect_.c:256
+#: ../../standalone/drakconnect_.c:253
 msgid "Wizard..."
-msgstr "Abimees..."
+msgstr "Nõustaja..."
 
-#: ../../standalone/drakconnect_.c:282
+#: ../../standalone/drakconnect_.c:279
 msgid "Apply"
 msgstr "Rakenda"
 
-#: ../../standalone/drakconnect_.c:383 ../../standalone/drakconnect_.c:406
+#: ../../standalone/drakconnect_.c:380 ../../standalone/drakconnect_.c:403
+#: ../../standalone/net_monitor_.c:457
 msgid "Connected"
-msgstr "�hendatud"
+msgstr "Ühendatud"
 
-#: ../../standalone/drakconnect_.c:383 ../../standalone/drakconnect_.c:406
+#: ../../standalone/drakconnect_.c:380 ../../standalone/drakconnect_.c:403
+#: ../../standalone/net_monitor_.c:457
 msgid "Not connected"
-msgstr "Ei ole �hendatud"
+msgstr "Ei ole ühendatud"
 
-#: ../../standalone/drakconnect_.c:384 ../../standalone/drakconnect_.c:407
+#: ../../standalone/drakconnect_.c:381 ../../standalone/drakconnect_.c:404
 msgid "Connect..."
-msgstr "�henda..."
+msgstr "Ühenda..."
 
-#: ../../standalone/drakconnect_.c:384 ../../standalone/drakconnect_.c:407
+#: ../../standalone/drakconnect_.c:381 ../../standalone/drakconnect_.c:404
 msgid "Disconnect..."
 msgstr "Lahuta..."
 
-#: ../../standalone/drakconnect_.c:403
+#: ../../standalone/drakconnect_.c:400
 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:430
+#: ../../standalone/drakconnect_.c:427
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
 msgstr ""
+"Ühtegi liidest ei ole seadistatud.\n"
+"Esmalt tuleb need seadistada, klõpsake selleks nupul 'Seadista'"
 
-#: ../../standalone/drakconnect_.c:452
+#: ../../standalone/drakconnect_.c:449
 msgid "LAN Configuration"
-msgstr "LAN s�tted"
+msgstr "LAN sätted"
 
-#: ../../standalone/drakconnect_.c:463
+#: ../../standalone/drakconnect_.c:460
 #, c-format
 msgid "Adapter %s: %s"
-msgstr "V�rgukaart %s: %s"
+msgstr "Võrgukaart %s: %s"
 
-#: ../../standalone/drakconnect_.c:469
+#: ../../standalone/drakconnect_.c:466
 msgid "Boot Protocol"
 msgstr "Laadimisprotokoll"
 
-#: ../../standalone/drakconnect_.c:470
+#: ../../standalone/drakconnect_.c:467
 msgid "Started on boot"
-msgstr "K�ivitub laadimisel"
+msgstr "Käivitub laadimisel"
 
-#: ../../standalone/drakconnect_.c:471
+#: ../../standalone/drakconnect_.c:468
 msgid "DHCP client"
 msgstr "DHCP klient"
 
-#: ../../standalone/drakconnect_.c:496 ../../standalone/drakconnect_.c:499
-#, fuzzy
+#: ../../standalone/drakconnect_.c:493 ../../standalone/drakconnect_.c:496
 msgid "activate now"
-msgstr "Aktiivne"
+msgstr "aktiveeri nüüd"
 
-#: ../../standalone/drakconnect_.c:496 ../../standalone/drakconnect_.c:499
-#, fuzzy
+#: ../../standalone/drakconnect_.c:493 ../../standalone/drakconnect_.c:496
 msgid "deactivate now"
-msgstr "Aktiivne"
+msgstr "lülita välja nüüd"
 
-#: ../../standalone/drakconnect_.c:502
+#: ../../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_.c:559
+#: ../../standalone/drakconnect_.c:556
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
 msgstr ""
+"Teil ei ole internetiühendust.\n"
+"Looge see klõpsuga nupul 'Seadista'"
 
-#: ../../standalone/drakconnect_.c:583
+#: ../../standalone/drakconnect_.c:580
 msgid "Internet connection configuration"
-msgstr "Interneti�henduse seadistamine"
+msgstr "Internetiühenduse seadistamine"
 
-#: ../../standalone/drakconnect_.c:587
+#: ../../standalone/drakconnect_.c:584
 msgid "Internet Connection Configuration"
-msgstr "Interneti�henduse seadistamine"
+msgstr "Internetiühenduse seadistamine"
 
-#: ../../standalone/drakconnect_.c:596
+#: ../../standalone/drakconnect_.c:593 ../../standalone/net_monitor_.c:94
 msgid "Connection type: "
-msgstr "�henduse t��p: "
+msgstr "Ühenduse tüüp: "
 
-#: ../../standalone/drakconnect_.c:602
+#: ../../standalone/drakconnect_.c:599
 msgid "Parameters"
 msgstr "Parameetrid"
 
-#: ../../standalone/drakconnect_.c:620
+#: ../../standalone/drakconnect_.c:618
 msgid "Gateway"
-msgstr "Vaikel��s"
+msgstr "Vaikelüüs"
 
-#: ../../standalone/drakconnect_.c:629
+#: ../../standalone/drakconnect_.c:627
 msgid "Ethernet Card"
-msgstr "V�rgukaart"
+msgstr "Võrgukaart"
 
-#: ../../standalone/drakconnect_.c:630
+#: ../../standalone/drakconnect_.c:628
 msgid "DHCP Client"
 msgstr "DHCP klient"
 
-#: ../../standalone/drakfloppy_.c:64
-msgid "usage: drakfloppy\n"
-msgstr ""
-
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:39
 msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
-msgstr ""
+msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 
-#: ../../standalone/drakfloppy_.c:69
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:40
 msgid "Module name"
-msgstr "Mooduli parameetrid:"
+msgstr "Mooduli nimi"
 
-#: ../../standalone/drakfloppy_.c:69
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:40
 msgid "Size"
-msgstr "Suurus: %s"
+msgstr "Suurus"
 
-#: ../../standalone/drakfloppy_.c:74
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:45
 msgid "drakfloppy"
-msgstr "Taasta flopilt"
+msgstr "drakfloppy"
 
-#: ../../standalone/drakfloppy_.c:91
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:63
 msgid "boot disk creation"
-msgstr "Alglaadimise stiil"
+msgstr "alglaadimisketta loomine"
 
-#: ../../standalone/drakfloppy_.c:99 ../../standalone/drakfloppy_.c:112
+#: ../../standalone/drakfloppy_.c:71 ../../standalone/drakfloppy_.c:84
 msgid "default"
 msgstr "tavaline"
 
-#: ../../standalone/drakfloppy_.c:115
+#: ../../standalone/drakfloppy_.c:87
 #, c-format
 msgid "DrakFloppy Error: %s"
-msgstr ""
+msgstr "DrakFloppy viga: %s"
 
-#: ../../standalone/drakfloppy_.c:126
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:98
 msgid "kernel version"
-msgstr "Interneti t��jaam"
+msgstr "kerneli versioon"
 
-#: ../../standalone/drakfloppy_.c:132
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:104
 msgid "General"
-msgstr "Tavaline"
+msgstr "Üldine"
 
-#: ../../standalone/drakfloppy_.c:137
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:109
 msgid "Expert Area"
-msgstr "Ekspertresiim"
+msgstr "Ekspertidele"
 
-#: ../../standalone/drakfloppy_.c:140
+#: ../../standalone/drakfloppy_.c:112
 msgid "mkinitrd optional arguments"
-msgstr ""
+msgstr "mkinitrd lisaargumendid"
 
-#: ../../standalone/drakfloppy_.c:141
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:113
 msgid "Add a module"
-msgstr "Tavakasutaja"
+msgstr "Lisa moodul"
 
-#: ../../standalone/drakfloppy_.c:161
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:133
 msgid "force"
-msgstr "Veel.."
+msgstr "sunni peale"
 
-#: ../../standalone/drakfloppy_.c:162
+#: ../../standalone/drakfloppy_.c:134
 msgid "if needed"
-msgstr ""
+msgstr "kui vaja"
 
-#: ../../standalone/drakfloppy_.c:163
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:135
 msgid "omit scsi modules"
-msgstr "kasutades moodulit"
+msgstr "scsi moodulite vahelejätt"
 
-#: ../../standalone/drakfloppy_.c:164
+#: ../../standalone/drakfloppy_.c:136
 msgid "omit raid modules"
-msgstr ""
+msgstr "raid moodulite vahelejätt"
 
-#: ../../standalone/drakfloppy_.c:200
-#, fuzzy
+#: ../../standalone/drakfloppy_.c:172
 msgid "Remove a module"
-msgstr "Viimane leht enne"
+msgstr "Eemalda moodul"
 
-#: ../../standalone/drakfloppy_.c:222
+#: ../../standalone/drakfloppy_.c:194
 msgid "Output"
-msgstr ""
+msgstr "Väljund"
 
-#: ../../standalone/drakfloppy_.c:234
+#: ../../standalone/drakfloppy_.c:206
 msgid "Build the disk"
-msgstr ""
+msgstr "Ketta loomine"
 
-#: ../../standalone/drakfloppy_.c:377
+#: ../../standalone/drakfloppy_.c:336
 #, c-format
 msgid "Be sure a media is present for the device %s"
-msgstr ""
+msgstr "Kontrollige, et andmekandja on seadmes %s"
 
-#: ../../standalone/drakfloppy_.c:382
+#: ../../standalone/drakfloppy_.c:341
 #, 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/drakfloppy_.c:384
-#, fuzzy, c-format
+#: ../../standalone/drakfloppy_.c:344
+#, c-format
 msgid "Unable to fork: %s"
-msgstr "Keela v�rgu�hendus"
+msgstr "Fork ebaõnnestus: %s"
 
-#: ../../standalone/drakfloppy_.c:388
+#: ../../standalone/drakfloppy_.c:349
 #, c-format
 msgid ""
 "Unable to close properly mkbootdisk: \n"
 " %s \n"
 " %s"
 msgstr ""
+"Mkbootdiski korrektne sulgemine ebaõnnestus: \n"
+" %s \n"
+" %s"
 
-#: ../../standalone/drakfont_.c:231
+#: ../../standalone/drakfont_.c:213
 msgid "Search installed fonts"
-msgstr ""
+msgstr "Paigaldatud fontide otsimine"
 
-#: ../../standalone/drakfont_.c:233
+#: ../../standalone/drakfont_.c:215
 msgid "Unselect fonts installed"
-msgstr ""
+msgstr "Paigaldatud fontide valiku tühistamine"
 
-#: ../../standalone/drakfont_.c:257
+#: ../../standalone/drakfont_.c:239
 msgid "parse all fonts"
-msgstr ""
+msgstr "kõigi fontide analüüs"
 
-#: ../../standalone/drakfont_.c:260
-#, fuzzy
+#: ../../standalone/drakfont_.c:242
 msgid "no fonts found"
-msgstr "%s ei leitud"
+msgstr "fonte ei leitud"
 
-#: ../../standalone/drakfont_.c:269 ../../standalone/drakfont_.c:323
-#: ../../standalone/drakfont_.c:379 ../../standalone/drakfont_.c:468
-#: ../../standalone/drakfont_.c:479 ../../standalone/drakfont_.c:506
-#: ../../standalone/drakfont_.c:520 ../../standalone/drakfont_.c:537
-#, fuzzy
+#: ../../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"
+msgstr "tehtud"
 
-#: ../../standalone/drakfont_.c:275
+#: ../../standalone/drakfont_.c:257
 msgid "could not find any font in your mounted partitions"
-msgstr ""
+msgstr "ei suutnud haagitud partitsioonidel leida ühtegi fonti"
 
-#: ../../standalone/drakfont_.c:321
+#: ../../standalone/drakfont_.c:303
 msgid "Reselect correct fonts"
-msgstr ""
+msgstr "Korrektsete fontide uuestivalimine"
 
-#: ../../standalone/drakfont_.c:325
+#: ../../standalone/drakfont_.c:307
 msgid "could not find any font.\n"
-msgstr ""
+msgstr "ei suutnud fonte leida.\n"
 
-#: ../../standalone/drakfont_.c:349
+#: ../../standalone/drakfont_.c:331
 msgid "Search fonts in installed list"
-msgstr ""
+msgstr "Fontide otsing paigaldatute loendis"
 
-#: ../../standalone/drakfont_.c:377
-#, fuzzy
+#: ../../standalone/drakfont_.c:359
 msgid "Fonts copy"
-msgstr "Vorminda flopi"
+msgstr "Fontide kopeerimine"
 
-#: ../../standalone/drakfont_.c:381
-#, fuzzy
+#: ../../standalone/drakfont_.c:363
 msgid "True Type fonts installation"
-msgstr "Valmistun installimiseks"
+msgstr "TrueType fontide paigaldamine"
 
-#: ../../standalone/drakfont_.c:389
+#: ../../standalone/drakfont_.c:371
 msgid "please wait during ttmkfdir..."
-msgstr ""
+msgstr "palun oodake, käib ttmkdir..."
 
-#: ../../standalone/drakfont_.c:394
+#: ../../standalone/drakfont_.c:377
 msgid "True Type install done"
-msgstr ""
+msgstr "TrueType paigaldus tehtud"
 
-#: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:429
+#: ../../standalone/drakfont_.c:386 ../../standalone/drakfont_.c:413
 msgid "Fonts conversion"
-msgstr ""
+msgstr "Fontide teisendamine"
 
-#: ../../standalone/drakfont_.c:409 ../../standalone/drakfont_.c:433
-#: ../../standalone/drakfont_.c:464
+#: ../../standalone/drakfont_.c:392 ../../standalone/drakfont_.c:417
+#: ../../standalone/drakfont_.c:450
 msgid "type1inst building"
-msgstr ""
+msgstr "type1inst loomine"
 
-#: ../../standalone/drakfont_.c:419 ../../standalone/drakfont_.c:442
+#: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:427
 msgid "Ghostscript referencing"
-msgstr ""
+msgstr "Ghostcsripti määratlused"
 
-#: ../../standalone/drakfont_.c:452
+#: ../../standalone/drakfont_.c:437
 msgid "ttf fonts conversion"
-msgstr ""
+msgstr "ttf fontide teisendamine"
 
-#: ../../standalone/drakfont_.c:459
+#: ../../standalone/drakfont_.c:444
 msgid "pfm fonts conversion"
-msgstr ""
+msgstr "pfm fontide teisendamine"
 
-#: ../../standalone/drakfont_.c:470
+#: ../../standalone/drakfont_.c:456
 msgid "Suppress temporary Files"
-msgstr ""
+msgstr "Ajutiste failide kustutamine"
 
-#: ../../standalone/drakfont_.c:473
-#, fuzzy
+#: ../../standalone/drakfont_.c:459
 msgid "Restart XFS"
-msgstr "piiratud"
+msgstr "XFS taaskäivitamine"
 
-#: ../../standalone/drakfont_.c:518 ../../standalone/drakfont_.c:532
+#: ../../standalone/drakfont_.c:512 ../../standalone/drakfont_.c:526
 msgid "Suppress Fonts Files"
-msgstr ""
+msgstr "Fondifailide kustutamine"
 
-#: ../../standalone/drakfont_.c:534
-#, fuzzy
+#: ../../standalone/drakfont_.c:528
 msgid "xfs restart"
-msgstr "piiratud"
+msgstr "xfs taaskäivitamine"
 
-#: ../../standalone/drakfont_.c:542 ../../standalone/drakfont_.c:951
+#: ../../standalone/drakfont_.c:536 ../../standalone/drakfont_.c:902
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
 "install them on your system.\n"
@@ -11896,189 +13167,346 @@ msgid ""
 "-You can install the fonts using 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"
+"\n"
+" Fonte saab paigaldada normaalsel meetodil. Haruharva võivad vigased fondid "
+"panna küll X Serveri hanguma."
 
-#: ../../standalone/drakfont_.c:630
-#, fuzzy
+#: ../../standalone/drakfont_.c:621
 msgid "Fonts Importation"
-msgstr "Vormindamine"
+msgstr "Fontide importimine"
 
-#: ../../standalone/drakfont_.c:660
+#: ../../standalone/drakfont_.c:650
 msgid "Get Windows Fonts"
-msgstr ""
+msgstr "Windowsi fontide hankimine"
 
-#: ../../standalone/drakfont_.c:668
-#, fuzzy
+#: ../../standalone/drakfont_.c:658
 msgid "Uninstall Fonts"
-msgstr "RPM-ide eemaldamine"
+msgstr "Fontide eemaldamine"
 
-#: ../../standalone/drakfont_.c:679
-#, fuzzy
+#: ../../standalone/drakfont_.c:669
 msgid "Advanced Options"
-msgstr "ISDN s�tted"
+msgstr "Muud valikud"
 
-#: ../../standalone/drakfont_.c:687
-#, fuzzy
+#: ../../standalone/drakfont_.c:677
 msgid "Font List"
-msgstr "�henduspunkt"
+msgstr "Fontide loend"
 
-#: ../../standalone/drakfont_.c:909
-#, fuzzy
+#: ../../standalone/drakfont_.c:737
+msgid ""
+"\n"
+" Copyright (C) 2001-2002 by MandrakeSoft \n"
+"\tDUPONT Sebastien sdupont\\@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"
+" 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"
+"\n"
+" Thanks:\n"
+"    -  pfm2afm:   \n"
+"\t by Ken Borgendale:\n"
+"\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
+"    -  type1inst:\n"
+"\t by James Macnicol: \n"
+"\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
+"    -  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"
+"\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"
+" 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"
+"\n"
+" Täname:\n"
+"    -  pfm2afm:   \n"
+"\tautor: Ken Borgendale:\n"
+"\t    teisendab Windowsi .pfm-faili .afm-failiks (Adobe fondimeetrika)\n"
+"    -  type1inst:\n"
+"\tautor: 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"
+"             teisendab ttf-fondifailid afm- ja pfb-fontideks\n"
+"\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 partitsioonid, mida soovite vormindada"
+msgstr "Valige rakendused, millel on fontide tugi:"
 
-#: ../../standalone/drakfont_.c:918
+#: ../../standalone/drakfont_.c:870
 msgid "Ghostscript"
-msgstr ""
+msgstr "Ghostscript"
 
-#: ../../standalone/drakfont_.c:925
-#, fuzzy
+#: ../../standalone/drakfont_.c:877
 msgid "StarOffice"
-msgstr "Kontor"
+msgstr "StarOffice"
 
-#: ../../standalone/drakfont_.c:932
-#, fuzzy
+#: ../../standalone/drakfont_.c:884
 msgid "Abiword"
-msgstr "Katkesta"
+msgstr "Abiword"
 
-#: ../../standalone/drakfont_.c:939
-#, fuzzy
+#: ../../standalone/drakfont_.c:891
 msgid "Generic Printers"
-msgstr "Printer"
+msgstr "Tavalised printerid"
 
-#: ../../standalone/drakfont_.c:1016
+#: ../../standalone/drakfont_.c:958
 msgid "Select the font file or directory and click on 'Add'"
-msgstr ""
+msgstr "Valige fondifail või kataloog ja klõpsake 'Lisa'"
 
-#: ../../standalone/drakfont_.c:1063
-#, fuzzy
+#: ../../standalone/drakfont_.c:1005
 msgid "Install List"
-msgstr "S�steemi installimine"
+msgstr "Paigaldusloend"
 
-#: ../../standalone/drakfont_.c:1106
+#: ../../standalone/drakfont_.c:1048
 msgid "click here if you are sure."
-msgstr ""
+msgstr "kui olete kindel, klõpsake siia."
 
-#: ../../standalone/drakfont_.c:1113
+#: ../../standalone/drakfont_.c:1055
 msgid "here if no."
-msgstr ""
+msgstr "kui mitte, siis siia."
 
-#: ../../standalone/drakfont_.c:1174
+#: ../../standalone/drakfont_.c:1112
 msgid "Unselected All"
-msgstr ""
+msgstr "Tühista kõigi valimine"
 
-#: ../../standalone/drakfont_.c:1178
-#, fuzzy
+#: ../../standalone/drakfont_.c:1116
 msgid "Selected All"
-msgstr "Valige fail"
+msgstr "Kõigi valimine"
 
-#: ../../standalone/drakfont_.c:1182
-#, fuzzy
+#: ../../standalone/drakfont_.c:1120
 msgid "Remove List"
-msgstr "V�rguprinter"
+msgstr "Eemalda loend"
 
-#: ../../standalone/drakfont_.c:1204 ../../standalone/drakfont_.c:1237
-#, fuzzy
+#: ../../standalone/drakfont_.c:1142 ../../standalone/drakfont_.c:1175
 msgid "Initials tests"
-msgstr "Initsialiseerimisteade"
+msgstr "Käivitustestid"
 
-#: ../../standalone/drakfont_.c:1207
-#, fuzzy
+#: ../../standalone/drakfont_.c:1145
 msgid "Copy fonts on your system"
-msgstr "Teie s�steemis ei ole v�rgukaarti!"
+msgstr "Fontide kopeerimine Teie süsteemi"
 
-#: ../../standalone/drakfont_.c:1211
+#: ../../standalone/drakfont_.c:1149
 msgid "Install & convert Fonts"
-msgstr ""
+msgstr "Fontide paigaldamine ja teisendamine"
 
-#: ../../standalone/drakfont_.c:1215
-#, fuzzy
+#: ../../standalone/drakfont_.c:1153
 msgid "Post Install"
-msgstr "Installimine"
+msgstr "Paigaldusjärgsed seadistused"
 
-#: ../../standalone/drakfont_.c:1240
-#, fuzzy
+#: ../../standalone/drakfont_.c:1178
 msgid "Remove fonts on your system"
-msgstr "Teie s�steemis ei ole v�rgukaarti!"
+msgstr "Fontide eemaldamine Teie süsteemist"
 
-#: ../../standalone/drakfont_.c:1244
-#, fuzzy
+#: ../../standalone/drakfont_.c:1182
 msgid "Post Uninstall"
-msgstr "V�lju programmist"
+msgstr "Eemaldamisjärgsed seadistused"
 
-#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:184
+#: ../../standalone/drakgw_.c:42 ../../standalone/drakgw_.c:182
 msgid "Internet Connection Sharing"
-msgstr "Interneti�henduse jagamine"
+msgstr "Internetiühenduse jagamine"
 
-#: ../../standalone/drakgw_.c:115
+#: ../../standalone/drakgw_.c:114
 msgid "Sorry, we support only 2.4 kernels."
-msgstr ""
+msgstr "Vabandust, me toetame ainult 2.4 kerneleid."
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:125
 msgid "Internet Connection Sharing currently enabled"
-msgstr "Interneti�henduse jagamine t��tab"
+msgstr "Internetiühenduse jagamine töötab"
 
-#: ../../standalone/drakgw_.c:127
+#: ../../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 ja see on\n"
-"ka praegu aktiivne.\n"
+"Internetiühenduse jagamine on juba seadistatud\n"
+"ja see on ka praegu aktiivne.\n"
 "\n"
-"Mida Te soovite teha?"
+"Mida soovite ette võtta?"
 
-#: ../../standalone/drakgw_.c:131
+#: ../../standalone/drakgw_.c:130
 msgid "disable"
-msgstr "keela"
+msgstr "keelata"
 
-#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:130 ../../standalone/drakgw_.c:154
 msgid "dismiss"
-msgstr "t�hista"
+msgstr "tühistada"
 
-#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:130 ../../standalone/drakgw_.c:154
 msgid "reconfigure"
-msgstr "seadista uuesti"
+msgstr "uuesti seadistada"
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:133
 msgid "Disabling servers..."
-msgstr "Peaten serverid..."
+msgstr "Serverite peatamine..."
 
 #: ../../standalone/drakgw_.c:142
 msgid "Internet connection sharing is now disabled."
-msgstr "Interneti�hendust n��d enam ei jagata"
+msgstr "Internetiühendust nüüd enam ei jagata."
 
-#: ../../standalone/drakgw_.c:151
+#: ../../standalone/drakgw_.c:149
 msgid "Internet Connection Sharing currently disabled"
-msgstr "Interneti�hendust hetkel ei jagata"
+msgstr "Internetiühendust hetkel ei jagata"
 
-#: ../../standalone/drakgw_.c:152
+#: ../../standalone/drakgw_.c:150
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"Interneti�henduse jagamine on juba seadistatud aga hetkel\n"
-"on see keelatud.\n"
+"Internetiühenduse jagamine on juba seadistatud,\n"
+"aga hetkel on see keelatud.\n"
 "\n"
-"Mida Te soovite teha?"
+"Mida soovite ette võtta?"
 
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:154
 msgid "enable"
-msgstr "luba"
+msgstr "lubada"
 
-#: ../../standalone/drakgw_.c:163
+#: ../../standalone/drakgw_.c:161
 msgid "Enabling servers..."
-msgstr "K�ivitan serverid..."
+msgstr "Serverite käivitamine..."
 
-#: ../../standalone/drakgw_.c:168
+#: ../../standalone/drakgw_.c:166
 msgid "Internet connection sharing is now enabled."
-msgstr "Interneti�henduse jagamine n��d t��tab"
+msgstr "Internetiühenduse jagamine nüüd töötab."
 
-#: ../../standalone/drakgw_.c:185
-#, fuzzy
+#: ../../standalone/drakgw_.c:183
 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 "
@@ -12090,37 +13518,42 @@ msgid ""
 "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"
+"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"
-"M�rkus: kohtv�rgu (LAN) jaoks on vajalik eraldi v�rgukaardi olemasolu."
+"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:213
+#: ../../standalone/drakgw_.c:211
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Liides %s (kasutab moodulit %s)"
 
-#: ../../standalone/drakgw_.c:214
+#: ../../standalone/drakgw_.c:212
 #, c-format
 msgid "Interface %s"
 msgstr "Liides %s"
 
-#: ../../standalone/drakgw_.c:222
+#: ../../standalone/drakgw_.c:220
 msgid "No network adapter on your system!"
-msgstr "Teie s�steemis ei ole v�rgukaarti!"
+msgstr "Teie süsteemis ei ole võrgukaarti!"
 
-#: ../../standalone/drakgw_.c:223
+#: ../../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 ole hetkel seadistatud. Palun kasutage selleks "
-"riistvara s�tteseadjat."
+"Ühtki võrgukaarti ei suudetud tuvastada. Palun kasutage selleks riistvara "
+"seadistajat."
 
-#: ../../standalone/drakgw_.c:229
+#: ../../standalone/drakgw_.c:227
 msgid "Network interface"
-msgstr "V�rguliides"
+msgstr "Võrguliides"
 
-#: ../../standalone/drakgw_.c:230
+#: ../../standalone/drakgw_.c:228
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -12129,26 +13562,23 @@ msgid ""
 "\n"
 "I am about to setup your Local Area Network with that adapter."
 msgstr ""
-"Teil on vaid �ks seadistatud v�rguliides:\n"
+"Teil on vaid üks seadistatud võrguliides:\n"
 "\n"
 "%s\n"
 "\n"
-"Kohtv�rgu s�tted seotakse selle liidesga."
+"Kohtvõrgu sätted seotakse selle liidesega."
 
-#: ../../standalone/drakgw_.c:239
+#: ../../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\n"
-"jaoks."
+msgstr "Palun valige, millist võrguliidest soovite kasutada kohtvõrgu jaoks."
 
-#: ../../standalone/drakgw_.c:265
-#, fuzzy
+#: ../../standalone/drakgw_.c:261
 msgid "Network interface already configured"
-msgstr "Monitor ei ole seadistatud"
+msgstr "Võrguliides on juba seadistatud"
 
-#: ../../standalone/drakgw_.c:266
+#: ../../standalone/drakgw_.c:262
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -12157,18 +13587,29 @@ msgid ""
 "\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."
 
-#: ../../standalone/drakgw_.c:271
-#, fuzzy
+#: ../../standalone/drakgw_.c:267
 msgid "Automatic reconfiguration"
-msgstr "Alglaaduri stiil"
+msgstr "Automaatne ümberseadistamine"
+
+#: ../../standalone/drakgw_.c:267
+msgid "No (experts only)"
+msgstr "Ei (ainult eksperdile)"
 
-#: ../../standalone/drakgw_.c:272
-#, fuzzy
+#: ../../standalone/drakgw_.c:268
 msgid "Show current interface configuration"
-msgstr "Interneti s�tted"
+msgstr "Liidese praeguste sätete näitamine"
 
-#: ../../standalone/drakgw_.c:274
+#: ../../standalone/drakgw_.c:269
+msgid "Current interface configuration"
+msgstr "Liidese praegused sätted"
+
+#: ../../standalone/drakgw_.c:270
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -12178,8 +13619,14 @@ msgid ""
 "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"
+"Draiver: %s"
 
-#: ../../standalone/drakgw_.c:287
+#: ../../standalone/drakgw_.c:283
 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 "
@@ -12188,18 +13635,28 @@ msgid ""
 "\n"
 "The default DNS entry is the Caching Nameserver configured on the firewall. "
 "You can replace that with your ISP DNS IP, for example.\n"
-"\n"
+"\t\t      \n"
 "Else, 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 "
+"juba seadistatud. Sellisel juhul kontrollige, et võrk, mida kasutate "
+"kohtvõrgu tarbeks, on õigesti tuvastatud. Seda ei hakata ümber seadistama "
+"ega Teie DHCP serveri sätteid muutma.\n"
+"\n"
+"Vaikimisi DNS kirje on tulemüüri poolt seadistatud puhverdav nimeserver. See "
+"on võimalik asendada näiteks Teie ISP DNSi IP-ga.\n"
+"\t\t       \n"
+"Vastasel juhul seadistan Teie liidese ümber ja seadistan (ümber) ka DHCP "
+"serveri.\n"
+"\n"
 
-#: ../../standalone/drakgw_.c:294
-#, fuzzy
+#: ../../standalone/drakgw_.c:290
 msgid "Local Network adress"
-msgstr "v�rgukaarti ei leitud"
+msgstr "Kohtvõrgu aadress"
 
-#: ../../standalone/drakgw_.c:298
+#: ../../standalone/drakgw_.c:294
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
@@ -12207,93 +13664,95 @@ msgid ""
 "If you don't know the meaning of an option, simply leave it as it is.\n"
 "\n"
 msgstr ""
+"DHCP serveri sätted.\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"
+"\n"
 
-#: ../../standalone/drakgw_.c:304
-#, fuzzy
+#: ../../standalone/drakgw_.c:300
 msgid "(This) DHCP Server IP"
-msgstr "CUPS serveri IP"
+msgstr "(Selle) DHCP serveri IP"
 
-#: ../../standalone/drakgw_.c:305
-#, fuzzy
+#: ../../standalone/drakgw_.c:301
 msgid "The DNS Server IP"
-msgstr "CUPS serveri IP"
+msgstr "Nimeserveri IP"
 
-#: ../../standalone/drakgw_.c:306
-#, fuzzy
+#: ../../standalone/drakgw_.c:302
 msgid "The internal domain name"
-msgstr "Printerit ei ole"
+msgstr "Sisemine domeeninimi"
 
-#: ../../standalone/drakgw_.c:307
+#: ../../standalone/drakgw_.c:303
 msgid "The DHCP start range"
-msgstr ""
+msgstr "DHCP vahemiku algus"
 
-#: ../../standalone/drakgw_.c:308
+#: ../../standalone/drakgw_.c:304
 msgid "The DHCP end range"
-msgstr ""
+msgstr "DHCP vahemiku lõpp"
 
-#: ../../standalone/drakgw_.c:309
+#: ../../standalone/drakgw_.c:305
 msgid "The default lease (in seconds)"
-msgstr ""
+msgstr "Vaikerendiaeg (sekundites)"
 
-#: ../../standalone/drakgw_.c:310
+#: ../../standalone/drakgw_.c:306
 msgid "The maximum lease (in seconds)"
-msgstr ""
+msgstr "Maksimaalne rendiaeg (sekundites)"
 
-#: ../../standalone/drakgw_.c:311
+#: ../../standalone/drakgw_.c:307
 msgid "Re-configure interface and DHCP server"
-msgstr ""
+msgstr "Liidese ja DHCP serveri ümberseadistamine"
 
-#: ../../standalone/drakgw_.c:318
+#: ../../standalone/drakgw_.c:314
 msgid "The Local Network did not finish with `.0', bailing out."
-msgstr ""
+msgstr "Kohtvõrgu lõpus ei seisa '0', visatakse minema."
 
-#: ../../standalone/drakgw_.c:329
+#: ../../standalone/drakgw_.c:325
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
-msgstr "V�imalik kohtv�rgu aadressi konflikt %s konfiguratsioonis!\n"
+msgstr "Võimalik kohtvõrgu aadressi konflikt %s konfiguratsioonis!\n"
 
-#: ../../standalone/drakgw_.c:339
+#: ../../standalone/drakgw_.c:335
 msgid "Configuring..."
-msgstr "Seadistan..."
+msgstr "Seadistamine..."
 
-#: ../../standalone/drakgw_.c:340
+#: ../../standalone/drakgw_.c:336
 msgid "Configuring scripts, installing software, starting servers..."
-msgstr "H��lestan skriptid, installin tarkvara, k�ivitan serverid..."
+msgstr "Häälestan skriptid, paigaldan tarkvara, käivitan serverid..."
 
-#: ../../standalone/drakgw_.c:376
+#: ../../standalone/drakgw_.c:372
 #, c-format
 msgid "Problems installing package %s"
-msgstr "Probleemid paketi %s installimisel"
+msgstr "Probleemid paketi %s paigaldamisel"
 
-#: ../../standalone/drakgw_.c:509
+#: ../../standalone/drakgw_.c:505
 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)."
 msgstr ""
-"K�ik on seadistatud.\n"
-"N��d saate interneti�hendust jagada teistele kohtv�rgu arvutitele, kasutades "
-"neil automaatset konfigureerimist (DHCP)"
+"Kõik on seadistatud.\n"
+"Nüüd saate internetiühendust jagada teistele kohtvõrgu arvutitele, kasutades "
+"neil automaatset konfigureerimist (DHCP)."
 
-#: ../../standalone/drakgw_.c:528
+#: ../../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."
+msgstr "Internetiühenduse jagamine on juba seadistatud, aga hetkel keelatud."
 
-#: ../../standalone/drakgw_.c:529
+#: ../../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."
+"Internetiühenduse jagamine on juba seadistatud ja see on praegu aktiivne."
 
-#: ../../standalone/drakgw_.c:530
+#: ../../standalone/drakgw_.c:525
 msgid "No Internet Connection Sharing has ever been configured."
-msgstr "Interneti�henduse jagamist ei ole kunagi seadistatud"
+msgstr "Internetiühenduse jagamist ei ole kunagi seadistatud."
 
-#: ../../standalone/drakgw_.c:535
+#: ../../standalone/drakgw_.c:531
 msgid "Internet connection sharing configuration"
-msgstr "Interneti jagamise seadistamine"
+msgstr "Internetiühenduse jagamise seadistamine"
 
-#: ../../standalone/drakgw_.c:542
-#, fuzzy, c-format
+#: ../../standalone/drakgw_.c:539
+#, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
 "\n"
@@ -12301,164 +13760,151 @@ msgid ""
 "\n"
 "Click on Configure to launch the setup wizard."
 msgstr ""
-"Interneti�henduse jagamise Abimees!\n"
+"Internetiühenduse jagamise nõustaja\n"
 "\n"
 "%s\n"
 "\n"
-"Valige Abimehe k�ivitamiseks ``OK''"
+"Klõpsake nõustaja käivitamiseks nupul 'Seadista'."
 
-#: ../../standalone/drakperm_.c:42
-#, fuzzy
+#: ../../standalone/drakperm_.c:36
 msgid "group"
-msgstr "T��grupp"
+msgstr "grupp"
 
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
 msgid "path"
-msgstr ""
+msgstr "asukoht"
 
-#: ../../standalone/drakperm_.c:42
-#, fuzzy
+#: ../../standalone/drakperm_.c:36
 msgid "permissions"
-msgstr "Partitsioon %s"
+msgstr "loabitid"
 
-#: ../../standalone/drakperm_.c:42
-#, fuzzy
+#: ../../standalone/drakperm_.c:36
 msgid "user"
-msgstr "Kasutajatunnus"
+msgstr "kasutaja"
 
-#: ../../standalone/drakperm_.c:49
+#: ../../standalone/drakperm_.c:43
 msgid "Up"
-msgstr ""
+msgstr "Üles"
 
-#: ../../standalone/drakperm_.c:50
-#, fuzzy
+#: ../../standalone/drakperm_.c:44
 msgid "delete"
-msgstr "Kustuta"
+msgstr "kustuta"
 
-#: ../../standalone/drakperm_.c:51
-#, fuzzy
+#: ../../standalone/drakperm_.c:45
 msgid "edit"
-msgstr "Keskmine"
+msgstr "muuda"
 
-#: ../../standalone/drakperm_.c:52
-#, fuzzy
+#: ../../standalone/drakperm_.c:46
 msgid "Down"
-msgstr "Tehtud"
+msgstr "Alla"
 
-#: ../../standalone/drakperm_.c:53
-#, fuzzy
+#: ../../standalone/drakperm_.c:47
 msgid "add a rule"
-msgstr "Tavakasutaja"
+msgstr "lisa reegel"
 
-#: ../../standalone/drakperm_.c:54
+#: ../../standalone/drakperm_.c:48
 msgid "select perm file to see/edit"
-msgstr ""
+msgstr "loafaili valik vaatamiseks/muutmiseks"
 
-#: ../../standalone/drakperm_.c:57
+#: ../../standalone/drakperm_.c:51
 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"
+"Võite ka muuta oma reegleid, mis tühistavad vaikereeglid."
 
-#: ../../standalone/drakperm_.c:62
-#, fuzzy
+#: ../../standalone/drakperm_.c:56
 msgid "Add a new rule at the end"
-msgstr "Printerit ei ole"
+msgstr "Uue reegli lisamine lõppu"
 
-#: ../../standalone/drakperm_.c:63
+#: ../../standalone/drakperm_.c:57
 msgid "Edit curent rule"
-msgstr ""
+msgstr "Muuda praegust reeglit"
 
-#: ../../standalone/drakperm_.c:64
+#: ../../standalone/drakperm_.c:58
 msgid "Up selected rule one level"
-msgstr ""
+msgstr "Valitud reegel üks tase ülespoole"
 
-#: ../../standalone/drakperm_.c:65
+#: ../../standalone/drakperm_.c:59
 msgid "Down selected rule one level"
-msgstr ""
+msgstr "Valitud reegel üks tase allapoole"
 
-#: ../../standalone/drakperm_.c:66
-#, fuzzy
+#: ../../standalone/drakperm_.c:60
 msgid "Delete selected rule"
-msgstr "Eemalda prindij�rjekord"
+msgstr "Kustuta valitud reegel"
 
-#: ../../standalone/drakperm_.c:237
+#: ../../standalone/drakperm_.c:224
 msgid "browse"
-msgstr ""
+msgstr "lehitse"
 
-#: ../../standalone/drakperm_.c:244
-#, fuzzy
+#: ../../standalone/drakperm_.c:231
 msgid "Current user"
-msgstr "Kasutaja �ige"
+msgstr "Praegune kasutaja"
 
-#: ../../standalone/drakperm_.c:249
-#, fuzzy
+#: ../../standalone/drakperm_.c:236
 msgid "Permissions"
-msgstr "Versioon: %s\n"
+msgstr "Loabitid"
 
-#: ../../standalone/drakperm_.c:250
+#: ../../standalone/drakperm_.c:237
 msgid "Path"
-msgstr ""
+msgstr "Asukoht"
 
-#: ../../standalone/drakperm_.c:251
-#, fuzzy
+#: ../../standalone/drakperm_.c:238
 msgid "Property"
-msgstr "Port"
+msgstr "Omadus"
 
-#: ../../standalone/drakperm_.c:253
+#: ../../standalone/drakperm_.c:240
 msgid "sticky-bit"
-msgstr ""
+msgstr "kleepumisbitt"
 
-#: ../../standalone/drakperm_.c:254
+#: ../../standalone/drakperm_.c:241
 msgid "Set-UID"
-msgstr ""
+msgstr "Set-UID"
 
-#: ../../standalone/drakperm_.c:255
+#: ../../standalone/drakperm_.c:242
 msgid "Set-GID"
-msgstr ""
+msgstr "Set-GID"
 
-#: ../../standalone/drakperm_.c:310
+#: ../../standalone/drakperm_.c:296
 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_.c:311
-#, fuzzy
+#: ../../standalone/drakperm_.c:297
 msgid "Use owner id for execution"
-msgstr "Kasuta automaattuvastust"
+msgstr "Käivitamiseks kasutatakse omaniku id-d"
 
-#: ../../standalone/drakperm_.c:312
-#, fuzzy
+#: ../../standalone/drakperm_.c:298
 msgid "Use group id for execution"
-msgstr "Kasuta automaattuvastust"
+msgstr "Käivitamiseks kasutatakse grupi id-d"
 
-#: ../../standalone/drakperm_.c:313
+#: ../../standalone/drakperm_.c:299
 msgid "when checked, owner and group won't be changed"
-msgstr ""
+msgstr "märkimise korral ei muudeta omanikku ja gruppi"
 
-#: ../../standalone/drakperm_.c:318
-#, fuzzy
+#: ../../standalone/drakperm_.c:304
 msgid "Path selection"
-msgstr "Salvest paketivalik"
+msgstr "Asukoha valik"
 
-#: ../../standalone/drakperm_.c:364
-#, fuzzy
+#: ../../standalone/drakperm_.c:350
 msgid "user :"
-msgstr "Kasutajatunnus:"
+msgstr "kasutaja :"
 
-#: ../../standalone/drakperm_.c:366
-#, fuzzy
+#: ../../standalone/drakperm_.c:352
 msgid "group :"
-msgstr "T��grupp"
+msgstr "grupp :"
 
-#: ../../standalone/draksound_.c:47
-#, fuzzy
+#: ../../standalone/draksound_.c:46
 msgid "No Sound Card detected!"
-msgstr "Ei ole �hendatud"
+msgstr "Helikaarti ei leitud!"
 
-#: ../../standalone/draksound_.c:48
+#: ../../standalone/draksound_.c:47
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
 "supported Sound Card is correctly plugged in.\n"
@@ -12469,8 +13915,16 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
+"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/draksound_.c:55
+#: ../../standalone/draksound_.c:54
 msgid ""
 "\n"
 "\n"
@@ -12478,140 +13932,145 @@ msgid ""
 "Note: if you've an ISA PnP sound card, you'll have to use the sndconfig "
 "program.  Just type \"sndconfig\" in a console."
 msgstr ""
+"\n"
+"\n"
+"\n"
+"Märkus: kui Teil on ISA PnP helikaart, tuleb kasutada rakendust sndconfig. "
+"Selleks kirjutage käsureale \"sndconfig\"."
 
-#: ../../standalone/draksplash_.c:34
+#: ../../standalone/draksplash_.c:21
 msgid ""
 "package 'ImageMagick' is required for correct working.\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/draksplash_.c:78
-#, fuzzy
+#: ../../standalone/draksplash_.c:67
 msgid "first step creation"
-msgstr "Alglaadimise stiil"
+msgstr "esimene samm loomine"
 
-#: ../../standalone/draksplash_.c:79
-#, fuzzy
+#: ../../standalone/draksplash_.c:70
 msgid "final resolution"
-msgstr "Kuvatihedus"
+msgstr "lõplik kuvatihedus"
 
-#: ../../standalone/draksplash_.c:80 ../../standalone/draksplash_.c:172
-#, fuzzy
+#: ../../standalone/draksplash_.c:71 ../../standalone/draksplash_.c:163
 msgid "choose image file"
-msgstr "Valige tegevus"
+msgstr "valige pildifail"
 
-#: ../../standalone/draksplash_.c:81
-#, fuzzy
+#: ../../standalone/draksplash_.c:72
 msgid "Theme name"
-msgstr "Jagatav printer"
+msgstr "Teema nimi"
 
-#: ../../standalone/draksplash_.c:85
+#: ../../standalone/draksplash_.c:77
 msgid "Browse"
-msgstr ""
+msgstr "Lehitse"
 
-#: ../../standalone/draksplash_.c:99 ../../standalone/draksplash_.c:162
-#, fuzzy
+#: ../../standalone/draksplash_.c:87 ../../standalone/draksplash_.c:153
 msgid "Configure bootsplash picture"
-msgstr "Teenuste s�tted"
+msgstr "Käivituslogo pildi seadistamine"
 
-#: ../../standalone/draksplash_.c:100
+#: ../../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_.c:101
+#: ../../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_.c:102
+#: ../../standalone/draksplash_.c:92
 msgid "text width"
-msgstr ""
+msgstr "teksti laius"
 
-#: ../../standalone/draksplash_.c:103
+#: ../../standalone/draksplash_.c:93
 msgid "text box height"
-msgstr ""
+msgstr "tekstikasti kõrgus"
 
-#: ../../standalone/draksplash_.c:104
+#: ../../standalone/draksplash_.c:94
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
 msgstr ""
+"edenemisriba ülemise vasaku\n"
+"nurga x-koordinaat"
 
-#: ../../standalone/draksplash_.c:105
+#: ../../standalone/draksplash_.c:95
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
 msgstr ""
+"edenemisriba ülemise vasaku\n"
+"nurga y-koordinaat"
 
-#: ../../standalone/draksplash_.c:106
+#: ../../standalone/draksplash_.c:96
 msgid "the width of the progress bar"
-msgstr ""
+msgstr "edenemisriba laius"
 
-#: ../../standalone/draksplash_.c:107
+#: ../../standalone/draksplash_.c:97
 msgid "the heigth of the progress bar"
-msgstr ""
+msgstr "edenemisriba kõrgus"
 
-#: ../../standalone/draksplash_.c:108
+#: ../../standalone/draksplash_.c:98
 msgid "the color of the progress bar"
-msgstr ""
+msgstr "edenemisriba värv"
 
-#: ../../standalone/draksplash_.c:121
-#, fuzzy
+#: ../../standalone/draksplash_.c:113
 msgid "Preview"
-msgstr "seade"
+msgstr "Eelvaade"
 
-#: ../../standalone/draksplash_.c:123
-#, fuzzy
+#: ../../standalone/draksplash_.c:115
 msgid "Save theme"
-msgstr "S�steemi installimine"
+msgstr "Teema salvestamine"
 
-#: ../../standalone/draksplash_.c:124
-#, fuzzy
+#: ../../standalone/draksplash_.c:116
 msgid "Choose color"
-msgstr "Valige monitor"
+msgstr "Värvi valimine"
 
-#: ../../standalone/draksplash_.c:127
+#: ../../standalone/draksplash_.c:119
 msgid "Display logo on Console"
-msgstr ""
+msgstr "Logo näitamine konsoolil"
 
-#: ../../standalone/draksplash_.c:128
+#: ../../standalone/draksplash_.c:120
 msgid "Make kernel message quiet by default"
-msgstr ""
+msgstr "Vaikimisi kerneli sõnumi keelamine"
 
-#: ../../standalone/draksplash_.c:165 ../../standalone/draksplash_.c:329
+#: ../../standalone/draksplash_.c:156 ../../standalone/draksplash_.c:321
 #, c-format
 msgid "This theme haven't yet any bootsplash in %s !"
-msgstr ""
+msgstr "Sellel teemal ei ole veel ühtegi käivituslogo %s !"
 
-#: ../../standalone/draksplash_.c:212
+#: ../../standalone/draksplash_.c:205
 msgid "saving Bootsplash theme..."
-msgstr ""
+msgstr "Käivituslogo teema salvestamine..."
 
-#: ../../standalone/draksplash_.c:435
-#, fuzzy
+#: ../../standalone/draksplash_.c:428
 msgid "ProgressBar color selection"
-msgstr "Printeri �hendusviis"
+msgstr "Edenemisriba värvi valimine"
 
-#: ../../standalone/draksplash_.c:456
-#, fuzzy
+#: ../../standalone/draksplash_.c:449
 msgid "You must choose an image file first!"
-msgstr "Printeri seadme URI"
+msgstr "Esmalt tuleb valida pildifail!"
 
-#: ../../standalone/draksplash_.c:465
-#, fuzzy
+#: ../../standalone/draksplash_.c:458
 msgid "Generating preview ..."
-msgstr "Otsin printerit..."
+msgstr "Eelvaate tekitamine ..."
 
 #. -PO  First %s is theme name, second %s (in parenthesis) is resolution
-#: ../../standalone/draksplash_.c:511
+#: ../../standalone/draksplash_.c:506
 #, c-format
 msgid "%s BootSplash (%s) preview"
-msgstr ""
+msgstr "%s käivituslogo (%s) eelvaade"
 
-#: ../../standalone/drakxtv_.c:49
+#: ../../standalone/drakxtv_.c:46
 msgid ""
 "XawTV isn't installed!\n"
 "\n"
@@ -12625,121 +14084,128 @@ msgid ""
 "\n"
 "You can install it by typing \"urpmi xawtv\" as root, in a console."
 msgstr ""
+"XawTV ei ole paigaldatud!\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"
+"\n"
+"\n"
+"Te võite selle paigaldada, andes administraatorina konsoolis käsu\n"
+"\"urpmi xawtv\"."
 
-#: ../../standalone/drakxtv_.c:66
-#, fuzzy
+#: ../../standalone/drakxtv_.c:63
 msgid "Canada (cable)"
-msgstr "Kanada (Quebec)"
+msgstr "Kanada (kaabel)"
 
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
 msgid "USA (broadcast)"
-msgstr ""
+msgstr "USA (tele)"
 
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
 msgid "USA (cable)"
-msgstr ""
+msgstr "USA (kaabel)"
 
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
 msgid "USA (cable-hrc)"
-msgstr ""
+msgstr "USA (kaabel-hrc)"
 
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
 msgid "China (broadcast)"
-msgstr ""
+msgstr "Hiina (tele)"
 
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
 msgid "Japan (broadcast)"
-msgstr ""
+msgstr "Jaapan (tele)"
 
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
 msgid "Japan (cable)"
-msgstr ""
+msgstr "Jaapan (kaabel)"
 
-#: ../../standalone/drakxtv_.c:68
-#, fuzzy
+#: ../../standalone/drakxtv_.c:65
 msgid "East Europe"
-msgstr "Euroopa"
+msgstr "Ida-Euroopa"
 
-#: ../../standalone/drakxtv_.c:68
-#, fuzzy
+#: ../../standalone/drakxtv_.c:65
 msgid "France [SECAM]"
-msgstr "Prantsusmaa"
+msgstr "Prantsusmaa [SECAM]"
 
-#: ../../standalone/drakxtv_.c:68
-#, fuzzy
+#: ../../standalone/drakxtv_.c:65
 msgid "Ireland"
-msgstr "Islandi"
+msgstr "Iirimaa"
 
-#: ../../standalone/drakxtv_.c:68
-#, fuzzy
+#: ../../standalone/drakxtv_.c:65
 msgid "West Europe"
-msgstr "Euroopa"
+msgstr "Lääne-Euroopa"
 
-#: ../../standalone/drakxtv_.c:69
-#, fuzzy
+#: ../../standalone/drakxtv_.c:66
 msgid "Australia"
-msgstr "seerial"
+msgstr "Austraalia"
 
-#: ../../standalone/drakxtv_.c:69
+#: ../../standalone/drakxtv_.c:66
 msgid "Newzealand"
-msgstr ""
+msgstr "Uus-Meremaa"
 
-#: ../../standalone/drakxtv_.c:70
+#: ../../standalone/drakxtv_.c:67
 msgid "South Africa"
-msgstr ""
+msgstr "Lõuna-Aafrika"
 
-#: ../../standalone/drakxtv_.c:71
+#: ../../standalone/drakxtv_.c:68
 msgid "Argentina"
-msgstr ""
+msgstr "Argentina"
 
-#: ../../standalone/drakxtv_.c:72
+#: ../../standalone/drakxtv_.c:69
 msgid "Australian Optus cable TV"
-msgstr ""
+msgstr "Austraalia Optus kaabli-TV"
 
-#: ../../standalone/drakxtv_.c:107
+#: ../../standalone/drakxtv_.c:102
 msgid ""
 "Please,\n"
 "type in your tv norm and country"
 msgstr ""
+"Palun märkige ära\n"
+"oma telesüsteem ja riik"
 
-#: ../../standalone/drakxtv_.c:109
+#: ../../standalone/drakxtv_.c:104
 msgid "TV norm:"
-msgstr ""
+msgstr "Telesüsteem:"
 
-#: ../../standalone/drakxtv_.c:110
+#: ../../standalone/drakxtv_.c:105
 msgid "Area:"
-msgstr ""
+msgstr "Piirkond:"
 
-#: ../../standalone/drakxtv_.c:114
+#: ../../standalone/drakxtv_.c:109
 msgid "Scanning for TV channels in progress ..."
-msgstr ""
+msgstr "Telekanalite otsingu edenemine ..."
 
-#: ../../standalone/drakxtv_.c:122
+#: ../../standalone/drakxtv_.c:116
 msgid "Scanning for TV channels"
-msgstr ""
+msgstr "Telekanalite otsing"
 
-#: ../../standalone/drakxtv_.c:125
-#, fuzzy
+#: ../../standalone/drakxtv_.c:120
 msgid "There was an error while scanning for TV channels"
-msgstr "Pakettide installimisel tekkis viga:"
+msgstr "Telekanalite otsingul tekkis viga"
 
-#: ../../standalone/drakxtv_.c:126
+#: ../../standalone/drakxtv_.c:121
 msgid "XawTV isn't installed!"
-msgstr ""
+msgstr "XawTV ei ole paigaldatud!"
 
-#: ../../standalone/drakxtv_.c:129
+#: ../../standalone/drakxtv_.c:124
 msgid "Have a nice day!"
-msgstr ""
+msgstr "Peatse jällenägemiseni!"
 
-#: ../../standalone/drakxtv_.c:130
+#: ../../standalone/drakxtv_.c:125
 msgid "Now, you can run xawtv (under X Window!) !\n"
-msgstr ""
+msgstr "Nüüd võite xawtv tööle panna (X Window keskkonnas!) !\n"
 
-#: ../../standalone/drakxtv_.c:153
+#: ../../standalone/drakxtv_.c:147
 msgid "No TV Card detected!"
-msgstr ""
+msgstr "TV-kaarti ei leitud!"
 
-#: ../../standalone/drakxtv_.c:154
+#: ../../standalone/drakxtv_.c:148
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
 "supported Video/TV Card is correctly plugged in.\n"
@@ -12750,336 +14216,827 @@ msgid ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 msgstr ""
+"Teie masinal ei leitud TV-kaarti. Kontrollige palun, et Linuxi toega video/"
+"TV-kaart on korrektselt ühendatud.\n"
+"\n"
+"\n"
+"Meie riistvara andmebaasi saate külastada aadressil:\n"
+"\n"
+"\n"
+"http://www.linux-mandrake.com/en/hardware.php3"
+
+#: ../../standalone/harddrake2_.c:17
+msgid "Alternative drivers"
+msgstr "Alternatiivsed draiverid"
+
+#: ../../standalone/harddrake2_.c:18
+msgid "the list of alternative drivers for this sound card"
+msgstr "selle helikaardi alternatiivsete draiverite loend"
+
+#: ../../standalone/harddrake2_.c:20
+msgid "Bus"
+msgstr "Siin"
+
+#: ../../standalone/harddrake2_.c:21
+msgid ""
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
+msgstr "see on füüsiline siin, millega seade on ühendatud (nt: PCI, USB, ...)"
+
+#: ../../standalone/harddrake2_.c:22
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../../standalone/harddrake2_.c:22
+msgid "EIDE/SCSI channel"
+msgstr "EIDE/SCSI kanal"
+
+#: ../../standalone/harddrake2_.c:23
+msgid "Bogomips"
+msgstr "Bogomipsid"
+
+#: ../../standalone/harddrake2_.c:23
+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."
+msgstr ""
+"GNU/Linuxi kernel peab alglaadimise ajal ajaarvesti lähtestamiseks\n"
+"\tsooritama kalkulatsioonisilmuse.  Selle tulemus salvestatakse "
+"bogomipsides, mis kujutab endast omamoodi CPU \"jõudlustesti\"."
+
+#: ../../standalone/harddrake2_.c:26
+msgid "Bus identification"
+msgstr "Siinitunnus"
+
+#: ../../standalone/harddrake2_.c:27
+msgid ""
+"- PCI and USB devices: this list the vendor, device, subvendor and subdevice "
+"PCI/USB ids"
+msgstr ""
+" -PCI- ja USB-seadmed: tootja, seade, allettevõtja ja allseadme PCI/USB id-d"
+
+#: ../../standalone/harddrake2_.c:29
+msgid "Location on the bus"
+msgstr "Asukoht siinil"
+
+#: ../../standalone/harddrake2_.c:30
+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"
+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"
+
+#: ../../standalone/harddrake2_.c:33
+msgid "Cache size"
+msgstr "Puhvri suurus"
+
+#: ../../standalone/harddrake2_.c:33
+msgid "Size of the (second level) cpu cache"
+msgstr "(Teise taseme) CPU puhvri suurus"
+
+#: ../../standalone/harddrake2_.c:34
+msgid "Coma bug:"
+msgstr "\"Koomaviga\":"
+
+#: ../../standalone/harddrake2_.c:34
+msgid "Does this cpu has Cyrix 6x86 Coma bug ?"
+msgstr "Kas sel CPU-l on Cyrix 6x86 \"koomaviga\" ?"
+
+#: ../../standalone/harddrake2_.c:35
+msgid "Cpuid family"
+msgstr "Cpuid perekond"
+
+#: ../../standalone/harddrake2_.c:35
+msgid "Family of the cpu (eg: 6 for i686 class)"
+msgstr "CPU perekond (nt 6, kui on i686)"
+
+#: ../../standalone/harddrake2_.c:36
+msgid "Cpuid level"
+msgstr "Cpuid tase"
+
+#: ../../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_.c:37
+msgid "Frequency (MHz)"
+msgstr "Sagedus (MHz)"
+
+#: ../../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_.c:38
+msgid "This field describes the device"
+msgstr "See väli kirjeldab seadet"
+
+#: ../../standalone/harddrake2_.c:39
+msgid "Old device file"
+msgstr "Vana seadmefail"
+
+#: ../../standalone/harddrake2_.c:40
+msgid "old static device name used in dev package"
+msgstr "vana staatiline seadmenimi, mis oli kasutusel paketis dev"
+
+#: ../../standalone/harddrake2_.c:41
+msgid "New devfs device"
+msgstr "Uus devfs seade"
+
+#: ../../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_.c:43
+msgid "Module"
+msgstr "Moodul"
+
+#: ../../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_.c:44
+msgid "CPU flags reported by the kernel"
+msgstr "CPU lipud kerneli teatel"
+
+#: ../../standalone/harddrake2_.c:44
+msgid "Flags"
+msgstr "Lipud"
+
+#: ../../standalone/harddrake2_.c:45
+msgid "Fdiv bug"
+msgstr "FDIV viga"
+
+#: ../../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_.c:49
+msgid "Is FPU present"
+msgstr "Kas FPU on olemas"
+
+#: ../../standalone/harddrake2_.c:49
+msgid "yes means the processor has an arithmetic coprocessor"
+msgstr "jah tähendab, et protsessoril on matemaatika-kaasprotsessor"
+
+#: ../../standalone/harddrake2_.c:50
+msgid "Does FPU have an irq vector"
+msgstr "KAS FPU-l on irq vektor"
+
+#: ../../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_.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_.c:51
+msgid "F00f bug"
+msgstr "F00f viga"
+
+#: ../../standalone/harddrake2_.c:52
+msgid "Halt bug"
+msgstr "Seiskamisviga"
+
+#: ../../standalone/harddrake2_.c:53
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
+msgstr ""
+"Mõned varasemad i486DX-100 kiibid ei suutnud korralikult naasta tööresiimi, "
+"kui oli kasutatud käsklust \"seiska\" (\"halt\")"
+
+#: ../../standalone/harddrake2_.c:55
+msgid "Floppy format"
+msgstr "Flopi vorming"
+
+#: ../../standalone/harddrake2_.c:55
+msgid "Format of floppies the drive accept"
+msgstr "Flopi vorming, mida seade tunnustab"
+
+#: ../../standalone/harddrake2_.c:56
+msgid "Level"
+msgstr "Tase"
+
+#: ../../standalone/harddrake2_.c:56
+msgid "Sub generation of the cpu"
+msgstr "CPU alampõlvkond"
+
+#: ../../standalone/harddrake2_.c:57
+msgid "Media class"
+msgstr "Andmekandja klass"
+
+#: ../../standalone/harddrake2_.c:57
+msgid "class of hardware device"
+msgstr "riistvaralise seadme klass"
+
+#: ../../standalone/harddrake2_.c:58 ../../standalone/harddrake2_.c:59
+msgid "Model"
+msgstr "Mudel"
+
+#: ../../standalone/harddrake2_.c:58
+msgid "hard disk model"
+msgstr "kõvaketta mudel"
+
+#: ../../standalone/harddrake2_.c:59
+msgid "Generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgstr "CPU genereerimine (nt 8, kui on PentiumIII, ...)"
+
+#: ../../standalone/harddrake2_.c:60
+msgid "Model name"
+msgstr "Mudeli nimi"
+
+#: ../../standalone/harddrake2_.c:60
+msgid "Official vendor name of the cpu"
+msgstr "CPU ametlik tootja"
+
+#: ../../standalone/harddrake2_.c:61
+msgid "Number of buttons"
+msgstr "Nuppude arv"
+
+#: ../../standalone/harddrake2_.c:62
+msgid "Name"
+msgstr "Nimi"
+
+#: ../../standalone/harddrake2_.c:63
+msgid "network printer port"
+msgstr "võrguprinteri port"
+
+#: ../../standalone/harddrake2_.c:64
+msgid "Processor ID"
+msgstr "Protsessori ID"
+
+#: ../../standalone/harddrake2_.c:64
+msgid "the number of the processor"
+msgstr "protsessori number"
+
+#: ../../standalone/harddrake2_.c:65
+msgid "Model stepping"
+msgstr "Mudeli alamtüüp"
+
+#: ../../standalone/harddrake2_.c:65
+msgid "Stepping of the cpu (sub model (generation) number)"
+msgstr "Protsessori alamtüüp (nn stepping'u number) "
+
+#: ../../standalone/harddrake2_.c:66
+msgid "The type of bus on which the mouse is connected"
+msgstr "Siinitüüp, millega hiir on ühendatud"
+
+#: ../../standalone/harddrake2_.c:67
+msgid "the vendor name of the device"
+msgstr "seadme tootja nimi"
+
+#: ../../standalone/harddrake2_.c:68
+msgid "the vendor name of the processor"
+msgstr "protsessori tootja nimi"
+
+#: ../../standalone/harddrake2_.c:82
+msgid "/_Quit"
+msgstr "/_Välju"
+
+#: ../../standalone/harddrake2_.c:83
+msgid "/Autodetect _printers"
+msgstr "/_Printerite automaattuvastus"
+
+#: ../../standalone/harddrake2_.c:83 ../../standalone/harddrake2_.c:85
+#: ../../standalone/logdrake_.c:81
+msgid "/_Options"
+msgstr "/_Eelistused"
+
+#: ../../standalone/harddrake2_.c:85
+msgid "/Autodetect _modems"
+msgstr "/_Modemite automaattuvastus"
+
+#: ../../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_.c:89
+msgid "/_Help..."
+msgstr "/_Abi..."
+
+#: ../../standalone/harddrake2_.c:92
+msgid "Harddrake help"
+msgstr "Harddrake abi"
 
-#: ../../standalone/harddrake2_.c:8
-#, fuzzy
+#: ../../standalone/harddrake2_.c:93
 msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"Väljade kirjeldus:\n"
 "\n"
-"Usage: harddrake [-h|--help] [--test]\n"
-msgstr "kasutamiseks: keyboarddrake [--expert] [keyboard]\n"
 
-#: ../../standalone/keyboarddrake_.c:16
-msgid "usage: keyboarddrake [--expert] [keyboard]\n"
-msgstr "kasutamiseks: keyboarddrake [--expert] [keyboard]\n"
+#: ../../standalone/harddrake2_.c:96
+msgid ""
+"Once you've selected a device, you'll be able to see explanations on fields "
+"displayed on the right frame (\"Information\")"
+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 !"
+
+#: ../../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_.c:105
+msgid ""
+"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"Version:"
+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 "
+
+#: ../../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_.c:137
+msgid "Run config tool"
+msgstr "Seadistamisvahendi kävitamine"
+
+#: ../../standalone/harddrake2_.c:143
+#, c-format
+msgid "Running \"%s\" ..."
+msgstr "\"%s\" käib..."
+
+#: ../../standalone/harddrake2_.c:159
+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"
+
+#: ../../standalone/harddrake2_.c:231
+msgid "secondary"
+msgstr "sekundaarne"
+
+#: ../../standalone/harddrake2_.c:260
+msgid "/Autodetect modems"
+msgstr "/Modemite automaattuvastus"
+
+#: ../../standalone/harddrake2_.c:260
+msgid "/Autodetect printers"
+msgstr "/Printerite automaattuvastus"
+
+#: ../../standalone/harddrake2_.c:261
+msgid "/Options"
+msgstr "/Eelistused"
 
-#: ../../standalone/keyboarddrake_.c:32
+#: ../../standalone/keyboarddrake_.c:26
 msgid "Please, choose your keyboard layout."
-msgstr "Palun valige klaviatuuriasetus"
+msgstr "Palun valige klaviatuuriasetus."
 
-#: ../../standalone/keyboarddrake_.c:41
+#: ../../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:24
+#: ../../standalone/livedrake_.c:18
 msgid "Change Cd-Rom"
-msgstr "Vaheta CD plaat"
+msgstr "Vahetage CD-ROM"
 
-#: ../../standalone/livedrake_.c:25
+#: ../../standalone/livedrake_.c:19
 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."
 msgstr ""
-"Palun sisestage installeerimise CD pealdisega lugejasse ja vajutage <OK>.\n"
-"Kui teil s�herdust ei ole, vajutage <Katkesta>, et kiiruendust v�ltida."
+"Palun sisestage paigaldus-CD lugejasse ja vajutage <Olgu>.\n"
+"Kui teil säherdust ei ole, vajutage <Katkesta>, et kiiruuendust vältida."
 
-#: ../../standalone/livedrake_.c:35
+#: ../../standalone/livedrake_.c:29
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Ei saa kiiruuendust alustada !!!\n"
 
-#: ../../standalone/localedrake_.c:33
+#: ../../standalone/localedrake_.c:34
 msgid "The change is done, but to be effective you must logout"
-msgstr ""
+msgstr "Muudatus on tehtud, aga selle rakendamiseks tuleb välja logida"
 
-#: ../../standalone/logdrake_.c:86 ../../ugtk.pm_.c:285
-#, fuzzy
+#: ../../standalone/logdrake_.c:56 ../../ugtk.pm_.c:284 ../../ugtk2.pm_.c:350
 msgid "logdrake"
-msgstr "DrakNet"
+msgstr "logdrake"
 
-#: ../../standalone/logdrake_.c:96
+#: ../../standalone/logdrake_.c:68
 msgid "Show only for the selected day"
-msgstr ""
+msgstr "Ainult valitud päeval näitamine"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:75
 msgid "/File/_New"
 msgstr "/Fail/_Uus"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:75
 msgid "<control>N"
 msgstr "<control>N"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:76
 msgid "/File/_Open"
 msgstr "/Fail/_Ava"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:76
 msgid "<control>O"
 msgstr "<control>O"
 
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:77
 msgid "/File/_Save"
 msgstr "/Fail/_Salvesta"
 
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:77
 msgid "<control>S"
 msgstr "<control>S"
 
-#: ../../standalone/logdrake_.c:106
+#: ../../standalone/logdrake_.c:78
 msgid "/File/Save _As"
 msgstr "/Fail/Salvesta _Kui"
 
-#: ../../standalone/logdrake_.c:107
+#: ../../standalone/logdrake_.c:79
 msgid "/File/-"
 msgstr "/Fail/-"
 
-#: ../../standalone/logdrake_.c:109
-msgid "/_Options"
-msgstr "/_Eelistused"
-
-#: ../../standalone/logdrake_.c:110
+#: ../../standalone/logdrake_.c:82
 msgid "/Options/Test"
 msgstr "/Eelistused/Test"
 
-#: ../../standalone/logdrake_.c:112
+#: ../../standalone/logdrake_.c:84
 msgid "/Help/_About..."
-msgstr "/Abi/_Misv�rk"
-
-#: ../../standalone/logdrake_.c:119
-msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
-msgstr ""
-
-#: ../../standalone/logdrake_.c:120
-msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-msgstr ""
+msgstr "/Abi/_Misvärk"
 
-#: ../../standalone/logdrake_.c:174
-#, fuzzy
+#: ../../standalone/logdrake_.c:145
 msgid "User"
-msgstr "Kasutajatunnus"
+msgstr "Kasutaja"
 
-#: ../../standalone/logdrake_.c:175
-#, fuzzy
+#: ../../standalone/logdrake_.c:146
 msgid "Messages"
-msgstr "Initsialiseerimisteade"
+msgstr "Sõnumid"
 
-#: ../../standalone/logdrake_.c:176
+#: ../../standalone/logdrake_.c:147
 msgid "Syslog"
-msgstr ""
+msgstr "Syslog"
 
-#: ../../standalone/logdrake_.c:177
+#: ../../standalone/logdrake_.c:148
 msgid "Mandrake Tools Explanations"
-msgstr ""
+msgstr "Mandrake vahendite seletused"
 
-#: ../../standalone/logdrake_.c:180
+#: ../../standalone/logdrake_.c:151
 msgid "search"
-msgstr ""
+msgstr "otsing"
 
-#: ../../standalone/logdrake_.c:186
+#: ../../standalone/logdrake_.c:161
 msgid "A tool to monitor your logs"
-msgstr ""
+msgstr "Vahend logide jälgimiseks"
 
-#: ../../standalone/logdrake_.c:187
+#: ../../standalone/logdrake_.c:162 ../../standalone/net_monitor_.c:91
 msgid "Settings"
-msgstr ""
+msgstr "Sätted"
 
-#: ../../standalone/logdrake_.c:192
-#, fuzzy
+#: ../../standalone/logdrake_.c:167
 msgid "matching"
-msgstr "Masin:"
+msgstr "sobib"
 
-#: ../../standalone/logdrake_.c:193
-#, fuzzy
+#: ../../standalone/logdrake_.c:168
 msgid "but not matching"
-msgstr "Masin:"
+msgstr "aga ei sobi"
 
-#: ../../standalone/logdrake_.c:197
+#: ../../standalone/logdrake_.c:172
 msgid "Choose file"
-msgstr ""
+msgstr "Faili valimine"
 
-#: ../../standalone/logdrake_.c:202
+#: ../../standalone/logdrake_.c:181
 msgid "Calendar"
-msgstr ""
+msgstr "Kalender"
 
-#: ../../standalone/logdrake_.c:212
+#: ../../standalone/logdrake_.c:191
 msgid "Content of the file"
-msgstr ""
+msgstr "Faili sisu"
 
-#: ../../standalone/logdrake_.c:216 ../../standalone/logdrake_.c:392
+#: ../../standalone/logdrake_.c:195 ../../standalone/logdrake_.c:375
 msgid "Mail alert"
-msgstr ""
+msgstr "Meilihoiatus"
 
-#: ../../standalone/logdrake_.c:268
+#: ../../standalone/logdrake_.c:245
 #, c-format
 msgid "please wait, parsing file: %s"
-msgstr ""
+msgstr "palun oodake, analüüsin faili: %s"
 
-#: ../../standalone/logdrake_.c:409
-#, fuzzy
+#: ../../standalone/logdrake_.c:392
 msgid "Mail alert configuration"
-msgstr "LAN s�tted"
+msgstr "Meilihoiatuse sätted"
 
-#: ../../standalone/logdrake_.c:410
+#: ../../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_.c:417
+#: ../../standalone/logdrake_.c:400
 msgid "Apache World Wide Web Server"
-msgstr ""
+msgstr "Apache veebiserver"
 
-#: ../../standalone/logdrake_.c:418
-#, fuzzy
+#: ../../standalone/logdrake_.c:401
 msgid "Domain Name Resolver"
-msgstr "Domeeninimi"
+msgstr "Domeeninimede lahendaja"
 
-#: ../../standalone/logdrake_.c:419
-#, fuzzy
+#: ../../standalone/logdrake_.c:402
 msgid "Ftp Server"
-msgstr "NIS server:"
+msgstr "Ftp server"
 
-#: ../../standalone/logdrake_.c:420
-#, fuzzy
+#: ../../standalone/logdrake_.c:403
 msgid "Postfix Mail Server"
-msgstr "Server, Andmebaasid"
+msgstr "Postfix meiliserver"
 
-#: ../../standalone/logdrake_.c:421
-#, fuzzy
+#: ../../standalone/logdrake_.c:404
 msgid "Samba Server"
-msgstr "NIS server:"
+msgstr "Samba server"
 
-#: ../../standalone/logdrake_.c:422
-#, fuzzy
+#: ../../standalone/logdrake_.c:405
 msgid "SSH Server"
-msgstr "NIS server:"
+msgstr "SSH server"
 
-#: ../../standalone/logdrake_.c:423
-#, fuzzy
+#: ../../standalone/logdrake_.c:406
 msgid "Webmin Service"
-msgstr "seade"
+msgstr "Webmin teenus"
 
-#: ../../standalone/logdrake_.c:424
-#, fuzzy
+#: ../../standalone/logdrake_.c:407
 msgid "Xinetd Service"
-msgstr "Printserver:"
+msgstr "Xinetd teenus"
 
-#: ../../standalone/logdrake_.c:431
-#, fuzzy
+#: ../../standalone/logdrake_.c:414
 msgid "service setting"
-msgstr "huvitav"
+msgstr "teenuse sätted"
 
-#: ../../standalone/logdrake_.c:432
+#: ../../standalone/logdrake_.c:415
 msgid ""
 "You will receive an alert if one of the selected services is no more running"
-msgstr ""
+msgstr "Saate hoiatuse, kui üks valitud teenustest enam ei tööta"
 
-#: ../../standalone/logdrake_.c:444
-#, fuzzy
+#: ../../standalone/logdrake_.c:428
 msgid "load setting"
-msgstr "vormindatakse"
+msgstr "koormuse sätted"
 
-#: ../../standalone/logdrake_.c:445
+#: ../../standalone/logdrake_.c:429
 msgid "You will receive an alert if the load is higher than this value"
-msgstr ""
+msgstr "Saate hoiatuse, kui koormus on siin määratust suurem"
 
-#: ../../standalone/logdrake_.c:458
-#, fuzzy
+#: ../../standalone/logdrake_.c:444
 msgid "alert configuration"
-msgstr "Seadistused"
+msgstr "hoiatuse sätted"
 
-#: ../../standalone/logdrake_.c:459
-#, fuzzy
+#: ../../standalone/logdrake_.c:445
 msgid "Please enter your email address below "
-msgstr "Palun proovige veel"
+msgstr "Sisestage palun siia oma e-posti aadress"
 
-#: ../../standalone/logdrake_.c:498
+#: ../../standalone/logdrake_.c:486
 msgid "Save as.."
 msgstr "Salvesta kui..."
 
-#: ../../standalone/mousedrake_.c:45
+#: ../../standalone/mousedrake_.c:37
 msgid "Please, choose the type of your mouse."
-msgstr "Palun valige hiire t��p"
+msgstr "Palun valige hiire tüüp."
 
-#: ../../standalone/mousedrake_.c:58
+#: ../../standalone/mousedrake_.c:50
 msgid "Emulate third button?"
-msgstr "Teeskleme keskmist hiirenuppu?"
+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/net_monitor_.c:103
+msgid "Sending Speed:"
+msgstr "Saatmise kiirus:"
+
+#: ../../standalone/net_monitor_.c:104
+msgid "Receiving Speed:"
+msgstr "Saamise kiirus:"
+
+#: ../../standalone/net_monitor_.c:106
+msgid "Connection Time: "
+msgstr "Ühenduse kestvus: "
+
+#: ../../standalone/net_monitor_.c:113
+msgid "Logs"
+msgstr "Logifailid"
+
+#: ../../standalone/net_monitor_.c:147
+msgid "Wait please, testing your connection..."
+msgstr "Oodake palun, testime Teie ühendust..."
+
+#: ../../standalone/net_monitor_.c:178 ../../standalone/net_monitor_.c:191
+msgid "Connecting to Internet "
+msgstr "Loo internetiühendus"
+
+#: ../../standalone/net_monitor_.c:178 ../../standalone/net_monitor_.c:191
+msgid "Disconnecting from Internet "
+msgstr "Katkesta internetiühendus"
+
+#: ../../standalone/net_monitor_.c:222
+msgid "Disconnection from Internet failed."
+msgstr "Internetiühenduse katkestamine ebaõnnestus."
+
+#: ../../standalone/net_monitor_.c:223
+msgid "Disconnection from Internet complete."
+msgstr "Internetiühendus on katkestatud."
+
+#: ../../standalone/net_monitor_.c:225
+msgid "Connection complete."
+msgstr "Ühendus on loodud."
+
+#: ../../standalone/net_monitor_.c:226
+msgid ""
+"Connection failed.\n"
+"Verify your configuration in the Mandrake Control Center."
+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/printerdrake_.c:57
-#, fuzzy
+#: ../../standalone/net_monitor_.c:383 ../../standalone/net_monitor_.c:403
+msgid "sent: "
+msgstr "saadetud: "
+
+#: ../../standalone/net_monitor_.c:390 ../../standalone/net_monitor_.c:407
+msgid "received: "
+msgstr "saadud: "
+
+#: ../../standalone/net_monitor_.c:397
+msgid "average"
+msgstr "keskmine"
+
+#: ../../standalone/net_monitor_.c:400
+msgid "Local measure"
+msgstr "Kohalikud andmed"
+
+#: ../../standalone/net_monitor_.c:432
+msgid "transmitted"
+msgstr "üle kantud"
+
+#: ../../standalone/net_monitor_.c:433
+msgid "received"
+msgstr "saadud"
+
+#: ../../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_.c:459
+#, c-format
+msgid "Connect %s"
+msgstr "%s ühenduse loomine"
+
+#: ../../standalone/net_monitor_.c:459
+#, c-format
+msgid "Disconnect %s"
+msgstr "%s ühenduse katkestamine"
+
+#: ../../standalone/printerdrake_.c:47
 msgid "Reading printer data ..."
-msgstr "Loetakse CUPS juhtprogramme"
+msgstr "Printeri andmete lugemine ..."
 
-#: ../../standalone/scannerdrake_.c:41
-#, fuzzy
+#: ../../standalone/scannerdrake_.c:39
 msgid "Detecting devices ..."
-msgstr "Otsin printerit..."
+msgstr "Seadmete tuvastamine ..."
 
-#: ../../standalone/scannerdrake_.c:41
+#: ../../standalone/scannerdrake_.c:39
 msgid "Test ports"
 msgstr "Proovin porte"
 
-#: ../../standalone/scannerdrake_.c:53 ../../standalone/scannerdrake_.c:68
-#: ../../standalone/scannerdrake_.c:81
+#: ../../standalone/scannerdrake_.c:51 ../../standalone/scannerdrake_.c:66
+#: ../../standalone/scannerdrake_.c:79
 #, c-format
 msgid "The %s is not supported by this version of Mandrake Linux."
-msgstr ""
+msgstr "Mandrake Linuxi praegusel versioonil puudub %s tugi."
 
-#: ../../standalone/scannerdrake_.c:56
-#, fuzzy, c-format
+#: ../../standalone/scannerdrake_.c:54
+#, c-format
 msgid "%s found on %s, configure it?"
-msgstr "Kas soovite printerit seadistada?"
+msgstr "%s leiti asukohas %s, kas soovite seda seadistada?"
 
-#: ../../standalone/scannerdrake_.c:59
+#: ../../standalone/scannerdrake_.c:57
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
-msgstr ""
+msgstr "%s puudub skännerite andmebaasis, kas seadistada see käsitsi?"
 
-#: ../../standalone/scannerdrake_.c:65
-#, fuzzy
+#: ../../standalone/scannerdrake_.c:63
 msgid "Select a scanner"
-msgstr "Valige graafikakaart"
+msgstr "Valige skänner"
 
-#: ../../standalone/scannerdrake_.c:93
+#: ../../standalone/scannerdrake_.c:91
 #, c-format
 msgid "This %s scanner is unsupported"
-msgstr ""
+msgstr "Sel %s skänneril puudub tugi"
 
-#: ../../standalone/scannerdrake_.c:107
+#: ../../standalone/scannerdrake_.c:105
 #, c-format
 msgid ""
 "Scannerdrake was not able to detect your %s scanner.\n"
 "Please select the device where your scanner is plugged"
 msgstr ""
+"Scannerdrake ei suutnud leida Teie %s skännerit.\n"
+"Valige palun seade, kuhu skänner on ühendatud"
 
-#: ../../standalone/scannerdrake_.c:109
-#, fuzzy
+#: ../../standalone/scannerdrake_.c:107
 msgid "choose device"
-msgstr "Alglaadimisseade"
+msgstr "valige seade"
 
-#: ../../standalone/scannerdrake_.c:115
+#: ../../standalone/scannerdrake_.c:113
 #, c-format
 msgid ""
 "This %s scanner 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."
 
-#: ../../standalone/scannerdrake_.c:120
+#: ../../standalone/scannerdrake_.c:118
 #, c-format
 msgid ""
 "Your %s scanner 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'', "
+"mille leiate rakenduste menüüs rubriigist Multimeedia/Graafika."
 
 #: ../../standalone/service_harddrake_.c:44
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
-msgstr ""
+msgstr "Mõned seadmed riistvaraklassis \"%s\" eemaldati:\n"
 
 #: ../../standalone/service_harddrake_.c:48
 msgid "Some devices were added:\n"
-msgstr ""
+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"
@@ -13091,7 +15048,7 @@ msgstr "Valige paigaldusmeetod"
 
 #: ../../steps.pm_.c:16
 msgid "Hard drive detection"
-msgstr "K�vaketta leidmine"
+msgstr "Kõvaketta leidmine"
 
 #: ../../steps.pm_.c:17
 msgid "Configure mouse"
@@ -13107,7 +15064,7 @@ msgstr "Turvalisus"
 
 #: ../../steps.pm_.c:20
 msgid "Setup filesystems"
-msgstr "Failis�steemid"
+msgstr "Failisüsteemid"
 
 #: ../../steps.pm_.c:21
 msgid "Format partitions"
@@ -13119,7 +15076,7 @@ msgstr "Pakettide valik"
 
 #: ../../steps.pm_.c:23
 msgid "Install system"
-msgstr "S�steemi installimine"
+msgstr "Süsteemi paigaldus"
 
 #: ../../steps.pm_.c:25
 msgid "Add a user"
@@ -13127,44 +15084,47 @@ msgstr "Tavakasutaja"
 
 #: ../../steps.pm_.c:26
 msgid "Configure networking"
-msgstr "V�rgus�tted"
+msgstr "Võrgusätted"
 
 #: ../../steps.pm_.c:28
 msgid "Configure services"
-msgstr "Teenuste s�tted"
+msgstr "Teenuste sätted"
 
 #: ../../steps.pm_.c:29
 msgid "Install bootloader"
-msgstr "Alglaaduri s�tted"
+msgstr "Alglaaduri sätted"
 
 #: ../../steps.pm_.c:31
 msgid "Create a bootdisk"
-msgstr "Loo alglaadimisflopi"
+msgstr "Alglaadimisflopi loomine"
 
 #: ../../steps.pm_.c:33
 msgid "Configure X"
-msgstr "Seadista X"
+msgstr "X-i seadistamine"
 
 #: ../../steps.pm_.c:34
-#, fuzzy
 msgid "Install system updates"
-msgstr "S�steemi installimine"
+msgstr "Uuenduste paigaldus"
 
 #: ../../steps.pm_.c:35
 msgid "Exit install"
-msgstr "V�lju programmist"
+msgstr "Välju programmist"
 
-#: ../../ugtk.pm_.c:648
+#: ../../ugtk.pm_.c:636
 msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr ""
+msgstr "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+
+#: ../../ugtk2.pm_.c:711
+msgid "utopia 25"
+msgstr "utopia 25"
 
 #: ../../share/compssUsers:999
 msgid "Web/FTP"
-msgstr "Server, Veeb/FTP"
+msgstr "Veeb/FTP"
 
 #: ../../share/compssUsers:999
 msgid "Network Computer (client)"
-msgstr "V�rguarvuti (klient)"
+msgstr "Võrguarvuti (klient)"
 
 #: ../../share/compssUsers:999
 msgid "NFS server, SMB server, Proxy server, ssh server"
@@ -13176,51 +15136,51 @@ msgstr "Kontor"
 
 #: ../../share/compssUsers:999
 msgid "Gnome Workstation"
-msgstr "Gnome t��jaam"
+msgstr "Gnome tööjaam"
 
 #: ../../share/compssUsers:999
 msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Suhtlus Palmi v�i Visoriga"
+msgstr "Suhtlus Palm Piloti või Visoriga"
 
 #: ../../share/compssUsers:999
 msgid "Workstation"
-msgstr "T��jaam"
+msgstr "Tööjaam"
 
 #: ../../share/compssUsers:999
 msgid "Firewall/Router"
-msgstr "Tulem��r/marsruuter"
+msgstr "Tulemüür/marsruuter"
 
 #: ../../share/compssUsers:999
 msgid "Domain Name and Network Information Server"
-msgstr ""
+msgstr "Nimeserver ja NIS"
 
 #: ../../share/compssUsers:999
 msgid ""
 "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
 "gnumeric), pdf viewers, etc"
 msgstr ""
-"Kontoriprogrammid: tekstit��tlus (kword, abiword), tabelarvutus (kspread, "
-"gnumeric), PDF eelvaade jne"
+"Kontoriprogrammid: tekstitöötlus (kword, abiword), tabeltöötlus (kspread, "
+"gnumeric), PDF vaatajad jne"
 
 #: ../../share/compssUsers:999
 msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio-v�rgid: mp3 ja midi, mikserid jms"
+msgstr "Helivahendid: mp3- ja midi-mängijad, mikserid jms"
 
 #: ../../share/compssUsers:999
 msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgstr "Linux Standard Base. Võõraste rakenduste toetus"
 
 #: ../../share/compssUsers:999
 msgid "Books and Howto's on Linux and Free Software"
-msgstr "Raamatud ja Howto-d Linux ja vabavara kohta"
+msgstr "Raamatud ja Howto-d Linuxi ja vabavara kohta"
 
 #: ../../share/compssUsers:999
 msgid "KDE Workstation"
-msgstr "KDE t��jaam"
+msgstr "KDE tööjaam"
 
 #: ../../share/compssUsers:999
 msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm jt"
+msgstr "Icewm, WindowMaker, Enlightenment, Fvwm jt"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Video"
@@ -13228,19 +15188,19 @@ msgstr "Multimeedia - Video"
 
 #: ../../share/compssUsers:999
 msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Meili, uudiste, veebi, jututamise ja faili�lekande programmid"
+msgstr "Meili, uudiste, veebi, jututamise ja failiülekande vahendid"
 
 #: ../../share/compssUsers:999
 msgid "Database"
-msgstr "Server, Andmebaasid"
+msgstr "Andmebaasid"
 
 #: ../../share/compssUsers:999
 msgid "PostgreSQL or MySQL database server"
-msgstr ""
+msgstr "PostgreSQL või MySQL andmebaasiserver"
 
 #: ../../share/compssUsers:999
 msgid "Tools to ease the configuration of your computer"
-msgstr "Vahendid lihtsamaks s�steemi administreerimiseks"
+msgstr "Vahendid süsteemi lihtsamaks administreerimiseks"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Sound"
@@ -13252,35 +15212,34 @@ msgstr "Dokumentatsioon"
 
 #: ../../share/compssUsers:999
 msgid "Console Tools"
-msgstr "Konsooliprogrammid"
+msgstr "Konsoolivahendid"
 
 #: ../../share/compssUsers:999
 msgid "Postfix mail server, Inn news server"
-msgstr ""
+msgstr "Postfix meiliserver, uudisteserver Inn"
 
 #: ../../share/compssUsers:999
 msgid "Internet station"
-msgstr "Interneti t��jaam"
+msgstr "Interneti tööjaam"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia station"
-msgstr "Multimeedia t��jaam"
+msgstr "Multimeedia tööjaam"
 
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Configuration"
-msgstr "LAN s�tted"
+msgstr "Seadistamine"
 
 #: ../../share/compssUsers:999
 msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Veel graafilisi t��laudu (Gnome, IceWM)"
+msgstr "Veel graafilisi töölaudu (Gnome, IceWM)"
 
 #: ../../share/compssUsers:999
 msgid ""
 "The K Desktop Environment, the basic graphical environment with a collection "
 "of accompanying tools"
 msgstr ""
-"K Desktop Environment, graafiline t��keskkond ja rida seonduvaid rakendusi"
+"K Töölaua Keskkond, graafiline töökeskkond ja rida seonduvaid rakendusi"
 
 #: ../../share/compssUsers:999
 msgid "Graphical Environment"
@@ -13292,7 +15251,7 @@ msgstr "Arendus"
 
 #: ../../share/compssUsers:999
 msgid "Apache, Pro-ftpd"
-msgstr "Apache ja Pro-ftpd"
+msgstr "Apache ja Proftpd"
 
 #: ../../share/compssUsers:999
 msgid "Tools to create and burn CD's"
@@ -13300,40 +15259,39 @@ msgstr "Vahendid CD-de kirjutamiseks"
 
 #: ../../share/compssUsers:999
 msgid "Office Workstation"
-msgstr "Kontori t��jaam"
+msgstr "Kontori tööjaam"
 
 #: ../../share/compssUsers:999
 msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm jne"
+msgstr "Gnome, Icewm, WindowMaker, Enlightenment, Fvwm jne"
 
 #: ../../share/compssUsers:999
 msgid "Graphics programs such as The Gimp"
-msgstr "Graafikaprogrammid nagu Gimp"
+msgstr "Graafikarakendused, näiteks Gimp"
 
 #: ../../share/compssUsers:999
 msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgstr "DNS/NIS "
 
 #: ../../share/compssUsers:999
 msgid "C and C++ development libraries, programs and include files"
-msgstr "C ja C++ arendusteegid, programmid ja p�isefailid"
+msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
 
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Network Computer server"
-msgstr "Failiserver"
+msgstr "Võrguserver"
 
 #: ../../share/compssUsers:999
 msgid "Mail/Groupware/News"
-msgstr "Server, Meil/grupit��/uudised"
+msgstr "Meil/grupitöö/uudised"
 
 #: ../../share/compssUsers:999
 msgid "Game station"
-msgstr "M�nguvahend"
+msgstr "Mänguvahend"
 
 #: ../../share/compssUsers:999
 msgid "Video players and editors"
-msgstr "Video esitamine ja redigeerimine"
+msgstr "Videode mängimine ja redigeerimine"
 
 #: ../../share/compssUsers:999
 msgid "Multimedia - Graphics"
@@ -13341,52 +15299,53 @@ msgstr "Multimeedia - Graafika"
 
 #: ../../share/compssUsers:999
 msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Meelelahutus: arcade, boards, strategy jne"
+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 programme meili ja uudiste lugemiseks ning veebi brausimiseks"
+msgstr ""
+"Komplekt rakendusi meili ja uudiste lugemiseks (pine, mutt, tin...) ning "
+"veebi lehitsemiseks"
 
 #: ../../share/compssUsers:999
 msgid "Personal Finance"
-msgstr "Isiklikud finantsid"
+msgstr "Isiklikud rahaasjad"
 
 #: ../../share/compssUsers:999
 msgid ""
 "A graphical environment with user-friendly set of applications and desktop "
 "tools"
-msgstr "Graafiline t��keskkond koos kasutajas�bralike rakendustega"
+msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
 
 #: ../../share/compssUsers:999
 msgid "Clients for different protocols including ssh"
-msgstr "Mitmete protokollide, sealhulgas ssh kliendid"
+msgstr "Mitme protokolli, sealhulgas ssh kliendid"
 
 #: ../../share/compssUsers:999
 msgid "LSB"
-msgstr ""
+msgstr "LSB"
 
 #: ../../share/compssUsers:999
-#, fuzzy
 msgid "Internet gateway"
-msgstr "Interneti�hendus"
+msgstr "Internetiasjad"
 
 #: ../../share/compssUsers:999
 msgid "Sound and video playing/editing programs"
-msgstr "Heli ja video esitamine ja redigeerimine"
+msgstr "Heli ja video mängimine ja redigeerimine"
 
 #: ../../share/compssUsers:999
 msgid "Other Graphical Desktops"
-msgstr "Muud graafilised t��lauad"
+msgstr "Muud graafilised töölauad"
 
 #: ../../share/compssUsers:999
 msgid "Editors, shells, file tools, terminals"
-msgstr "Editorid, shellid, terminalid, failihaldus"
+msgstr "Redaktorid, shellid, terminalid, failihaldus"
 
 #: ../../share/compssUsers:999
 msgid "Programs to manage your finance, such as gnucash"
-msgstr "Isiklike finantside haldusvahendid"
+msgstr "Isiklike rahaasjade rakendused, näiteks gnucash"
 
 #: ../../share/compssUsers:999
 msgid "Personal Information Management"
@@ -13398,4 +15357,292 @@ msgstr "Multimeedia - CD kirjutamine"
 
 #: ../../share/compssUsers:999
 msgid "Scientific Workstation"
-msgstr "Teadust��jaam"
+msgstr "Teadustööjaam"
+
+#~ 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"
diff --git a/perl-install/share/po/vi.po b/perl-install/share/po/vi.po
index b7478abf1..f5faf6999 100644
--- a/perl-install/share/po/vi.po
+++ b/perl-install/share/po/vi.po
@@ -1,12 +1,12 @@
 # DrakX in Vietnamese.
 # Copyright (C) 2000-2002 Free Software Foundation, Inc.
-# T.M.Thanh <tmthanh@yahoo.com>; Nguyen Hung Vu <vuhung16@yahoo.com>2001-2002.
+# T.M.Thanh <tmthanh@yahoo.com> 2001-2002.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: DrakX for Mandrake Linux 9.0\n"
-"POT-Creation-Date: 2002-09-20 11:43+0200\n"
-"PO-Revision-Date: 2002-09-22 13:12+0700\n"
+"Project-Id-Version: DrakX for Mandrake Linux 9.x\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
+"PO-Revision-Date: 2002-12-07 00:01+0700\n"
 "Last-Translator: Trinh Minh Thanh <tmthanh@linuxmail.org>\n"
 "Language-Team: Gnome-Vi Team <Gnomevi-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -69,44 +69,44 @@ msgstr ""
 "Hệ thống của bạn hỗ trợ cấu hình Multi-head.\n"
 "Bạn muốn làm gì?"
 
-#: ../../Xconfig/card.pm_.c:286
+#: ../../Xconfig/card.pm_.c:288
 msgid "Select the memory size of your graphics card"
 msgstr "Chọn dung lượng bộ nhớ của card đồ họa"
 
-#: ../../Xconfig/card.pm_.c:347
+#: ../../Xconfig/card.pm_.c:349
 msgid "XFree configuration"
 msgstr "Cấu hình XFree"
 
-#: ../../Xconfig/card.pm_.c:349
+#: ../../Xconfig/card.pm_.c:351
 msgid "Which configuration of XFree do you want to have?"
 msgstr "Bạn muốn có cấu hình XFree nào?"
 
-#: ../../Xconfig/card.pm_.c:381
+#: ../../Xconfig/card.pm_.c:383
 msgid "Configure all heads independently"
 msgstr "Cấu hình độc lập toàn bộ các head"
 
-#: ../../Xconfig/card.pm_.c:382
+#: ../../Xconfig/card.pm_.c:384
 msgid "Use Xinerama extension"
 msgstr "Dùng Xinerama mở rộng"
 
-#: ../../Xconfig/card.pm_.c:387
+#: ../../Xconfig/card.pm_.c:389
 #, c-format
 msgid "Configure only card \"%s\"%s"
 msgstr "Chỉ cấu hình card \"%s\"%s"
 
-#: ../../Xconfig/card.pm_.c:399 ../../Xconfig/card.pm_.c:400
+#: ../../Xconfig/card.pm_.c:401 ../../Xconfig/card.pm_.c:402
 #: ../../Xconfig/various.pm_.c:23
 #, c-format
 msgid "XFree %s"
 msgstr "XFree %s"
 
-#: ../../Xconfig/card.pm_.c:411 ../../Xconfig/card.pm_.c:437
+#: ../../Xconfig/card.pm_.c:413 ../../Xconfig/card.pm_.c:439
 #: ../../Xconfig/various.pm_.c:23
 #, c-format
 msgid "XFree %s with 3D hardware acceleration"
 msgstr "XFree %s với phần cứng tăng tốc 3D"
 
-#: ../../Xconfig/card.pm_.c:414
+#: ../../Xconfig/card.pm_.c:416
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s.\n"
@@ -115,17 +115,17 @@ msgstr ""
 "Card của bạn có thể có hỗ trợ phần cứng tăng tốc 3D nhưng chỉ với XFree %s.\n"
 "Card này được hỗ trợ bởi XFree %s, loại có thể hỗ trợ tốt hơn khi dùng 2D."
 
-#: ../../Xconfig/card.pm_.c:416 ../../Xconfig/card.pm_.c:439
+#: ../../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 "Card của bạn có thể có hỗ trợ phần cứng tăng tốc 3D với XFree %s."
 
-#: ../../Xconfig/card.pm_.c:424 ../../Xconfig/card.pm_.c:445
+#: ../../Xconfig/card.pm_.c:426 ../../Xconfig/card.pm_.c:447
 #, c-format
 msgid "XFree %s with EXPERIMENTAL 3D hardware acceleration"
 msgstr "XFree %s với phần cứng tăng tốc 3D thử nghiệm"
 
-#: ../../Xconfig/card.pm_.c:427
+#: ../../Xconfig/card.pm_.c:429
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support but only with XFree %s,\n"
@@ -136,7 +136,7 @@ msgstr ""
 "Lưu ý đây là hỗ trợ có tính lý thuyết nên nó có thể làm ì máy tính của bạn.\n"
 "Card này được hỗ trợ bởi XFree %s, loại có thể hỗ trợ tốt hơn khi dùng 2D."
 
-#: ../../Xconfig/card.pm_.c:430 ../../Xconfig/card.pm_.c:447
+#: ../../Xconfig/card.pm_.c:432 ../../Xconfig/card.pm_.c:449
 #, c-format
 msgid ""
 "Your card can have 3D hardware acceleration support with XFree %s,\n"
@@ -145,12 +145,12 @@ msgstr ""
 "Card của bạn có thể có hỗ trợ phần cứng tăng tốc 3D với XFree %s,\n"
 "Lưu ý đây là hỗ trợ có tính lý thuyết nên nó có thể làm ì máy tính của bạn."
 
-#: ../../Xconfig/card.pm_.c:453
+#: ../../Xconfig/card.pm_.c:455
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (cài đặt driver hiển thị)"
 
 #: ../../Xconfig/main.pm_.c:76 ../../Xconfig/main.pm_.c:77
-#: ../../Xconfig/monitor.pm_.c:96 ../../any.pm_.c:978
+#: ../../Xconfig/monitor.pm_.c:96 ../../any.pm_.c:961
 msgid "Custom"
 msgstr "Tùy chỉnh"
 
@@ -162,7 +162,7 @@ msgstr "Card Đồ Họa"
 msgid "Monitor"
 msgstr "Monitor"
 
-#: ../../Xconfig/main.pm_.c:108 ../../Xconfig/resolution_and_depth.pm_.c:209
+#: ../../Xconfig/main.pm_.c:108 ../../Xconfig/resolution_and_depth.pm_.c:210
 msgid "Resolution"
 msgstr "Độ phân giải"
 
@@ -171,27 +171,28 @@ msgid "Test"
 msgstr "Chạy thử"
 
 #: ../../Xconfig/main.pm_.c:118 ../../diskdrake/dav.pm_.c:67
-#: ../../diskdrake/interactive.pm_.c:385 ../../diskdrake/removable.pm_.c:25
-#: ../../diskdrake/removable_gtk.pm_.c:16 ../../diskdrake/smbnfs_gtk.pm_.c:86
+#: ../../diskdrake/interactive.pm_.c:393 ../../diskdrake/removable.pm_.c:25
+#: ../../diskdrake/smbnfs_gtk.pm_.c:86
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: ../../Xconfig/main.pm_.c:122 ../../Xconfig/resolution_and_depth.pm_.c:268
-#: ../../install_gtk.pm_.c:79 ../../install_steps_gtk.pm_.c:275
+#: ../../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:354 ../../interactive/http.pm_.c:104
-#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
+#: ../../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:166
-#: ../../standalone/drakbackup_.c:3974 ../../standalone/drakbackup_.c:4069
-#: ../../standalone/drakbackup_.c:4088
+#: ../../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 "OK"
 
 #: ../../Xconfig/main.pm_.c:122 ../../diskdrake/dav.pm_.c:28
-#: ../../harddrake/ui.pm_.c:96 ../../printerdrake.pm_.c:3207
-#: ../../standalone/draksplash_.c:122 ../../standalone/logdrake_.c:225
+#: ../../printer/printerdrake.pm_.c:2970 ../../standalone/draksplash_.c:114
+#: ../../standalone/harddrake2_.c:152 ../../standalone/logdrake_.c:204
 msgid "Quit"
 msgstr "Thoát"
 
@@ -220,7 +221,8 @@ msgstr "Plug 'n' Play"
 msgid "Generic"
 msgstr "Chuẩn chung"
 
-#: ../../Xconfig/monitor.pm_.c:99 ../../harddrake/ui.pm_.c:37
+#: ../../Xconfig/monitor.pm_.c:99 ../../standalone/harddrake2_.c:67
+#: ../../standalone/harddrake2_.c:68
 msgid "Vendor"
 msgstr "Nhà SX"
 
@@ -277,50 +279,52 @@ msgstr "16 triệu màu (24 bits)"
 msgid "4 billion colors (32 bits)"
 msgstr "4 tỷ màu (32 bits)"
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:129
+#: ../../Xconfig/resolution_and_depth.pm_.c:130
 msgid "Resolutions"
 msgstr "Độ phân giải"
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:254
+#: ../../Xconfig/resolution_and_depth.pm_.c:255
 msgid "Choose the resolution and the color depth"
 msgstr "Chọn độ phân giải và độ sâu của màu"
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:255
+#: ../../Xconfig/resolution_and_depth.pm_.c:256
 #, c-format
 msgid "Graphics card: %s"
 msgstr "Card đồ họa: %s"
 
-#: ../../Xconfig/resolution_and_depth.pm_.c:268 ../../any.pm_.c:1019
-#: ../../bootlook.pm_.c:344 ../../diskdrake/smbnfs_gtk.pm_.c:87
-#: ../../install_steps_gtk.pm_.c:406 ../../install_steps_gtk.pm_.c:464
-#: ../../interactive.pm_.c:142 ../../interactive.pm_.c:354
-#: ../../interactive/http.pm_.c:105 ../../interactive/newt.pm_.c:195
+#: ../../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:42 ../../printerdrake.pm_.c:2169
-#: ../../security/main.pm_.c:216 ../../standalone/drakautoinst_.c:203
-#: ../../standalone/drakbackup_.c:3928 ../../standalone/drakbackup_.c:3961
-#: ../../standalone/drakbackup_.c:3987 ../../standalone/drakbackup_.c:4014
-#: ../../standalone/drakbackup_.c:4041 ../../standalone/drakbackup_.c:4101
-#: ../../standalone/drakbackup_.c:4128 ../../standalone/drakbackup_.c:4158
-#: ../../standalone/drakbackup_.c:4184 ../../standalone/drakconnect_.c:115
-#: ../../standalone/drakconnect_.c:147 ../../standalone/drakconnect_.c:289
-#: ../../standalone/drakconnect_.c:537 ../../standalone/drakconnect_.c:679
-#: ../../standalone/drakfloppy_.c:235 ../../standalone/drakfont_.c:970
-#: ../../standalone/drakgw_.c:560 ../../standalone/logdrake_.c:225
-#: ../../ugtk.pm_.c:296
+#: ../../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 "Bỏ qua"
 
-#: ../../Xconfig/test.pm_.c:30
+#: ../../Xconfig/test.pm_.c:29
 msgid "Test of the configuration"
 msgstr "Chạy thử cấu hình này"
 
-#: ../../Xconfig/test.pm_.c:31
+#: ../../Xconfig/test.pm_.c:30
 msgid "Do you want to test the configuration?"
 msgstr "Bạn muốn chạy thử cấu hình này không?"
 
-#: ../../Xconfig/test.pm_.c:31
+#: ../../Xconfig/test.pm_.c:30
 msgid "Warning: testing this graphic card may freeze your computer"
 msgstr "Chú ý: chạy thử card đồ họa này có thể làm ì máy tính của bạn"
 
@@ -420,164 +424,164 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "TV của bạn dùng loại thông thường nào?"
 
-#: ../../any.pm_.c:108 ../../any.pm_.c:133
+#: ../../any.pm_.c:107 ../../any.pm_.c:132
 msgid "First sector of boot partition"
 msgstr "Sector đầu tiên của phân vùng khởi động"
 
-#: ../../any.pm_.c:108 ../../any.pm_.c:133 ../../any.pm_.c:210
+#: ../../any.pm_.c:107 ../../any.pm_.c:132 ../../any.pm_.c:209
 msgid "First sector of drive (MBR)"
 msgstr "Sector đầu tiên của đĩa (MBR)"
 
-#: ../../any.pm_.c:112
+#: ../../any.pm_.c:111
 msgid "SILO Installation"
 msgstr "Cài đặt SILO"
 
-#: ../../any.pm_.c:113 ../../any.pm_.c:126
+#: ../../any.pm_.c:112 ../../any.pm_.c:125
 msgid "Where do you want to install the bootloader?"
 msgstr "Bạn muốn cài đặt trình khởi động vào đâu?"
 
-#: ../../any.pm_.c:125
+#: ../../any.pm_.c:124
 msgid "LILO/grub Installation"
 msgstr "Cài đặt LiLO/Grub"
 
-#: ../../any.pm_.c:137 ../../any.pm_.c:151
+#: ../../any.pm_.c:136 ../../any.pm_.c:150
 msgid "SILO"
 msgstr "SILO"
 
-#: ../../any.pm_.c:139
+#: ../../any.pm_.c:138
 msgid "LILO with text menu"
 msgstr "LILO với menu văn bản"
 
-#: ../../any.pm_.c:140 ../../any.pm_.c:151
+#: ../../any.pm_.c:139 ../../any.pm_.c:150
 msgid "LILO with graphical menu"
 msgstr "LILO với menu đồ họa"
 
-#: ../../any.pm_.c:143
+#: ../../any.pm_.c:142
 msgid "Grub"
 msgstr "Grub"
 
-#: ../../any.pm_.c:147
+#: ../../any.pm_.c:146
 msgid "Boot from DOS/Windows (loadlin)"
 msgstr "Khởi động từ DOS/Windows (loadlin)"
 
-#: ../../any.pm_.c:149 ../../any.pm_.c:151
+#: ../../any.pm_.c:148 ../../any.pm_.c:150
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: ../../any.pm_.c:159 ../../any.pm_.c:190
+#: ../../any.pm_.c:158 ../../any.pm_.c:189
 msgid "Bootloader main options"
 msgstr "Tùy chọn chính của trình nạp khởi động"
 
-#: ../../any.pm_.c:160 ../../any.pm_.c:191
+#: ../../any.pm_.c:159 ../../any.pm_.c:190
 msgid "Bootloader to use"
 msgstr "Dùng trình nạp khởi động"
 
-#: ../../any.pm_.c:162
+#: ../../any.pm_.c:161
 msgid "Bootloader installation"
 msgstr "Cài đặt trình nạp khởi động"
 
-#: ../../any.pm_.c:164 ../../any.pm_.c:193
+#: ../../any.pm_.c:163 ../../any.pm_.c:192
 msgid "Boot device"
 msgstr "Thiết bị khởi động"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:164
 msgid "Compact"
 msgstr "Đồng ý"
 
-#: ../../any.pm_.c:165
+#: ../../any.pm_.c:164
 msgid "compact"
 msgstr "Đồng ý"
 
-#: ../../any.pm_.c:166 ../../any.pm_.c:291
+#: ../../any.pm_.c:165 ../../any.pm_.c:289
 msgid "Video mode"
 msgstr "Chế độ Video"
 
-#: ../../any.pm_.c:168
+#: ../../any.pm_.c:167
 msgid "Delay before booting default image"
 msgstr "Thời gian trễ trước khi khởi động ảnh mặc định"
 
-#: ../../any.pm_.c:170 ../../any.pm_.c:789
+#: ../../any.pm_.c:169 ../../any.pm_.c:772
 #: ../../diskdrake/smbnfs_gtk.pm_.c:179
-#: ../../install_steps_interactive.pm_.c:1097 ../../network/modem.pm_.c:48
-#: ../../printerdrake.pm_.c:865 ../../printerdrake.pm_.c:980
-#: ../../standalone/drakbackup_.c:3530 ../../standalone/drakconnect_.c:624
-#: ../../standalone/drakconnect_.c:649
+#: ../../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 "Mật khẩu"
 
-#: ../../any.pm_.c:171 ../../any.pm_.c:790
-#: ../../install_steps_interactive.pm_.c:1098
+#: ../../any.pm_.c:170 ../../any.pm_.c:773
+#: ../../install_steps_interactive.pm_.c:1078
 msgid "Password (again)"
 msgstr "Nhập lại mật khẩu"
 
-#: ../../any.pm_.c:172
+#: ../../any.pm_.c:171
 msgid "Restrict command line options"
 msgstr "Các tùy chọn dòng lệnh hạn chế"
 
-#: ../../any.pm_.c:172
+#: ../../any.pm_.c:171
 msgid "restrict"
 msgstr "hạn chế"
 
-#: ../../any.pm_.c:174
+#: ../../any.pm_.c:173
 msgid "Clean /tmp at each boot"
 msgstr "Làm sạch /tmp mỗi khi khởi động"
 
-#: ../../any.pm_.c:175
+#: ../../any.pm_.c:174
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Chỉ rõ dung lượng RAM (thấy có %d MB)"
 
-#: ../../any.pm_.c:177
+#: ../../any.pm_.c:176
 msgid "Enable multi profiles"
 msgstr "Cho phép đa lý lịch"
 
-#: ../../any.pm_.c:181
+#: ../../any.pm_.c:180
 msgid "Give the ram size in MB"
 msgstr "Hiển thị dung lượng RAM theo MB"
 
-#: ../../any.pm_.c:183
+#: ../../any.pm_.c:182
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr ""
 "Tùy chọn ``Tùy chọn dòng lệnh hạn chế'' nghĩa là không cho sử dụng nếu không "
 "có mật khẩu"
 
-#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../diskdrake/interactive.pm_.c:1195
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../any.pm_.c:183 ../../any.pm_.c:748
+#: ../../diskdrake/interactive.pm_.c:1204
+#: ../../install_steps_interactive.pm_.c:1072
 msgid "Please try again"
 msgstr "Hãy thử lại"
 
-#: ../../any.pm_.c:184 ../../any.pm_.c:765
-#: ../../install_steps_interactive.pm_.c:1092
+#: ../../any.pm_.c:183 ../../any.pm_.c:748
+#: ../../install_steps_interactive.pm_.c:1072
 msgid "The passwords do not match"
 msgstr "Mật khẩu không khớp nhau"
 
-#: ../../any.pm_.c:192
+#: ../../any.pm_.c:191
 msgid "Init Message"
 msgstr "Thông điệp của Init"
 
-#: ../../any.pm_.c:194
+#: ../../any.pm_.c:193
 msgid "Open Firmware Delay"
 msgstr "Open Firmware Delay"
 
-#: ../../any.pm_.c:195
+#: ../../any.pm_.c:194
 msgid "Kernel Boot Timeout"
 msgstr "Thời gian chờ khởi động Kernel"
 
-#: ../../any.pm_.c:196
+#: ../../any.pm_.c:195
 msgid "Enable CD Boot?"
 msgstr "Cho phép khởi động từ CD?"
 
-#: ../../any.pm_.c:197
+#: ../../any.pm_.c:196
 msgid "Enable OF Boot?"
 msgstr "Cho phép khởi động OF?"
 
-#: ../../any.pm_.c:198
+#: ../../any.pm_.c:197
 msgid "Default OS?"
 msgstr "Hệ điều hành mặc định nào?"
 
-#: ../../any.pm_.c:232
+#: ../../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: "
@@ -591,7 +595,7 @@ msgstr ""
 "\n"
 "Bạn đang khởi động từ đĩa nào ?"
 
-#: ../../any.pm_.c:248
+#: ../../any.pm_.c:247
 msgid ""
 "Here are the entries on your boot menu so far.\n"
 "You can add some more or change the existing ones."
@@ -599,148 +603,150 @@ msgstr ""
 "Đây là các mục nhập khác nhau.\n"
 "Bạn có thể thêm hoặc thay đổi các mục hiện thời."
 
-#: ../../any.pm_.c:258 ../../standalone/drakbackup_.c:1560
-#: ../../standalone/drakbackup_.c:1673 ../../standalone/drakfont_.c:1011
-#: ../../standalone/drakfont_.c:1054
+#: ../../any.pm_.c:257 ../../standalone/drakbackup_.c:1531
+#: ../../standalone/drakbackup_.c:1644 ../../standalone/drakfont_.c:953
+#: ../../standalone/drakfont_.c:996
 msgid "Add"
 msgstr "Thêm"
 
-#: ../../any.pm_.c:258 ../../any.pm_.c:777 ../../diskdrake/dav.pm_.c:68
-#: ../../diskdrake/hd_gtk.pm_.c:153 ../../diskdrake/removable.pm_.c:27
+#: ../../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
-#: ../../printerdrake.pm_.c:3207 ../../standalone/drakbackup_.c:2774
+#: ../../printer/printerdrake.pm_.c:2970 ../../standalone/drakbackup_.c:2726
 msgid "Done"
 msgstr "Hoàn thành"
 
-#: ../../any.pm_.c:258
+#: ../../any.pm_.c:257
 msgid "Modify"
 msgstr "Biến đổi"
 
-#: ../../any.pm_.c:266
+#: ../../any.pm_.c:265
 msgid "Which type of entry do you want to add?"
 msgstr "Bạn muốn thêm kiểu mục nhập nào?"
 
-#: ../../any.pm_.c:267 ../../standalone/drakbackup_.c:1707
+#: ../../any.pm_.c:266 ../../standalone/drakbackup_.c:1674
 msgid "Linux"
 msgstr "Linux"
 
-#: ../../any.pm_.c:267
+#: ../../any.pm_.c:266
 msgid "Other OS (SunOS...)"
 msgstr "Hệ điều hành khác (SunOS...)"
 
-#: ../../any.pm_.c:268
+#: ../../any.pm_.c:267
 msgid "Other OS (MacOS...)"
 msgstr "Hệ điều hành khác (MacOS...)"
 
-#: ../../any.pm_.c:268
+#: ../../any.pm_.c:267
 msgid "Other OS (windows...)"
 msgstr "Hệ điều hành khác (Windows...)"
 
-#: ../../any.pm_.c:287
+#: ../../any.pm_.c:285
 msgid "Image"
 msgstr "Ảnh"
 
-#: ../../any.pm_.c:288 ../../any.pm_.c:299
+#: ../../any.pm_.c:286 ../../any.pm_.c:297
 msgid "Root"
 msgstr "Root"
 
-#: ../../any.pm_.c:289 ../../any.pm_.c:317
+#: ../../any.pm_.c:287 ../../any.pm_.c:315
 msgid "Append"
 msgstr "Bổ sung"
 
-#: ../../any.pm_.c:293
+#: ../../any.pm_.c:291
 msgid "Initrd"
 msgstr "Initrd"
 
-#: ../../any.pm_.c:294
+#: ../../any.pm_.c:292
 msgid "Read-write"
 msgstr "Đọc-Ghi"
 
-#: ../../any.pm_.c:301
+#: ../../any.pm_.c:299
 msgid "Table"
 msgstr "Bảng ghi"
 
-#: ../../any.pm_.c:302
+#: ../../any.pm_.c:300
 msgid "Unsafe"
 msgstr "Không an toàn"
 
-#: ../../any.pm_.c:309 ../../any.pm_.c:314 ../../any.pm_.c:316
+#: ../../any.pm_.c:307 ../../any.pm_.c:312 ../../any.pm_.c:314
 msgid "Label"
 msgstr "Nhãn"
 
-#: ../../any.pm_.c:311 ../../any.pm_.c:321 ../../harddrake/v4l.pm_.c:200
+#: ../../any.pm_.c:309 ../../any.pm_.c:319 ../../harddrake/v4l.pm_.c:215
 msgid "Default"
 msgstr "Mặc định"
 
-#: ../../any.pm_.c:318
+#: ../../any.pm_.c:316
 msgid "Initrd-size"
 msgstr "Initrd-size"
 
-#: ../../any.pm_.c:320
+#: ../../any.pm_.c:318
 msgid "NoVideo"
 msgstr "Không có Video"
 
-#: ../../any.pm_.c:328
+#: ../../any.pm_.c:326
 msgid "Remove entry"
 msgstr "Bỏ mục nhập "
 
-#: ../../any.pm_.c:331
+#: ../../any.pm_.c:329
 msgid "Empty label not allowed"
 msgstr "Không được để nhãn trống"
 
-#: ../../any.pm_.c:332
+#: ../../any.pm_.c:330
 msgid "You must specify a kernel image"
 msgstr "Phải chỉ định một ảnh Kernel"
 
-#: ../../any.pm_.c:332
+#: ../../any.pm_.c:330
 msgid "You must specify a root partition"
 msgstr "Phải chỉ định một phân vùng root"
 
-#: ../../any.pm_.c:333
+#: ../../any.pm_.c:331
 msgid "This label is already used"
 msgstr "Nhãn nãy được dùng rồi"
 
-#: ../../any.pm_.c:657
+#: ../../any.pm_.c:640
 #, c-format
 msgid "Found %s %s interfaces"
 msgstr "Tìm thấy các giao diện %s %s"
 
-#: ../../any.pm_.c:658
+#: ../../any.pm_.c:641
 msgid "Do you have another one?"
 msgstr "Bạn có giao diện khác nữa không?"
 
-#: ../../any.pm_.c:659
+#: ../../any.pm_.c:642
 #, c-format
 msgid "Do you have any %s interfaces?"
 msgstr "Bạn có giao diện %s nào không?"
 
-#: ../../any.pm_.c:661 ../../any.pm_.c:824 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:286
+#: ../../any.pm_.c:644 ../../any.pm_.c:807 ../../interactive.pm_.c:132
+#: ../../my_gtk.pm_.c:286 ../../ugtk2.pm_.c:925
 msgid "No"
 msgstr "Không"
 
-#: ../../any.pm_.c:661 ../../any.pm_.c:823 ../../interactive.pm_.c:132
-#: ../../my_gtk.pm_.c:286
+#: ../../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 "Có"
 
-#: ../../any.pm_.c:662
+#: ../../any.pm_.c:645
 msgid "See hardware info"
 msgstr "Xem thông tin phần cứng"
 
 #. -PO: the first %s is the card type (scsi, network, sound,...)
 #. -PO: the second is the vendor+model name
-#: ../../any.pm_.c:678
+#: ../../any.pm_.c:662
 #, c-format
 msgid "Installing driver for %s card %s"
 msgstr "Đang cài đặt driver cho card %s %s"
 
-#: ../../any.pm_.c:679
+#: ../../any.pm_.c:663
 #, c-format
 msgid "(module %s)"
 msgstr "(module %s)"
 
-#: ../../any.pm_.c:690
+#: ../../any.pm_.c:674
 #, c-format
 msgid ""
 "You may now provide its options to module %s.\n"
@@ -749,7 +755,7 @@ msgstr ""
 "Bây giờ bạn có thể cung cấp các tùy chọn của nó tới module %s.\n"
 "Lưu ý: bất kỳ địa chỉ nào nên được nhập với tiền tố 0x như '0x123'"
 
-#: ../../any.pm_.c:696
+#: ../../any.pm_.c:680
 #, c-format
 msgid ""
 "You may now provide options to module %s.\n"
@@ -760,17 +766,17 @@ msgstr ""
 "Tùy chọn có dạng thức ``tên=giá trị tên2=giá trị2 ...''.\n"
 "Ví dụ, ``io=0x300 irq=7''"
 
-#: ../../any.pm_.c:698
+#: ../../any.pm_.c:682
 msgid "Module options:"
 msgstr "Tùy chọn của module:"
 
 #. -PO: the %s is the driver type (scsi, network, sound,...)
-#: ../../any.pm_.c:710
+#: ../../any.pm_.c:694
 #, c-format
 msgid "Which %s driver should I try?"
 msgstr "Nên chạy thử driver %s nào?"
 
-#: ../../any.pm_.c:719
+#: ../../any.pm_.c:703
 #, c-format
 msgid ""
 "In some cases, the %s driver needs to have extra information to work\n"
@@ -787,15 +793,15 @@ msgstr ""
 "nó cần? Đôi khi, sự thăm dò làm máy tính bị của bạn treo, nhưng nó sẽ\n"
 "không gây hư hỏng nào."
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:707
 msgid "Autoprobe"
 msgstr "Thăm dò tự động"
 
-#: ../../any.pm_.c:723
+#: ../../any.pm_.c:707
 msgid "Specify options"
 msgstr "Định rõ tùy chọn"
 
-#: ../../any.pm_.c:735
+#: ../../any.pm_.c:719
 #, c-format
 msgid ""
 "Loading module %s failed.\n"
@@ -804,61 +810,61 @@ msgstr ""
 "Nạp module %s không được.\n"
 "Bạn có muốn thử lại với các tham số khác?"
 
-#: ../../any.pm_.c:751
+#: ../../any.pm_.c:734
 msgid "access to X programs"
 msgstr "truy cập tới các chương trình X"
 
-#: ../../any.pm_.c:752
+#: ../../any.pm_.c:735
 msgid "access to rpm tools"
 msgstr "truy cập tới các công cụ rpm"
 
-#: ../../any.pm_.c:753
+#: ../../any.pm_.c:736
 msgid "allow \"su\""
 msgstr "cho phép \"su\""
 
-#: ../../any.pm_.c:754
+#: ../../any.pm_.c:737
 msgid "access to administrative files"
 msgstr "truy cập tới các tập tin quản trị"
 
-#: ../../any.pm_.c:755
+#: ../../any.pm_.c:738
 msgid "access to network tools"
 msgstr "truy cập tới các công cụ mạng"
 
-#: ../../any.pm_.c:756
+#: ../../any.pm_.c:739
 msgid "access to compilation tools"
 msgstr "truy cập tới các công cụ biên dịch"
 
-#: ../../any.pm_.c:761
+#: ../../any.pm_.c:744
 #, c-format
 msgid "(already added %s)"
 msgstr "(đã thêm %s rồi)"
 
-#: ../../any.pm_.c:766
+#: ../../any.pm_.c:749
 msgid "This password is too simple"
 msgstr "Mật khẩu này đơn giản quá"
 
-#: ../../any.pm_.c:767
+#: ../../any.pm_.c:750
 msgid "Please give a user name"
 msgstr "Hãy cho tên người dùng"
 
-#: ../../any.pm_.c:768
+#: ../../any.pm_.c:751
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
 msgstr "Tên người dùng chỉ sử dụng chữ thường, số , `-' và `_'"
 
-#: ../../any.pm_.c:769
+#: ../../any.pm_.c:752
 msgid "The user name is too long"
 msgstr "Tên người dùng quá dài"
 
-#: ../../any.pm_.c:770
+#: ../../any.pm_.c:753
 msgid "This user name is already added"
 msgstr "Tên người dùng này đã được thêm vào rồi"
 
-#: ../../any.pm_.c:774
+#: ../../any.pm_.c:757
 msgid "Add user"
 msgstr "Thêm người dùng"
 
-#: ../../any.pm_.c:775
+#: ../../any.pm_.c:758
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -867,32 +873,32 @@ msgstr ""
 "Nhập người dùng\n"
 "%s"
 
-#: ../../any.pm_.c:776
+#: ../../any.pm_.c:759
 msgid "Accept user"
 msgstr "Chấp thuận người dùng"
 
-#: ../../any.pm_.c:787
+#: ../../any.pm_.c:770
 msgid "Real name"
 msgstr "Tên thật"
 
-#: ../../any.pm_.c:788 ../../printerdrake.pm_.c:864
-#: ../../printerdrake.pm_.c:979
+#: ../../any.pm_.c:771 ../../printer/printerdrake.pm_.c:802
+#: ../../printer/printerdrake.pm_.c:915
 msgid "User name"
 msgstr "Tên người dùng"
 
-#: ../../any.pm_.c:791
+#: ../../any.pm_.c:774
 msgid "Shell"
 msgstr "Shell"
 
-#: ../../any.pm_.c:793
+#: ../../any.pm_.c:776
 msgid "Icon"
 msgstr "Biểu tượng"
 
-#: ../../any.pm_.c:820
+#: ../../any.pm_.c:803
 msgid "Autologin"
 msgstr "Đăng nhập tự động"
 
-#: ../../any.pm_.c:821
+#: ../../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?"
@@ -900,19 +906,19 @@ msgstr ""
 "Có thể thiết lập khởi động máy tự động đăng nhập một người dùng.\n"
 "Bạn có muốn sử dụng tính năng này không?"
 
-#: ../../any.pm_.c:825
+#: ../../any.pm_.c:808
 msgid "Choose the default user:"
 msgstr "Chọn người dùng mặc định:"
 
-#: ../../any.pm_.c:826
+#: ../../any.pm_.c:809
 msgid "Choose the window manager to run:"
 msgstr "Chọn chạy trình quản lý cửa sổ:"
 
-#: ../../any.pm_.c:841
+#: ../../any.pm_.c:824
 msgid "Please choose a language to use."
 msgstr "Hãy chọn một ngôn ngữ để dùng."
 
-#: ../../any.pm_.c:843
+#: ../../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"
@@ -922,35 +928,35 @@ msgstr ""
 "các ngôn ngữ mà bạn muốn cài đặt. Chúng sẽ sẵn có để dùng\n"
 "khi hoàn thành cài đặt và khởi động lại hệ thống."
 
-#: ../../any.pm_.c:857 ../../install_steps_interactive.pm_.c:690
-#: ../../standalone/drakxtv_.c:73
+#: ../../any.pm_.c:840 ../../install_steps_interactive.pm_.c:697
+#: ../../standalone/drakxtv_.c:70
 msgid "All"
 msgstr "Toàn bộ"
 
-#: ../../any.pm_.c:978
+#: ../../any.pm_.c:961
 msgid "Allow all users"
 msgstr "Cho phép mọi người dùng"
 
-#: ../../any.pm_.c:978
+#: ../../any.pm_.c:961
 msgid "No sharing"
 msgstr "Không chia sẻ"
 
-#: ../../any.pm_.c:988 ../../install_any.pm_.c:1199 ../../standalone.pm_.c:66
+#: ../../any.pm_.c:971 ../../install_any.pm_.c:1207 ../../standalone.pm_.c:185
 #, c-format
 msgid "The package %s needs to be installed. Do you want to install it?"
 msgstr "Gói tin %s cần được cài đặt. Bạn có muốn cài đặt nó không?"
 
-#: ../../any.pm_.c:991
+#: ../../any.pm_.c:973
 msgid ""
 "You can export using NFS or Samba. Please select which you'd like to use."
 msgstr "Có thể dùng NFS hay SAMBA để xuất ra. Hãy chọn cái mà bạn thích dùng."
 
-#: ../../any.pm_.c:999 ../../install_any.pm_.c:1204 ../../standalone.pm_.c:71
+#: ../../any.pm_.c:981 ../../install_any.pm_.c:1212 ../../standalone.pm_.c:190
 #, c-format
 msgid "Mandatory package %s is missing"
 msgstr "Thiếu gói tin bắt buộc %s"
 
-#: ../../any.pm_.c:1005
+#: ../../any.pm_.c:987
 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 "
@@ -964,11 +970,11 @@ msgstr ""
 "\n"
 "\"Tùy chỉnh\" cho phép một chuỗi người dùng.\n"
 
-#: ../../any.pm_.c:1019
+#: ../../any.pm_.c:1001
 msgid "Launch userdrake"
 msgstr "Chạy UserDrake"
 
-#: ../../any.pm_.c:1021
+#: ../../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."
@@ -976,31 +982,31 @@ msgstr ""
 "Việc chia sẻ tập tin sử dụng nhóm \"chia sẻ tập tin\".\n"
 "Có thể dùng userdrake để thêm người dùng vào nhóm này."
 
-#: ../../any.pm_.c:1072
+#: ../../any.pm_.c:1053 ../../security/level.pm_.c:7
 msgid "Welcome To Crackers"
 msgstr "Chào mừng các Cracker"
 
-#: ../../any.pm_.c:1073
+#: ../../any.pm_.c:1054 ../../security/level.pm_.c:8
 msgid "Poor"
 msgstr "Tội nghiệp"
 
-#: ../../any.pm_.c:1074 ../../mouse.pm_.c:31
+#: ../../any.pm_.c:1055 ../../mouse.pm_.c:31 ../../security/level.pm_.c:9
 msgid "Standard"
 msgstr "Chuẩn"
 
-#: ../../any.pm_.c:1075
+#: ../../any.pm_.c:1056 ../../security/level.pm_.c:10
 msgid "High"
 msgstr "Cao"
 
-#: ../../any.pm_.c:1076
+#: ../../any.pm_.c:1057 ../../security/level.pm_.c:11
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: ../../any.pm_.c:1077
+#: ../../any.pm_.c:1058 ../../security/level.pm_.c:12
 msgid "Paranoid"
 msgstr "Hoang tưởng"
 
-#: ../../any.pm_.c:1080
+#: ../../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"
@@ -1010,7 +1016,7 @@ msgstr ""
 "nhưng dễ bị tổn thương: không được dùng cho máy tính nối mạng hoặc nối\n"
 "với Internet. Không có truy cập bằng mật khẩu."
 
-#: ../../any.pm_.c:1083
+#: ../../any.pm_.c:1064
 msgid ""
 "Password are now enabled, but use as a networked computer is still not "
 "recommended."
@@ -1018,7 +1024,7 @@ msgstr ""
 "Bây giờ cho phép mật khẩu, nhưng sử dụng cho một máy nối mạng thì vẫn không "
 "nên."
 
-#: ../../any.pm_.c:1084
+#: ../../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."
@@ -1026,7 +1032,7 @@ msgstr ""
 "Đây là mức bảo mật chuẩn được khuyến cáo cho máy tính sẽ được nối với "
 "Internet theo kiểu máy khách."
 
-#: ../../any.pm_.c:1085
+#: ../../any.pm_.c:1066
 msgid ""
 "There are already some restrictions, and more automatic checks are run every "
 "night."
@@ -1034,7 +1040,7 @@ msgstr ""
 "Đã có một số hạn chế và các thêm kiểm tra tự động sẽ được chạy hàng ngày vào "
 "ban đêm."
 
-#: ../../any.pm_.c:1086
+#: ../../any.pm_.c:1067
 msgid ""
 "With this security level, the use of this system as a server becomes "
 "possible.\n"
@@ -1048,7 +1054,7 @@ msgstr ""
 "các máy khách kết nối vào. Lưu ý: nếu máy tính này chỉ là một máy khách trên "
 "Internet, tốt hơn là bạn nên chọn mức bảo mật thấp hơn."
 
-#: ../../any.pm_.c:1089
+#: ../../any.pm_.c:1070
 msgid ""
 "This is similar to the previous level, but the system is entirely closed and "
 "security features are at their maximum."
@@ -1056,33 +1062,33 @@ msgstr ""
 "Giống như mức bảo mật trước, nhưng hệ thống bị đóng hoàn toàn và các tính "
 "năng bảo mật là ở mức tối đa."
 
-#: ../../any.pm_.c:1095
+#: ../../any.pm_.c:1076
 msgid "DrakSec Basic Options"
 msgstr "Tùy Chọn Cơ Bản Của DrakSec"
 
-#: ../../any.pm_.c:1096
+#: ../../any.pm_.c:1077
 msgid "Please choose the desired security level"
 msgstr "Hãy chọn mức bảo mật mong muốn"
 
-#: ../../any.pm_.c:1099
+#: ../../any.pm_.c:1080
 msgid "Security level"
 msgstr "Mức độ bảo mật"
 
-#: ../../any.pm_.c:1101
+#: ../../any.pm_.c:1082
 msgid "Use libsafe for servers"
 msgstr "Dùng libsafe cho các máy chủ"
 
-#: ../../any.pm_.c:1102
+#: ../../any.pm_.c:1083
 msgid ""
 "A library which defends against buffer overflow and format string attacks."
 msgstr ""
 "Thư viện để phòng chống sự tràn bộ đệm và các cuộc tấn công chuỗi định dạng."
 
-#: ../../any.pm_.c:1103
+#: ../../any.pm_.c:1084
 msgid "Security Administrator (login or email)"
 msgstr "Người Quản Trị Bảo Mật (đăng nhập hay email)"
 
-#: ../../any.pm_.c:1192
+#: ../../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"
@@ -1093,7 +1099,7 @@ msgstr ""
 "(VD: latin hay không latin)"
 
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: ../../bootloader.pm_.c:429
+#: ../../bootloader.pm_.c:436
 #, c-format
 msgid ""
 "Welcome to %s the operating system chooser!\n"
@@ -1110,13 +1116,13 @@ 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:989
+#: ../../bootloader.pm_.c:983
 msgid "Welcome to GRUB the operating system chooser!"
 msgstr "Cha`o mu+`ng chu+o+ng tri`nh cho.n he^. ddie^`u ha`nh 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:992
+#: ../../bootloader.pm_.c:986
 #, c-format
 msgid "Use the %c and %c keys for selecting which entry is highlighted."
 msgstr ""
@@ -1124,7 +1130,7 @@ 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:995
+#: ../../bootloader.pm_.c:989
 msgid "Press enter to boot the selected OS, 'e' to edit the"
 msgstr ""
 "Nha^'n Enter dde^? kho+?i ddo^.ng he^. ddie^`u ha`nh ddu+o+.c cho.n, 'e' "
@@ -1132,97 +1138,92 @@ 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:998
+#: ../../bootloader.pm_.c:992
 msgid "commands before booting, or 'c' for a command-line."
 msgstr "ca'c le^.nh tru+o+'c khi kho+?i ddo^.ng, hoa(.c 'c' cho do`ng le^.nh."
 
 #. -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:1001
+#: ../../bootloader.pm_.c:995
 #, c-format
 msgid "The highlighted entry will be booted automatically in %d seconds."
 msgstr ""
 "Mu.c nha^.p ba^.t sa'ng se~ ddu+o+.c kho+?i ddo^.ng tu+. ddo^.ng sau %d "
 "gia^y."
 
-#: ../../bootloader.pm_.c:1005
+#: ../../bootloader.pm_.c:999
 msgid "not enough room in /boot"
 msgstr "không đủ ngăn trong /boot"
 
 #. -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:1105
+#: ../../bootloader.pm_.c:1099
 msgid "Desktop"
 msgstr "Màn hình nền"
 
 #. -PO: "Desktop" and "Start Menu" are the name of the directories found in c:\windows
-#: ../../bootloader.pm_.c:1107
+#: ../../bootloader.pm_.c:1101
 msgid "Start Menu"
 msgstr "Menu Khởi Chạy"
 
-#: ../../bootloader.pm_.c:1126
+#: ../../bootloader.pm_.c:1120
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Không thể cài đặt trình nạp khởi động lên phân vùng %s\n"
 
-#: ../../bootlook.pm_.c:46 ../../standalone/drakperm_.c:15
-#: ../../standalone/draksplash_.c:26
-msgid "no help implemented yet.\n"
-msgstr "vẫn chưa thực thi trợ giúp.\n"
-
-#: ../../bootlook.pm_.c:62
+#: ../../bootlook.pm_.c:53
 msgid "Boot Style Configuration"
 msgstr "Cấu Hình Khuôn Thức Khởi Động"
 
-#: ../../bootlook.pm_.c:79 ../../harddrake/ui.pm_.c:62
-#: ../../harddrake/ui.pm_.c:63 ../../standalone/drakfloppy_.c:82
-#: ../../standalone/logdrake_.c:102
+#: ../../bootlook.pm_.c:70 ../../standalone/drakfloppy_.c:54
+#: ../../standalone/harddrake2_.c:81 ../../standalone/harddrake2_.c:82
+#: ../../standalone/logdrake_.c:74
 msgid "/_File"
 msgstr "/_Tệp"
 
-#: ../../bootlook.pm_.c:80 ../../standalone/drakfloppy_.c:83
-#: ../../standalone/logdrake_.c:108
+#: ../../bootlook.pm_.c:71 ../../standalone/drakfloppy_.c:55
+#: ../../standalone/logdrake_.c:80
 msgid "/File/_Quit"
-msgstr "/Tệp/_Thoát"
+msgstr "/Tệp/T_hoát"
 
-#: ../../bootlook.pm_.c:80 ../../harddrake/ui.pm_.c:63
-#: ../../standalone/drakfloppy_.c:83 ../../standalone/logdrake_.c:108
+#: ../../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:91
+#: ../../bootlook.pm_.c:82
 msgid "NewStyle Categorizing Monitor"
 msgstr "Màn hình phân loại kiểu mới"
 
-#: ../../bootlook.pm_.c:92
+#: ../../bootlook.pm_.c:83
 msgid "NewStyle Monitor"
 msgstr "Màn hình kiểu mới"
 
-#: ../../bootlook.pm_.c:93
+#: ../../bootlook.pm_.c:84
 msgid "Traditional Monitor"
 msgstr "Màn hình truyền thống"
 
-#: ../../bootlook.pm_.c:94
+#: ../../bootlook.pm_.c:85
 msgid "Traditional Gtk+ Monitor"
 msgstr "Màn hình truyền thống Gtk+"
 
-#: ../../bootlook.pm_.c:95
+#: ../../bootlook.pm_.c:86
 msgid "Launch Aurora at boot time"
 msgstr "Chạy Aurora khi khởi động"
 
-#: ../../bootlook.pm_.c:98
+#: ../../bootlook.pm_.c:89
 msgid "Lilo/grub mode"
 msgstr "Chế độ Lilo/Grub"
 
-#: ../../bootlook.pm_.c:98
+#: ../../bootlook.pm_.c:89
 msgid "Yaboot mode"
 msgstr "Chế độ Yaboot"
 
-#: ../../bootlook.pm_.c:146
+#: ../../bootlook.pm_.c:138
 msgid "Install themes"
 msgstr "Cài đặt các theme"
 
-#: ../../bootlook.pm_.c:147
+#: ../../bootlook.pm_.c:139
 msgid ""
 "Display theme\n"
 "under console"
@@ -1230,46 +1231,46 @@ msgstr ""
 "Hiển thị theme\n"
 "dưới console"
 
-#: ../../bootlook.pm_.c:148
+#: ../../bootlook.pm_.c:140
 msgid "Create new theme"
 msgstr "Tạo theme mới"
 
-#: ../../bootlook.pm_.c:192
+#: ../../bootlook.pm_.c:184
 #, c-format
 msgid "Backup %s to %s.old"
 msgstr "Sao lưu %s thành %s.old"
 
-#: ../../bootlook.pm_.c:195
+#: ../../bootlook.pm_.c:187
 #, c-format
 msgid "Copy %s to %s"
 msgstr "Sao chép %s sang %s"
 
-#: ../../bootlook.pm_.c:200 ../../bootlook.pm_.c:230 ../../bootlook.pm_.c:232
-#: ../../bootlook.pm_.c:242 ../../bootlook.pm_.c:251 ../../bootlook.pm_.c:258
-#: ../../diskdrake/dav.pm_.c:77 ../../diskdrake/hd_gtk.pm_.c:116
-#: ../../diskdrake/interactive.pm_.c:213 ../../diskdrake/interactive.pm_.c:344
-#: ../../diskdrake/interactive.pm_.c:359 ../../diskdrake/interactive.pm_.c:473
-#: ../../diskdrake/interactive.pm_.c:478 ../../diskdrake/smbnfs_gtk.pm_.c:45
+#: ../../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:34
+#: ../../interactive/http.pm_.c:120 ../../standalone/draksplash_.c:21
 msgid "Error"
 msgstr "Lỗi"
 
-#: ../../bootlook.pm_.c:200
+#: ../../bootlook.pm_.c:192
 msgid "Lilo message not found"
 msgstr "Không tìm thấy thông điệp của LiLo"
 
-#: ../../bootlook.pm_.c:230
+#: ../../bootlook.pm_.c:222
 msgid "Can't write /etc/sysconfig/bootsplash."
 msgstr "Không thể ghi /etc/sysconfig/bootsplash."
 
-#: ../../bootlook.pm_.c:230
+#: ../../bootlook.pm_.c:222
 #, c-format
 msgid "Write %s"
 msgstr "Ghi %s"
 
-#: ../../bootlook.pm_.c:232
+#: ../../bootlook.pm_.c:224
 msgid ""
 "Can't write /etc/sysconfig/bootsplash\n"
 "File not found."
@@ -1277,17 +1278,17 @@ msgstr ""
 "Không thể ghi /etc/sysconfig/bootsplash\n"
 "Không thấy tập tin."
 
-#: ../../bootlook.pm_.c:243
+#: ../../bootlook.pm_.c:235
 #, c-format
 msgid "Can't launch mkinitrd -f /boot/initrd-%s.img %s."
 msgstr "Không thể chạy mkinitrd -f /boot/initrd-%s.img %s."
 
-#: ../../bootlook.pm_.c:246
+#: ../../bootlook.pm_.c:238
 #, c-format
 msgid "Make initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
 msgstr "Tạo initrd 'mkinitrd -f /boot/initrd-%s.img %s'."
 
-#: ../../bootlook.pm_.c:252
+#: ../../bootlook.pm_.c:244
 msgid ""
 "Can't relaunch LiLo!\n"
 "Launch \"lilo\" as root in command line to complete LiLo theme installation."
@@ -1296,24 +1297,24 @@ msgstr ""
 "Hãy chạy \"lilo\" bằng root trong dòng lệnh để hoàn thành cài đặt theme của "
 "LiLo."
 
-#: ../../bootlook.pm_.c:256
+#: ../../bootlook.pm_.c:248
 msgid "Relaunch 'lilo'"
 msgstr "Chạy lại 'lilo'"
 
-#: ../../bootlook.pm_.c:258 ../../standalone/draksplash_.c:165
-#: ../../standalone/draksplash_.c:329 ../../standalone/draksplash_.c:456
+#: ../../bootlook.pm_.c:250 ../../standalone/draksplash_.c:156
+#: ../../standalone/draksplash_.c:321 ../../standalone/draksplash_.c:449
 msgid "Notice"
 msgstr "Thông báo"
 
-#: ../../bootlook.pm_.c:259
+#: ../../bootlook.pm_.c:251
 msgid "LiLo and Bootsplash themes installation successfull"
 msgstr "Hoàn thành cài đặt theme cho Bootsplash và LiLo"
 
-#: ../../bootlook.pm_.c:259
+#: ../../bootlook.pm_.c:251
 msgid "Theme installation failed!"
 msgstr "Không cài đặt được theme!"
 
-#: ../../bootlook.pm_.c:267
+#: ../../bootlook.pm_.c:259
 #, c-format
 msgid ""
 "You are currently using %s as your boot manager.\n"
@@ -1322,21 +1323,21 @@ msgstr ""
 "Hiện thời bạn đang dùng %s làm Trình Quản Lý Khởi Động.\n"
 "Nhấn lên Cấu Hình để chạy đồ thuật cho thiết lập."
 
-#: ../../bootlook.pm_.c:269 ../../standalone/drakbackup_.c:2429
-#: ../../standalone/drakbackup_.c:2439 ../../standalone/drakbackup_.c:2449
-#: ../../standalone/drakbackup_.c:2457 ../../standalone/drakgw_.c:554
+#: ../../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 "Cấu hình"
 
-#: ../../bootlook.pm_.c:276
+#: ../../bootlook.pm_.c:268
 msgid "Splash selection"
 msgstr "Chọn splash"
 
-#: ../../bootlook.pm_.c:279
+#: ../../bootlook.pm_.c:271
 msgid "Themes"
 msgstr "Themes"
 
-#: ../../bootlook.pm_.c:281
+#: ../../bootlook.pm_.c:273
 msgid ""
 "\n"
 "Select theme for\n"
@@ -1350,89 +1351,84 @@ msgstr ""
 "Bạn có thể chọn\n"
 "chúng riêng biệt"
 
-#: ../../bootlook.pm_.c:284
+#: ../../bootlook.pm_.c:276
 msgid "Lilo screen"
 msgstr "Màn hình LiLo"
 
-#: ../../bootlook.pm_.c:289
+#: ../../bootlook.pm_.c:281
 msgid "Bootsplash"
 msgstr "Bootsplash"
 
-#: ../../bootlook.pm_.c:324
+#: ../../bootlook.pm_.c:316
 msgid "System mode"
 msgstr "Chế độ hệ thống"
 
-#: ../../bootlook.pm_.c:326
+#: ../../bootlook.pm_.c:318
 msgid "Launch the graphical environment when your system starts"
 msgstr "Chạy hệ thống X-Window khi khởi động"
 
-#: ../../bootlook.pm_.c:331
+#: ../../bootlook.pm_.c:323
 msgid "No, I don't want autologin"
 msgstr "Tôi không muốn đăng nhập tự động"
 
-#: ../../bootlook.pm_.c:333
+#: ../../bootlook.pm_.c:325
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr "Tôi muốn đăng nhập tự động với cái này (người dùng, màn hình nền)"
 
-#: ../../bootlook.pm_.c:343 ../../network/netconnect.pm_.c:97
-#: ../../standalone/drakTermServ_.c:173 ../../standalone/drakTermServ_.c:300
-#: ../../standalone/drakTermServ_.c:405 ../../standalone/drakbackup_.c:4193
-#: ../../standalone/drakbackup_.c:4956 ../../standalone/drakconnect_.c:108
-#: ../../standalone/drakconnect_.c:140 ../../standalone/drakconnect_.c:296
-#: ../../standalone/drakconnect_.c:435 ../../standalone/drakconnect_.c:521
-#: ../../standalone/drakconnect_.c:564 ../../standalone/drakconnect_.c:667
-#: ../../standalone/drakfont_.c:612 ../../standalone/drakfont_.c:799
-#: ../../standalone/drakfont_.c:876 ../../standalone/drakfont_.c:963
-#: ../../ugtk.pm_.c:289
+#: ../../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 "OK"
 
-#: ../../bootlook.pm_.c:403
-#, c-format
-msgid "can not open /etc/inittab for reading: %s"
-msgstr "không thể mở /etc/inittab để đọc: %s"
-
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
 msgid "GB"
 msgstr "GB"
 
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
 msgid "KB"
 msgstr "KB"
 
-#: ../../common.pm_.c:99
+#: ../../common.pm_.c:107
 msgid "MB"
 msgstr "MB"
 
-#: ../../common.pm_.c:107
+#: ../../common.pm_.c:115
 msgid "TB"
 msgstr "TB"
 
-#: ../../common.pm_.c:115
+#: ../../common.pm_.c:123
 #, c-format
 msgid "%d minutes"
 msgstr "%d phút"
 
-#: ../../common.pm_.c:117
+#: ../../common.pm_.c:125
 msgid "1 minute"
 msgstr "1 phút"
 
-#: ../../common.pm_.c:119
+#: ../../common.pm_.c:127
 #, c-format
 msgid "%d seconds"
 msgstr "%d giây"
 
-#: ../../common.pm_.c:164
+#: ../../common.pm_.c:172
 msgid "Can't make screenshots before partitioning"
 msgstr "Không thể chụp ảnh ổ đĩa trước khi phân vùng"
 
-#: ../../common.pm_.c:171
+#: ../../common.pm_.c:179
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Sẵn có ảnh chụp sau quá trình cài đặt trong %s"
 
-#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:28 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:113
+#: ../../crypto.pm_.c:14 ../../crypto.pm_.c:28 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:127
 msgid "France"
 msgstr "Pháp"
 
@@ -1440,8 +1436,8 @@ msgstr "Pháp"
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: ../../crypto.pm_.c:16 ../../crypto.pm_.c:29 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:116
+#: ../../crypto.pm_.c:16 ../../crypto.pm_.c:29 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:130
 msgid "Belgium"
 msgstr "Bỉ"
 
@@ -1465,13 +1461,13 @@ msgstr "Na uy"
 msgid "Sweden"
 msgstr "Thụy điển"
 
-#: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:114
+#: ../../crypto.pm_.c:22 ../../crypto.pm_.c:36 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:128
 msgid "Netherlands"
 msgstr "Netherlands"
 
-#: ../../crypto.pm_.c:23 ../../crypto.pm_.c:37 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:115 ../../standalone/drakxtv_.c:68
+#: ../../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 "Ý"
 
@@ -1479,8 +1475,8 @@ msgstr "Ý"
 msgid "Austria"
 msgstr "Áo"
 
-#: ../../crypto.pm_.c:35 ../../crypto.pm_.c:61 ../../network/tools.pm_.c:104
-#: ../../network/tools.pm_.c:117
+#: ../../crypto.pm_.c:35 ../../crypto.pm_.c:61 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:131
 msgid "United States"
 msgstr "Hoa Kỳ"
 
@@ -1500,12 +1496,12 @@ msgstr ""
 msgid "New"
 msgstr "Mới"
 
-#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:392
+#: ../../diskdrake/dav.pm_.c:63 ../../diskdrake/interactive.pm_.c:400
 #: ../../diskdrake/smbnfs_gtk.pm_.c:81
 msgid "Unmount"
 msgstr "Thôi gắn kết"
 
-#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:389
+#: ../../diskdrake/dav.pm_.c:64 ../../diskdrake/interactive.pm_.c:397
 #: ../../diskdrake/smbnfs_gtk.pm_.c:82
 msgid "Mount"
 msgstr "Gắn kết"
@@ -1514,10 +1510,9 @@ msgstr "Gắn kết"
 msgid "Server"
 msgstr "Máy chủ"
 
-#: ../../diskdrake/dav.pm_.c:66 ../../diskdrake/interactive.pm_.c:383
-#: ../../diskdrake/interactive.pm_.c:572 ../../diskdrake/interactive.pm_.c:599
-#: ../../diskdrake/removable.pm_.c:24 ../../diskdrake/removable_gtk.pm_.c:15
-#: ../../diskdrake/smbnfs_gtk.pm_.c:85
+#: ../../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 "Điểm gắn kết"
 
@@ -1533,28 +1528,28 @@ msgstr "URL phải bắt đầu bằng http:// hoặc https://"
 msgid "Server: "
 msgstr "Máy chủ:"
 
-#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:444
-#: ../../diskdrake/interactive.pm_.c:1093
-#: ../../diskdrake/interactive.pm_.c:1168
+#: ../../diskdrake/dav.pm_.c:110 ../../diskdrake/interactive.pm_.c:452
+#: ../../diskdrake/interactive.pm_.c:1102
+#: ../../diskdrake/interactive.pm_.c:1177
 msgid "Mount point: "
 msgstr "Điểm gắn kết:"
 
-#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1174
+#: ../../diskdrake/dav.pm_.c:111 ../../diskdrake/interactive.pm_.c:1183
 #, c-format
 msgid "Options: %s"
 msgstr "Tùy chọn: %s"
 
-#: ../../diskdrake/hd_gtk.pm_.c:94
+#: ../../diskdrake/hd_gtk.pm_.c:97
 msgid "Please make a backup of your data first"
 msgstr "Trước hết, bạn hãy sao lưu dữ liệu"
 
-#: ../../diskdrake/hd_gtk.pm_.c:94 ../../diskdrake/interactive.pm_.c:938
-#: ../../diskdrake/interactive.pm_.c:947
-#: ../../diskdrake/interactive.pm_.c:1013
+#: ../../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 "Hãy đọc kỹ!"
 
-#: ../../diskdrake/hd_gtk.pm_.c:97
+#: ../../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"
@@ -1564,15 +1559,15 @@ msgstr ""
 "sector là đủ)\n"
 "tại phần đầu tiên của đĩa"
 
-#: ../../diskdrake/hd_gtk.pm_.c:151
+#: ../../diskdrake/hd_gtk.pm_.c:154
 msgid "Wizard"
 msgstr "Đồ thuật"
 
-#: ../../diskdrake/hd_gtk.pm_.c:184 ../../diskdrake/removable_gtk.pm_.c:24
+#: ../../diskdrake/hd_gtk.pm_.c:187
 msgid "Choose action"
 msgstr "Chọn hành động"
 
-#: ../../diskdrake/hd_gtk.pm_.c:188
+#: ../../diskdrake/hd_gtk.pm_.c:191
 msgid ""
 "You have one big FAT partition\n"
 "(generally used by MicroSoft Dos/Windows).\n"
@@ -1584,152 +1579,152 @@ msgstr ""
 "Đầu tiên, bạn nên định lại kích thước của phân vùng này\n"
 "(nhấn chuột lên nó, rồi nhấn \"Lập lại kích thước\")"
 
-#: ../../diskdrake/hd_gtk.pm_.c:191
+#: ../../diskdrake/hd_gtk.pm_.c:194
 msgid "Please click on a partition"
 msgstr "Hãy nhấn chuột lên phân vùng"
 
-#: ../../diskdrake/hd_gtk.pm_.c:205 ../../diskdrake/smbnfs_gtk.pm_.c:69
-#: ../../install_steps_gtk.pm_.c:465
+#: ../../diskdrake/hd_gtk.pm_.c:208 ../../diskdrake/smbnfs_gtk.pm_.c:69
+#: ../../install_steps_gtk.pm_.c:464
 msgid "Details"
 msgstr "Chi tiết"
 
-#: ../../diskdrake/hd_gtk.pm_.c:252
+#: ../../diskdrake/hd_gtk.pm_.c:254
 msgid "No hard drives found"
 msgstr "Không tìm thấy đĩa cứng nào"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "Ext2"
 msgstr "Ext2"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "FAT"
 msgstr "FAT"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "HFS"
 msgstr "HFS"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "Journalised FS"
 msgstr "Hệ thống tập tin nhật ký"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "SunOS"
 msgstr "SunOS"
 
-#: ../../diskdrake/hd_gtk.pm_.c:323
+#: ../../diskdrake/hd_gtk.pm_.c:325
 msgid "Swap"
 msgstr "Swap"
 
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../diskdrake/interactive.pm_.c:1109
+#: ../../diskdrake/hd_gtk.pm_.c:326 ../../diskdrake/interactive.pm_.c:1118
 msgid "Empty"
 msgstr "Trống"
 
-#: ../../diskdrake/hd_gtk.pm_.c:324 ../../install_steps_gtk.pm_.c:325
-#: ../../install_steps_gtk.pm_.c:383 ../../mouse.pm_.c:165
-#: ../../services.pm_.c:157 ../../standalone/drakbackup_.c:1756
+#: ../../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 "Khác"
 
-#: ../../diskdrake/hd_gtk.pm_.c:328
+#: ../../diskdrake/hd_gtk.pm_.c:330
 msgid "Filesystem types:"
 msgstr "Kiểu hệ thống tập tin:"
 
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:406
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:414
 msgid "Create"
 msgstr "Tạo"
 
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/interactive.pm_.c:384
-#: ../../diskdrake/interactive.pm_.c:535 ../../diskdrake/removable.pm_.c:26
-#: ../../diskdrake/removable.pm_.c:49 ../../diskdrake/removable_gtk.pm_.c:17
+#: ../../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 "Kiểu"
 
-#: ../../diskdrake/hd_gtk.pm_.c:345 ../../diskdrake/hd_gtk.pm_.c:347
+#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/hd_gtk.pm_.c:349
 #, c-format
 msgid "Use ``%s'' instead"
 msgstr "Dùng ``%s'' thay thế"
 
-#: ../../diskdrake/hd_gtk.pm_.c:347 ../../diskdrake/interactive.pm_.c:393
+#: ../../diskdrake/hd_gtk.pm_.c:349 ../../diskdrake/interactive.pm_.c:401
 msgid "Delete"
 msgstr "Xóa"
 
-#: ../../diskdrake/hd_gtk.pm_.c:351
+#: ../../diskdrake/hd_gtk.pm_.c:353
 msgid "Use ``Unmount'' first"
 msgstr "Dùng ``Thôi gắn kết'' trước tiên"
 
-#: ../../diskdrake/hd_gtk.pm_.c:352 ../../diskdrake/interactive.pm_.c:522
+#: ../../diskdrake/hd_gtk.pm_.c:354 ../../diskdrake/interactive.pm_.c:530
 #, c-format
 msgid ""
 "After changing type of partition %s, all data on this partition will be lost"
 msgstr "Sau khi thay đổi kiểu phân vùng %s, mọi dữ liệu trên đó sẽ mất"
 
-#: ../../diskdrake/interactive.pm_.c:174
+#: ../../diskdrake/interactive.pm_.c:177
 msgid "Choose a partition"
 msgstr "Chọn phân vùng"
 
-#: ../../diskdrake/interactive.pm_.c:174
+#: ../../diskdrake/interactive.pm_.c:177
 msgid "Choose another partition"
 msgstr "Chọn phân vùng khác"
 
-#: ../../diskdrake/interactive.pm_.c:199
+#: ../../diskdrake/interactive.pm_.c:202
 msgid "Exit"
 msgstr "Thoát ra"
 
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
 msgid "Toggle to expert mode"
 msgstr "Chuyển sang chế độ Chuyên gia"
 
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
 msgid "Toggle to normal mode"
 msgstr "Chuyển sang chế độ bình thường"
 
-#: ../../diskdrake/interactive.pm_.c:225
+#: ../../diskdrake/interactive.pm_.c:228
 msgid "Undo"
 msgstr "Hoàn tác"
 
-#: ../../diskdrake/interactive.pm_.c:244
+#: ../../diskdrake/interactive.pm_.c:247
 msgid "Continue anyway?"
 msgstr "Vẫn tiếp tục bằng bất cứ giá nào?"
 
-#: ../../diskdrake/interactive.pm_.c:249
+#: ../../diskdrake/interactive.pm_.c:252
 msgid "Quit without saving"
 msgstr "Thoát mà không lưu lại"
 
-#: ../../diskdrake/interactive.pm_.c:249
+#: ../../diskdrake/interactive.pm_.c:252
 msgid "Quit without writing the partition table?"
 msgstr "Thoát mà không ghi bảng phân vùng?"
 
-#: ../../diskdrake/interactive.pm_.c:254
+#: ../../diskdrake/interactive.pm_.c:257
 msgid "Do you want to save /etc/fstab modifications"
 msgstr "Bạn có muốn lưu các thay đổi của /etc/fstab?"
 
-#: ../../diskdrake/interactive.pm_.c:267
-msgid "Auto allocate"
-msgstr "Phân chia tự động"
-
-#: ../../diskdrake/interactive.pm_.c:267
+#: ../../diskdrake/interactive.pm_.c:271
 msgid "Clear all"
 msgstr "Xóa hết"
 
-#: ../../diskdrake/interactive.pm_.c:267
-#: ../../install_steps_interactive.pm_.c:214
+#: ../../diskdrake/interactive.pm_.c:272
+msgid "Auto allocate"
+msgstr "Phân chia tự động"
+
+#: ../../diskdrake/interactive.pm_.c:273
+#: ../../install_steps_interactive.pm_.c:220
 msgid "More"
 msgstr "Thêm"
 
-#: ../../diskdrake/interactive.pm_.c:271
+#: ../../diskdrake/interactive.pm_.c:278
 msgid "Hard drive information"
 msgstr "Thông tin đĩa cứng"
 
-#: ../../diskdrake/interactive.pm_.c:302
+#: ../../diskdrake/interactive.pm_.c:310
 msgid "All primary partitions are used"
 msgstr "Toàn bộ các phân vùng chính được sử dụng"
 
-#: ../../diskdrake/interactive.pm_.c:303
+#: ../../diskdrake/interactive.pm_.c:311
 msgid "I can't add any more partition"
 msgstr "Không thể thêm phân vùng nào nữa"
 
-#: ../../diskdrake/interactive.pm_.c:304
+#: ../../diskdrake/interactive.pm_.c:312
 msgid ""
 "To have more partitions, please delete one to be able to create an extended "
 "partition"
@@ -1737,31 +1732,31 @@ msgstr ""
 "Để có thêm phân vùng, hãy xoá một phân vùng để có thể tạo một phân vùng mở "
 "rộng"
 
-#: ../../diskdrake/interactive.pm_.c:314
+#: ../../diskdrake/interactive.pm_.c:322
 msgid "Save partition table"
 msgstr "Lưu bảng phân vùng"
 
-#: ../../diskdrake/interactive.pm_.c:315
+#: ../../diskdrake/interactive.pm_.c:323
 msgid "Restore partition table"
 msgstr "Khôi phục bảng phân vùng"
 
-#: ../../diskdrake/interactive.pm_.c:316
+#: ../../diskdrake/interactive.pm_.c:324
 msgid "Rescue partition table"
 msgstr "Bảng phân vùng cứu giải"
 
-#: ../../diskdrake/interactive.pm_.c:318
+#: ../../diskdrake/interactive.pm_.c:326
 msgid "Reload partition table"
 msgstr "Nạp lại bảng phân vùng"
 
-#: ../../diskdrake/interactive.pm_.c:323
+#: ../../diskdrake/interactive.pm_.c:331
 msgid "Removable media automounting"
 msgstr "Tự động gắn kết phương tiện tháo lắp"
 
-#: ../../diskdrake/interactive.pm_.c:332 ../../diskdrake/interactive.pm_.c:352
+#: ../../diskdrake/interactive.pm_.c:340 ../../diskdrake/interactive.pm_.c:360
 msgid "Select file"
 msgstr "Chọn tập tin"
 
-#: ../../diskdrake/interactive.pm_.c:339
+#: ../../diskdrake/interactive.pm_.c:347
 msgid ""
 "The backup partition table has not the same size\n"
 "Still continue?"
@@ -1769,11 +1764,12 @@ msgstr ""
 "Bảng phân vùng sao lưu không có cùng kích thước\n"
 "Vẫn tiếp tục?"
 
-#: ../../diskdrake/interactive.pm_.c:353 ../../harddrake/sound.pm_.c:200
+#: ../../diskdrake/interactive.pm_.c:361 ../../harddrake/sound.pm_.c:202
+#: ../../network/modem.pm_.c:95
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: ../../diskdrake/interactive.pm_.c:354
+#: ../../diskdrake/interactive.pm_.c:362
 msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
@@ -1781,71 +1777,71 @@ msgstr ""
 "Nạp đĩa mềm vào ổ\n"
 "Mọi dữ liệu trên đĩa sẽ bị mất"
 
-#: ../../diskdrake/interactive.pm_.c:365
+#: ../../diskdrake/interactive.pm_.c:373
 msgid "Trying to rescue partition table"
 msgstr "Đang cố gắng cứu bảng phân vùng"
 
-#: ../../diskdrake/interactive.pm_.c:371
+#: ../../diskdrake/interactive.pm_.c:379
 msgid "Detailed information"
 msgstr "Thông tin chi tiết"
 
-#: ../../diskdrake/interactive.pm_.c:386 ../../diskdrake/interactive.pm_.c:666
+#: ../../diskdrake/interactive.pm_.c:394 ../../diskdrake/interactive.pm_.c:674
 msgid "Resize"
 msgstr "Đặt lại kích thước"
 
-#: ../../diskdrake/interactive.pm_.c:387 ../../diskdrake/interactive.pm_.c:719
+#: ../../diskdrake/interactive.pm_.c:395 ../../diskdrake/interactive.pm_.c:727
 msgid "Move"
 msgstr "Chuyển"
 
-#: ../../diskdrake/interactive.pm_.c:388
+#: ../../diskdrake/interactive.pm_.c:396
 msgid "Format"
 msgstr "Format"
 
-#: ../../diskdrake/interactive.pm_.c:390
+#: ../../diskdrake/interactive.pm_.c:398
 msgid "Add to RAID"
 msgstr "Thêm vào RAID"
 
-#: ../../diskdrake/interactive.pm_.c:391
+#: ../../diskdrake/interactive.pm_.c:399
 msgid "Add to LVM"
 msgstr "Thêm vào LVM"
 
-#: ../../diskdrake/interactive.pm_.c:394
+#: ../../diskdrake/interactive.pm_.c:402
 msgid "Remove from RAID"
 msgstr "Gỡ bỏ khỏi RAID"
 
-#: ../../diskdrake/interactive.pm_.c:395
+#: ../../diskdrake/interactive.pm_.c:403
 msgid "Remove from LVM"
 msgstr "Gỡ bỏ khỏi LVM"
 
-#: ../../diskdrake/interactive.pm_.c:396
+#: ../../diskdrake/interactive.pm_.c:404
 msgid "Modify RAID"
 msgstr "Thay đổi RAID"
 
-#: ../../diskdrake/interactive.pm_.c:397
+#: ../../diskdrake/interactive.pm_.c:405
 msgid "Use for loopback"
 msgstr "Dùng cho loopback"
 
-#: ../../diskdrake/interactive.pm_.c:437
+#: ../../diskdrake/interactive.pm_.c:445
 msgid "Create a new partition"
 msgstr "Tạo phân vùng mới"
 
-#: ../../diskdrake/interactive.pm_.c:440
+#: ../../diskdrake/interactive.pm_.c:448
 msgid "Start sector: "
 msgstr "Sector bắt đầu: "
 
-#: ../../diskdrake/interactive.pm_.c:442 ../../diskdrake/interactive.pm_.c:819
+#: ../../diskdrake/interactive.pm_.c:450 ../../diskdrake/interactive.pm_.c:827
 msgid "Size in MB: "
 msgstr "Kích thước theo MB: "
 
-#: ../../diskdrake/interactive.pm_.c:443 ../../diskdrake/interactive.pm_.c:820
+#: ../../diskdrake/interactive.pm_.c:451 ../../diskdrake/interactive.pm_.c:828
 msgid "Filesystem type: "
 msgstr "Kiểu hệ thống tập tin: "
 
-#: ../../diskdrake/interactive.pm_.c:448
+#: ../../diskdrake/interactive.pm_.c:456
 msgid "Preference: "
 msgstr "Tùy thích: "
 
-#: ../../diskdrake/interactive.pm_.c:473
+#: ../../diskdrake/interactive.pm_.c:481
 msgid ""
 "You can't create a new partition\n"
 "(since you reached the maximal number of primary partitions).\n"
@@ -1855,33 +1851,33 @@ msgstr ""
 "(vì bạn đã tạo tối đa số lượng phân vùng chính).\n"
 "Đầu tiên, hãy bỏ một phân vùng chính và tạo phân vùng mở rộng."
 
-#: ../../diskdrake/interactive.pm_.c:503
+#: ../../diskdrake/interactive.pm_.c:511
 msgid "Remove the loopback file?"
 msgstr "Có gỡ bỏ tập tin loopback không?"
 
-#: ../../diskdrake/interactive.pm_.c:533
+#: ../../diskdrake/interactive.pm_.c:541
 msgid "Change partition type"
 msgstr "Thay đổi kiểu phân vùng"
 
-#: ../../diskdrake/interactive.pm_.c:534 ../../diskdrake/removable.pm_.c:48
+#: ../../diskdrake/interactive.pm_.c:542 ../../diskdrake/removable.pm_.c:48
 msgid "Which filesystem do you want?"
 msgstr "Hệ thống tập tin nào bạn muốn?"
 
-#: ../../diskdrake/interactive.pm_.c:540
+#: ../../diskdrake/interactive.pm_.c:548
 msgid "Switching from ext2 to ext3"
 msgstr "Chuyển từ ext2 sang ext3"
 
-#: ../../diskdrake/interactive.pm_.c:570
+#: ../../diskdrake/interactive.pm_.c:578
 #, c-format
 msgid "Where do you want to mount loopback file %s?"
 msgstr "Bạn muốn gắn kết tập tin loopback %s vào đâu?"
 
-#: ../../diskdrake/interactive.pm_.c:571
+#: ../../diskdrake/interactive.pm_.c:579
 #, c-format
 msgid "Where do you want to mount device %s?"
 msgstr "Bạn muốn gắn kết thiết bị %s vào đâu?"
 
-#: ../../diskdrake/interactive.pm_.c:577
+#: ../../diskdrake/interactive.pm_.c:585
 msgid ""
 "Can't unset mount point as this partition is used for loop back.\n"
 "Remove the loopback first"
@@ -1889,135 +1885,135 @@ msgstr ""
 "Không thể bỏ thiết lập điểm gắn kết vì phân vùng này dùng để loopback.\n"
 "Hãy gỡ bỏ loopback trước"
 
-#: ../../diskdrake/interactive.pm_.c:598
+#: ../../diskdrake/interactive.pm_.c:606
 #, c-format
 msgid "Where do you want to mount %s?"
 msgstr "Bạn muốn gắn kết %s vào đâu?"
 
-#: ../../diskdrake/interactive.pm_.c:622
+#: ../../diskdrake/interactive.pm_.c:630
 msgid "Computing FAT filesystem bounds"
 msgstr "Đang tính toán phạm vi hệ thống tập tin FAT"
 
-#: ../../diskdrake/interactive.pm_.c:622 ../../diskdrake/interactive.pm_.c:681
-#: ../../install_interactive.pm_.c:133
+#: ../../diskdrake/interactive.pm_.c:630 ../../diskdrake/interactive.pm_.c:689
+#: ../../install_interactive.pm_.c:131
 msgid "Resizing"
 msgstr "Đang lập lại kích thước"
 
-#: ../../diskdrake/interactive.pm_.c:654
+#: ../../diskdrake/interactive.pm_.c:662
 msgid "This partition is not resizeable"
 msgstr "Phân vùng này không thể lập lại kích thước"
 
-#: ../../diskdrake/interactive.pm_.c:659
+#: ../../diskdrake/interactive.pm_.c:667
 msgid "All data on this partition should be backed-up"
 msgstr "Mọi dữ liệu trên phân vùng này nên được sao lưu"
 
-#: ../../diskdrake/interactive.pm_.c:661
+#: ../../diskdrake/interactive.pm_.c:669
 #, c-format
 msgid "After resizing partition %s, all data on this partition will be lost"
 msgstr "Sau khi lập lại kích thước phân vùng %s, mọi dữ liệu trên đó sẽ bị mất"
 
-#: ../../diskdrake/interactive.pm_.c:666
+#: ../../diskdrake/interactive.pm_.c:674
 msgid "Choose the new size"
 msgstr "Chọn kích thước mới"
 
-#: ../../diskdrake/interactive.pm_.c:667
+#: ../../diskdrake/interactive.pm_.c:675
 msgid "New size in MB: "
 msgstr "Kích thước mới theo MB: "
 
-#: ../../diskdrake/interactive.pm_.c:720
+#: ../../diskdrake/interactive.pm_.c:728
 msgid "Which disk do you want to move it to?"
 msgstr "Bạn muốn chuyển nó tới đĩa nào?"
 
-#: ../../diskdrake/interactive.pm_.c:721
+#: ../../diskdrake/interactive.pm_.c:729
 msgid "Sector"
 msgstr "Sector"
 
-#: ../../diskdrake/interactive.pm_.c:722
+#: ../../diskdrake/interactive.pm_.c:730
 msgid "Which sector do you want to move it to?"
 msgstr "Bạn muốn chuyển nó tới sector nào?"
 
-#: ../../diskdrake/interactive.pm_.c:725
+#: ../../diskdrake/interactive.pm_.c:733
 msgid "Moving"
 msgstr "Đang chuyển"
 
-#: ../../diskdrake/interactive.pm_.c:725
+#: ../../diskdrake/interactive.pm_.c:733
 msgid "Moving partition..."
 msgstr "Đang chuyển phân vùng..."
 
-#: ../../diskdrake/interactive.pm_.c:742
+#: ../../diskdrake/interactive.pm_.c:750
 msgid "Choose an existing RAID to add to"
 msgstr "Hãy chọn RAID đang tồn tại để thêm vào"
 
-#: ../../diskdrake/interactive.pm_.c:743 ../../diskdrake/interactive.pm_.c:760
+#: ../../diskdrake/interactive.pm_.c:751 ../../diskdrake/interactive.pm_.c:768
 msgid "new"
 msgstr "mới"
 
-#: ../../diskdrake/interactive.pm_.c:758
+#: ../../diskdrake/interactive.pm_.c:766
 msgid "Choose an existing LVM to add to"
 msgstr "Hãy chọn LVM đang tồn tại để thêm vào"
 
-#: ../../diskdrake/interactive.pm_.c:763
+#: ../../diskdrake/interactive.pm_.c:771
 msgid "LVM name?"
 msgstr "Tên LVM?"
 
-#: ../../diskdrake/interactive.pm_.c:804
+#: ../../diskdrake/interactive.pm_.c:812
 msgid "This partition can't be used for loopback"
 msgstr "Phân vùng này không thể dùng cho loopback"
 
-#: ../../diskdrake/interactive.pm_.c:817
+#: ../../diskdrake/interactive.pm_.c:825
 msgid "Loopback"
 msgstr "Loopback"
 
-#: ../../diskdrake/interactive.pm_.c:818
+#: ../../diskdrake/interactive.pm_.c:826
 msgid "Loopback file name: "
 msgstr "Tên tập tin loopback: "
 
-#: ../../diskdrake/interactive.pm_.c:823
+#: ../../diskdrake/interactive.pm_.c:831
 msgid "Give a file name"
 msgstr "Đặt tên file"
 
-#: ../../diskdrake/interactive.pm_.c:826
+#: ../../diskdrake/interactive.pm_.c:834
 msgid "File already used by another loopback, choose another one"
 msgstr "Tập tin đã được loopback khác dùng, hãy chọn tập tin khác"
 
-#: ../../diskdrake/interactive.pm_.c:827
+#: ../../diskdrake/interactive.pm_.c:835
 msgid "File already exists. Use it?"
 msgstr "Tập tin đang tồn tại. Có dùng không?"
 
-#: ../../diskdrake/interactive.pm_.c:850
+#: ../../diskdrake/interactive.pm_.c:858
 msgid "Mount options"
 msgstr "Tùy chọn gắn kết"
 
-#: ../../diskdrake/interactive.pm_.c:857
+#: ../../diskdrake/interactive.pm_.c:865
 msgid "Various"
 msgstr "Khác nhau"
 
-#: ../../diskdrake/interactive.pm_.c:921 ../../standalone/drakfloppy_.c:104
+#: ../../diskdrake/interactive.pm_.c:929 ../../standalone/drakfloppy_.c:76
 msgid "device"
 msgstr "thiết bị"
 
-#: ../../diskdrake/interactive.pm_.c:922
+#: ../../diskdrake/interactive.pm_.c:930
 msgid "level"
 msgstr "Mức độ"
 
-#: ../../diskdrake/interactive.pm_.c:923
+#: ../../diskdrake/interactive.pm_.c:931
 msgid "chunk size"
 msgstr "Kích thước bó"
 
-#: ../../diskdrake/interactive.pm_.c:938
+#: ../../diskdrake/interactive.pm_.c:947
 msgid "Be careful: this operation is dangerous."
 msgstr "Hãy thận trọng: thao tác này nguy hiểm."
 
-#: ../../diskdrake/interactive.pm_.c:953
+#: ../../diskdrake/interactive.pm_.c:962
 msgid "What type of partitioning?"
 msgstr "Kiểu phân vùng nào?"
 
-#: ../../diskdrake/interactive.pm_.c:969
+#: ../../diskdrake/interactive.pm_.c:978
 #, c-format
 msgid "The package %s is needed. Install it?"
 msgstr "Cần gói tin %s. Cài đặt nó không?"
 
-#: ../../diskdrake/interactive.pm_.c:983
+#: ../../diskdrake/interactive.pm_.c:992
 msgid ""
 "Sorry I won't accept to create /boot so far onto the drive (on a cylinder > "
 "1024).\n"
@@ -2029,7 +2025,7 @@ msgstr ""
 "Hoặc bạn dùng LILO thì nó sẽ không làm việc, hoặc bạn không dùng LILO thì "
 "không cần /boot"
 
-#: ../../diskdrake/interactive.pm_.c:987
+#: ../../diskdrake/interactive.pm_.c:996
 msgid ""
 "The partition you've selected to add as root (/) is physically located "
 "beyond\n"
@@ -2040,7 +2036,7 @@ msgstr ""
 "cylinder thứ 1024 của đĩa cứng , và bạn không có phân vùng /boot.\n"
 "Nếu định dùng trình khởi động LILO, thận trọng thêm một phân vùng /boot"
 
-#: ../../diskdrake/interactive.pm_.c:993
+#: ../../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"
@@ -2051,44 +2047,44 @@ msgstr ""
 "boot.\n"
 "Vì vậy, hãy thận trọng thêm phân vùng /boot"
 
-#: ../../diskdrake/interactive.pm_.c:1013
+#: ../../diskdrake/interactive.pm_.c:1022
 #, c-format
 msgid "Partition table of drive %s is going to be written to disk!"
 msgstr "Bảng phân vùng của drive %s sắp được ghi lên đĩa!"
 
-#: ../../diskdrake/interactive.pm_.c:1017
+#: ../../diskdrake/interactive.pm_.c:1026
 msgid "You'll need to reboot before the modification can take place"
 msgstr "Bạn cần khởi động lại trước khi thay đổi có tác dụng"
 
-#: ../../diskdrake/interactive.pm_.c:1028
+#: ../../diskdrake/interactive.pm_.c:1037
 #, c-format
 msgid "After formatting partition %s, all data on this partition will be lost"
 msgstr "Sau khi format phân vùng %s, mọi dữ liệu trên đó sẽ bị mất"
 
-#: ../../diskdrake/interactive.pm_.c:1030
+#: ../../diskdrake/interactive.pm_.c:1039
 msgid "Formatting"
 msgstr "Đang format"
 
-#: ../../diskdrake/interactive.pm_.c:1031
+#: ../../diskdrake/interactive.pm_.c:1040
 #, c-format
 msgid "Formatting loopback file %s"
 msgstr "Đang format tập tin loopback %s"
 
-#: ../../diskdrake/interactive.pm_.c:1032
-#: ../../install_steps_interactive.pm_.c:459
+#: ../../diskdrake/interactive.pm_.c:1041
+#: ../../install_steps_interactive.pm_.c:466
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Đang format phân vùng %s"
 
-#: ../../diskdrake/interactive.pm_.c:1043
+#: ../../diskdrake/interactive.pm_.c:1052
 msgid "Hide files"
 msgstr "Các tập tin ẩn"
 
-#: ../../diskdrake/interactive.pm_.c:1043
+#: ../../diskdrake/interactive.pm_.c:1052
 msgid "Move files to the new partition"
 msgstr "Chuyển các tập tin sang phân vùng mới"
 
-#: ../../diskdrake/interactive.pm_.c:1044
+#: ../../diskdrake/interactive.pm_.c:1053
 #, c-format
 msgid ""
 "Directory %s already contains data\n"
@@ -2097,83 +2093,83 @@ msgstr ""
 "Thư mục %s đang chứa một số dữ liệu\n"
 "(%s)"
 
-#: ../../diskdrake/interactive.pm_.c:1055
+#: ../../diskdrake/interactive.pm_.c:1064
 msgid "Moving files to the new partition"
 msgstr "Di chuyển các tập tin sang phân vùng mới"
 
-#: ../../diskdrake/interactive.pm_.c:1059
+#: ../../diskdrake/interactive.pm_.c:1068
 #, c-format
 msgid "Copying %s"
 msgstr "Sao chép %s"
 
-#: ../../diskdrake/interactive.pm_.c:1063
+#: ../../diskdrake/interactive.pm_.c:1072
 #, c-format
 msgid "Removing %s"
 msgstr "Gỡ bỏ %s"
 
-#: ../../diskdrake/interactive.pm_.c:1073
+#: ../../diskdrake/interactive.pm_.c:1082
 #, c-format
 msgid "partition %s is now known as %s"
 msgstr "bây giờ phân vùng %s được coi là %s"
 
-#: ../../diskdrake/interactive.pm_.c:1094
-#: ../../diskdrake/interactive.pm_.c:1153
+#: ../../diskdrake/interactive.pm_.c:1103
+#: ../../diskdrake/interactive.pm_.c:1162
 msgid "Device: "
 msgstr "Thiết bị:"
 
-#: ../../diskdrake/interactive.pm_.c:1095
+#: ../../diskdrake/interactive.pm_.c:1104
 #, c-format
 msgid "DOS drive letter: %s (just a guess)\n"
 msgstr "Tên ổ đĩa trong DOS: %s (chỉ là phỏng đoán)\n"
 
-#: ../../diskdrake/interactive.pm_.c:1099
-#: ../../diskdrake/interactive.pm_.c:1107
-#: ../../diskdrake/interactive.pm_.c:1172
+#: ../../diskdrake/interactive.pm_.c:1108
+#: ../../diskdrake/interactive.pm_.c:1116
+#: ../../diskdrake/interactive.pm_.c:1181
 msgid "Type: "
 msgstr "Kiểu:"
 
-#: ../../diskdrake/interactive.pm_.c:1103
+#: ../../diskdrake/interactive.pm_.c:1112
 msgid "Name: "
 msgstr "Tên:"
 
-#: ../../diskdrake/interactive.pm_.c:1111
+#: ../../diskdrake/interactive.pm_.c:1120
 #, c-format
 msgid "Start: sector %s\n"
 msgstr "Bắt đầu: sector %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1112
+#: ../../diskdrake/interactive.pm_.c:1121
 #, c-format
 msgid "Size: %s"
 msgstr "Kích thước: %s"
 
-#: ../../diskdrake/interactive.pm_.c:1114
+#: ../../diskdrake/interactive.pm_.c:1123
 #, c-format
 msgid ", %s sectors"
 msgstr ", %s sector"
 
-#: ../../diskdrake/interactive.pm_.c:1116
+#: ../../diskdrake/interactive.pm_.c:1125
 #, c-format
 msgid "Cylinder %d to %d\n"
 msgstr "Cylinder %d đến %d\n"
 
-#: ../../diskdrake/interactive.pm_.c:1117
+#: ../../diskdrake/interactive.pm_.c:1126
 msgid "Formatted\n"
 msgstr "Đã format\n"
 
-#: ../../diskdrake/interactive.pm_.c:1118
+#: ../../diskdrake/interactive.pm_.c:1127
 msgid "Not formatted\n"
 msgstr "Chưa format\n"
 
-#: ../../diskdrake/interactive.pm_.c:1119
+#: ../../diskdrake/interactive.pm_.c:1128
 msgid "Mounted\n"
 msgstr "Đã được gắn kết\n"
 
-#: ../../diskdrake/interactive.pm_.c:1120
+#: ../../diskdrake/interactive.pm_.c:1129
 #, c-format
 msgid "RAID md%s\n"
 msgstr "RAID md%s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1122
+#: ../../diskdrake/interactive.pm_.c:1131
 #, c-format
 msgid ""
 "Loopback file(s):\n"
@@ -2182,7 +2178,7 @@ msgstr ""
 "Tập tin Loopback:\n"
 "    %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1123
+#: ../../diskdrake/interactive.pm_.c:1132
 msgid ""
 "Partition booted by default\n"
 "    (for MS-DOS boot, not for lilo)\n"
@@ -2190,27 +2186,27 @@ msgstr ""
 "Phân vùng được khởi động mặc định\n"
 "    (cho MS-DOS khởi động, không cho lilo)\n"
 
-#: ../../diskdrake/interactive.pm_.c:1125
+#: ../../diskdrake/interactive.pm_.c:1134
 #, c-format
 msgid "Level %s\n"
 msgstr "Mức %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1126
+#: ../../diskdrake/interactive.pm_.c:1135
 #, c-format
 msgid "Chunk size %s\n"
 msgstr "Kích thước bó %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1127
+#: ../../diskdrake/interactive.pm_.c:1136
 #, c-format
 msgid "RAID-disks %s\n"
 msgstr "Đĩa RAID %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1129
+#: ../../diskdrake/interactive.pm_.c:1138
 #, c-format
 msgid "Loopback file name: %s"
 msgstr "Tên tập tin Loopback: %s"
 
-#: ../../diskdrake/interactive.pm_.c:1132
+#: ../../diskdrake/interactive.pm_.c:1141
 msgid ""
 "\n"
 "Chances are, this partition is\n"
@@ -2222,7 +2218,7 @@ msgstr ""
 "một phân vùng của đĩa, có lẽ bạn nên\n"
 "để nó riêng ra.\n"
 
-#: ../../diskdrake/interactive.pm_.c:1135
+#: ../../diskdrake/interactive.pm_.c:1144
 msgid ""
 "\n"
 "This special Bootstrap\n"
@@ -2234,61 +2230,61 @@ msgstr ""
 "đặc biệt để\n"
 "khởi động kép hệ thống của bạn.\n"
 
-#: ../../diskdrake/interactive.pm_.c:1154
+#: ../../diskdrake/interactive.pm_.c:1163
 msgid "Read-only"
 msgstr "Chỉ Đọc"
 
-#: ../../diskdrake/interactive.pm_.c:1155
+#: ../../diskdrake/interactive.pm_.c:1164
 #, c-format
 msgid "Size: %s\n"
 msgstr "Kích thước: %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1156
+#: ../../diskdrake/interactive.pm_.c:1165
 #, c-format
 msgid "Geometry: %s cylinders, %s heads, %s sectors\n"
 msgstr "Geometry: %s cylinders, %s heads, %s sectors\n"
 
-#: ../../diskdrake/interactive.pm_.c:1157
+#: ../../diskdrake/interactive.pm_.c:1166
 msgid "Info: "
 msgstr "Thông tin: "
 
-#: ../../diskdrake/interactive.pm_.c:1158
+#: ../../diskdrake/interactive.pm_.c:1167
 #, c-format
 msgid "LVM-disks %s\n"
 msgstr "Các đĩa LVM %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1159
+#: ../../diskdrake/interactive.pm_.c:1168
 #, c-format
 msgid "Partition table type: %s\n"
 msgstr "Kiểu bảng phân vùng: %s\n"
 
-#: ../../diskdrake/interactive.pm_.c:1160
+#: ../../diskdrake/interactive.pm_.c:1169
 #, c-format
 msgid "on channel %d id %d\n"
 msgstr "trên channel %d id %d\n"
 
-#: ../../diskdrake/interactive.pm_.c:1190
+#: ../../diskdrake/interactive.pm_.c:1199
 msgid "Filesystem encryption key"
 msgstr "Khóa mã hóa hệ thống tập tin"
 
-#: ../../diskdrake/interactive.pm_.c:1191
+#: ../../diskdrake/interactive.pm_.c:1200
 msgid "Choose your filesystem encryption key"
 msgstr "Chọn khóa mã hóa hệ thống tập tin"
 
-#: ../../diskdrake/interactive.pm_.c:1194
+#: ../../diskdrake/interactive.pm_.c:1203
 #, c-format
 msgid "This encryption key is too simple (must be at least %d characters long)"
 msgstr "Khóa mã hóa này đơn giản quá ( phải có độ dài ít nhất %d ký tự)"
 
-#: ../../diskdrake/interactive.pm_.c:1195
+#: ../../diskdrake/interactive.pm_.c:1204
 msgid "The encryption keys do not match"
 msgstr "Các khóa mã hóa không khớp nhau"
 
-#: ../../diskdrake/interactive.pm_.c:1198
+#: ../../diskdrake/interactive.pm_.c:1207
 msgid "Encryption key"
 msgstr "Khóa mã hóa"
 
-#: ../../diskdrake/interactive.pm_.c:1199
+#: ../../diskdrake/interactive.pm_.c:1208
 msgid "Encryption key (again)"
 msgstr "Khóa mã hoá (nhập lại)"
 
@@ -2296,10 +2292,6 @@ msgstr "Khóa mã hoá (nhập lại)"
 msgid "Change type"
 msgstr "Thay đổi kiểu"
 
-#: ../../diskdrake/removable_gtk.pm_.c:28
-msgid "Please click on a medium"
-msgstr "Hãy nhấn chuột lên một phương tiện"
-
 #: ../../diskdrake/smbnfs_gtk.pm_.c:162
 #, c-format
 msgid "Can't login using username %s (bad password?)"
@@ -2322,7 +2314,7 @@ msgid ""
 "Please enter your username, password and domain name to access this host."
 msgstr "Hãy nhập tên người dùng, mật khẩu và tên miền để truy cập máy chủ này."
 
-#: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3529
+#: ../../diskdrake/smbnfs_gtk.pm_.c:178 ../../standalone/drakbackup_.c:3477
 msgid "Username"
 msgstr "Tên người dùng"
 
@@ -2334,23 +2326,23 @@ msgstr "Miền"
 msgid "Search servers"
 msgstr "Tìm các máy chủ"
 
-#: ../../fs.pm_.c:545 ../../fs.pm_.c:555 ../../fs.pm_.c:559 ../../fs.pm_.c:563
-#: ../../fs.pm_.c:567 ../../fs.pm_.c:571
+#: ../../fs.pm_.c:547 ../../fs.pm_.c:557 ../../fs.pm_.c:561 ../../fs.pm_.c:565
+#: ../../fs.pm_.c:569 ../../fs.pm_.c:573
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "định dạng %s của %s không được"
 
-#: ../../fs.pm_.c:608
+#: ../../fs.pm_.c:610
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Không biết cách format %s theo kiểu %s"
 
-#: ../../fs.pm_.c:682 ../../fs.pm_.c:725
+#: ../../fs.pm_.c:684 ../../fs.pm_.c:727
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "Không gắn kết được phân vùng %s vào thư mục %s"
 
-#: ../../fs.pm_.c:740 ../../partition_table.pm_.c:598
+#: ../../fs.pm_.c:742 ../../partition_table.pm_.c:599
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "Lỗi khi đang thôi gắn kết %s: %s"
@@ -2436,11 +2428,15 @@ msgstr "Không có gì để làm"
 msgid "Error opening %s for writing: %s"
 msgstr "Lỗi khi mở %s để ghi: %s"
 
-#: ../../harddrake/sound.pm_.c:168
+#: ../../harddrake/data.pm_.c:71
+msgid "cpu /* "
+msgstr "cpu /* "
+
+#: ../../harddrake/sound.pm_.c:170
 msgid "No alternative driver"
 msgstr "Không có driver thay thế"
 
-#: ../../harddrake/sound.pm_.c:169
+#: ../../harddrake/sound.pm_.c:171
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
@@ -2449,11 +2445,11 @@ msgstr ""
 "Không có driver của OSS/ALSA để thay thế cho card âm thanh của bạn (%s) hiện "
 "thời đang dùng là \"%s\""
 
-#: ../../harddrake/sound.pm_.c:171
+#: ../../harddrake/sound.pm_.c:173
 msgid "Sound configuration"
 msgstr "Cấu hình âm thanh"
 
-#: ../../harddrake/sound.pm_.c:172
+#: ../../harddrake/sound.pm_.c:174
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
@@ -2462,7 +2458,7 @@ msgstr ""
 "Tại đây, bạn có thể chọn một driver thay thế (OSS hay ALSA) cho card âm "
 "thanh của bạn (%s)"
 
-#: ../../harddrake/sound.pm_.c:174
+#: ../../harddrake/sound.pm_.c:176
 #, c-format
 msgid ""
 "\n"
@@ -2475,25 +2471,25 @@ msgstr ""
 "Card hiện thời sử dụng %s\"%s\" driver (driver mặc định cho card của bạn là "
 "\"%s\")"
 
-#: ../../harddrake/sound.pm_.c:176
+#: ../../harddrake/sound.pm_.c:178
 msgid "Driver:"
 msgstr "Driver:"
 
-#: ../../harddrake/sound.pm_.c:181 ../../standalone/drakTermServ_.c:246
-#: ../../standalone/drakbackup_.c:3932 ../../standalone/drakbackup_.c:3965
-#: ../../standalone/drakbackup_.c:3991 ../../standalone/drakbackup_.c:4018
-#: ../../standalone/drakbackup_.c:4045 ../../standalone/drakbackup_.c:4084
-#: ../../standalone/drakbackup_.c:4105 ../../standalone/drakbackup_.c:4132
-#: ../../standalone/drakbackup_.c:4162 ../../standalone/drakbackup_.c:4188
-#: ../../standalone/drakbackup_.c:4213 ../../standalone/drakfont_.c:700
+#: ../../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 "Giúp"
 
-#: ../../harddrake/sound.pm_.c:183
+#: ../../harddrake/sound.pm_.c:185
 msgid "Switching between ALSA and OSS help"
 msgstr "Chuyển đổi qua lại giữa trợ giúp OSS và ALSA"
 
-#: ../../harddrake/sound.pm_.c:184
+#: ../../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 "
@@ -2527,7 +2523,7 @@ msgstr ""
 "- ALSA api mới cung cấp nhiều tính năng tăng cường nhưng đòi hỏi việc sử "
 "dụng thư viện của ALSA.\n"
 
-#: ../../harddrake/sound.pm_.c:200
+#: ../../harddrake/sound.pm_.c:202
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -2542,29 +2538,30 @@ msgstr ""
 "\n"
 "Driver mới \"%s\" sẽ chỉ được dùng trên bẫy khởi động tới."
 
-#: ../../harddrake/sound.pm_.c:203 ../../standalone/drakconnect_.c:301
+#: ../../harddrake/sound.pm_.c:205 ../../standalone/drakconnect_.c:298
 msgid "Please Wait... Applying the configuration"
 msgstr "Hãy chờ...đang áp dụng cấu hình"
 
-#: ../../harddrake/sound.pm_.c:203 ../../harddrake/ui.pm_.c:111
-#: ../../interactive.pm_.c:391
+#: ../../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 "Hãy đợi"
 
-#: ../../harddrake/sound.pm_.c:208
+#: ../../harddrake/sound.pm_.c:210
 msgid "No known driver"
 msgstr "Không xác định được driver nào"
 
-#: ../../harddrake/sound.pm_.c:209
+#: ../../harddrake/sound.pm_.c:211
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
 msgstr "Không có driver nào cho card âm thanh của bạn (%s)"
 
-#: ../../harddrake/sound.pm_.c:212
+#: ../../harddrake/sound.pm_.c:214
 msgid "Unkown driver"
 msgstr "Driver không xác định"
 
-#: ../../harddrake/sound.pm_.c:213
+#: ../../harddrake/sound.pm_.c:215
 #, c-format
 msgid ""
 "The \"%s\" driver for your sound card is unlisted\n"
@@ -2579,215 +2576,11 @@ msgstr ""
 "<install at mandrakesoft dot com>\n"
 "với chủ đề của thư: unlisted sound driver \"%s\""
 
-#: ../../harddrake/ui.pm_.c:16
-msgid "Model"
-msgstr "Model"
-
-#: ../../harddrake/ui.pm_.c:16
-msgid "hard disk model"
-msgstr "Model đĩa cứng "
-
-#: ../../harddrake/ui.pm_.c:17
-msgid "Channel"
-msgstr "Kênh"
-
-#: ../../harddrake/ui.pm_.c:17
-msgid "EIDE/SCSI channel"
-msgstr "Kênh EIDE/SCSI"
-
-#: ../../harddrake/ui.pm_.c:19
-msgid "Bus"
-msgstr "Bus"
-
-#: ../../harddrake/ui.pm_.c:20
-msgid ""
-"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
-msgstr ""
-"Đây là bus vật lý mà các thiết bị được cắm (nối) vào (VD: PCI, USB,...)"
-
-#: ../../harddrake/ui.pm_.c:21
-msgid "Module"
-msgstr "Module"
-
-#: ../../harddrake/ui.pm_.c:21
-msgid "the module of the GNU/Linux kernel that handle that device"
-msgstr "Module của GNU/Linux kernel quản lý thiết bị đó"
-
-#: ../../harddrake/ui.pm_.c:22
-msgid "Media class"
-msgstr "Loại Phương tiện"
-
-#: ../../harddrake/ui.pm_.c:22
-msgid "class of hardware device"
-msgstr "loại của thiết bị phần cứng"
-
-#: ../../harddrake/ui.pm_.c:23 ../../printerdrake.pm_.c:1562
-msgid "Description"
-msgstr "Mô tả"
-
-#: ../../harddrake/ui.pm_.c:23
-msgid "this field describe the device"
-msgstr "Trường này mô tả thiết bị"
-
-#: ../../harddrake/ui.pm_.c:25
-msgid "Bus identification"
-msgstr "Xác nhận Bus"
-
-#: ../../harddrake/ui.pm_.c:26
-msgid ""
-"- PCI and USB devices: this list the vendor, device, subvendor and subdevice "
-"PCI/USB ids"
-msgstr ""
-"- Thiết bị PCI và USB: liệt kê nhà sản xuất, thiết bị, chi nhánh sản xuất và "
-"ID PCI/USB của linh kiện"
-
-#: ../../harddrake/ui.pm_.c:28
-msgid "Location on the bus"
-msgstr "Vị trí trên Bus"
-
-#: ../../harddrake/ui.pm_.c:29
-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"
-msgstr ""
-"- Thiết bị PCI: cung cấp khe cắm PCI, thiết bị và chức năng cho card này\n"
-"- Thiết bị EIDE: là thiết bị phụ (slave) hay chính (master)\n"
-"- Thiết bị SCSI: bus SCSI và các ID của thiết bị SCSI"
-
-#: ../../harddrake/ui.pm_.c:32
-msgid "Old device file"
-msgstr "Tập tin thiết bị cũ"
-
-#: ../../harddrake/ui.pm_.c:33
-msgid "old static device name used in dev package"
-msgstr "Tên thiết bị tĩnh cũ được dùng trong gói tin dev"
-
-#: ../../harddrake/ui.pm_.c:34
-msgid "New devfs device"
-msgstr "Thiết bị DEVFS mới"
-
-#: ../../harddrake/ui.pm_.c:35
-msgid "new dinamic device name generated by incore kernel devfs"
-msgstr "tên thiết bị động mới được tạo bởi DEVFS của lõi kernel"
-
-#: ../../harddrake/ui.pm_.c:36
-msgid "Number of buttons"
-msgstr "Số lượng nút"
-
-#: ../../harddrake/ui.pm_.c:37
-msgid "the vendor name of the device"
-msgstr "tên nhà sản xuất thiết bị"
-
-#: ../../harddrake/ui.pm_.c:38
-msgid "Alternative drivers"
-msgstr "Các driver thay thế"
-
-#: ../../harddrake/ui.pm_.c:39
-msgid "the list of alternative drivers for this sound card"
-msgstr "Danh sách các driver thay thế cho card âm thanh này"
-
-#: ../../harddrake/ui.pm_.c:63
-msgid "/_Quit"
-msgstr "/Th_oát"
-
-#: ../../harddrake/ui.pm_.c:64 ../../harddrake/ui.pm_.c:65
-#: ../../harddrake/ui.pm_.c:71 ../../harddrake/ui.pm_.c:73
-#: ../../standalone/logdrake_.c:111
-msgid "/_Help"
-msgstr "/Trợ _giúp"
-
-#: ../../harddrake/ui.pm_.c:65
-msgid "/_Help..."
-msgstr "/Trợ _giúp..."
-
-#: ../../harddrake/ui.pm_.c:66
-msgid "Harddrake help"
-msgstr "Trợ Giúp Mandrake"
-
-#: ../../harddrake/ui.pm_.c:67
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"Mô tả về các trường:\n"
-"\n"
-
-#: ../../harddrake/ui.pm_.c:71
-msgid "/_Report Bug"
-msgstr "/_Báo cáo lỗi"
-
-#: ../../harddrake/ui.pm_.c:73
-msgid "/_About..."
-msgstr "/Nói _Về..."
-
-#: ../../harddrake/ui.pm_.c:74
-msgid "About Harddrake"
-msgstr "Nói về Harddrake"
-
-#: ../../harddrake/ui.pm_.c:75
-msgid ""
-"This is HardDrake, a Mandrake hardware configuration tool.\n"
-"Version:"
-msgstr ""
-"Đây là HardDrake, công cụ cấu hình phần cứng của Mandrake.\n"
-"Phiên bản:"
-
-#: ../../harddrake/ui.pm_.c:76
-msgid "Author:"
-msgstr "Tác giả:"
-
-#: ../../harddrake/ui.pm_.c:86
-msgid "Harddrake2 version "
-msgstr "Phiên bản Harddrake2"
-
-#: ../../harddrake/ui.pm_.c:101
-msgid "Detected hardware"
-msgstr "Phần cứng được phát hiện"
-
-#: ../../harddrake/ui.pm_.c:103
-msgid "Information"
-msgstr "Thông tin"
-
-#: ../../harddrake/ui.pm_.c:106
-msgid "Configure module"
-msgstr "Cấu hình module"
-
-#: ../../harddrake/ui.pm_.c:107
-msgid "Run config tool"
-msgstr "Chạy công cụ cấu hình"
-
-#: ../../harddrake/ui.pm_.c:111
-msgid "Detection in progress"
-msgstr "Đang dò tìm"
-
-#: ../../harddrake/ui.pm_.c:148
-msgid "You can configure each parameter of the module here."
-msgstr "Có thể cấu hình từng tham số của module tại đây."
-
-#: ../../harddrake/ui.pm_.c:166
-#, c-format
-msgid "Running \"%s\" ..."
-msgstr "Đang chạy \"%s\" ..."
-
-#: ../../harddrake/ui.pm_.c:180
-#, c-format
-msgid "Probing %s class\n"
-msgstr "Đang thăm dò %s class\n"
-
-#: ../../harddrake/ui.pm_.c:201
-msgid "primary"
-msgstr "chính"
-
-#: ../../harddrake/ui.pm_.c:201
-msgid "secondary"
-msgstr "phụ"
-
 #: ../../harddrake/v4l.pm_.c:14 ../../harddrake/v4l.pm_.c:64
 msgid "Auto-detect"
 msgstr "Dò tìm Tự động"
 
-#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:185
+#: ../../harddrake/v4l.pm_.c:65 ../../harddrake/v4l.pm_.c:198
 msgid "Unknown|Generic"
 msgstr "Không xác định|Chuẩn chung"
 
@@ -2799,7 +2592,7 @@ msgstr "Không xác định|CPH05X (bt878) [nhiều nhà SX]"
 msgid "Unknown|CPH06X (bt878) [many vendors]"
 msgstr "Không xác định|CPH06X (bt878) [nhiều nhà SX]"
 
-#: ../../harddrake/v4l.pm_.c:209
+#: ../../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"
@@ -2811,31 +2604,31 @@ msgstr ""
 "Nếu như card của bạn không dò ra được, bạn có thể bắt dùng đúng loại card và "
 "chỉnh sóng tại đây. Chỉ việc chọn các thông số của card khi cần."
 
-#: ../../harddrake/v4l.pm_.c:212
+#: ../../harddrake/v4l.pm_.c:227
 msgid "Card model:"
 msgstr "Card loại: "
 
-#: ../../harddrake/v4l.pm_.c:213
+#: ../../harddrake/v4l.pm_.c:228
 msgid "Tuner type:"
 msgstr "Chỉnh sóng loại :"
 
-#: ../../harddrake/v4l.pm_.c:214
+#: ../../harddrake/v4l.pm_.c:229
 msgid "Number of capture buffers:"
 msgstr "Số của capture buffers :"
 
-#: ../../harddrake/v4l.pm_.c:214
+#: ../../harddrake/v4l.pm_.c:229
 msgid "number of capture buffers for mmap'ed capture"
 msgstr "số các capture buffer cho mmap'ed capture"
 
-#: ../../harddrake/v4l.pm_.c:216
+#: ../../harddrake/v4l.pm_.c:231
 msgid "PLL setting:"
 msgstr "Thiết lập PLL :"
 
-#: ../../harddrake/v4l.pm_.c:217
+#: ../../harddrake/v4l.pm_.c:232
 msgid "Radio support:"
 msgstr "Hỗ trợ Radio:"
 
-#: ../../harddrake/v4l.pm_.c:217
+#: ../../harddrake/v4l.pm_.c:232
 msgid "enable radio support"
 msgstr "bật hỗ trợ radio"
 
@@ -4589,10 +4382,10 @@ msgid ""
 "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. No modification possible at installation time;\n"
+"displayed here.\n"
 "\n"
 " * \"TV card\": if a TV card is detected on your system, it will be\n"
-"displayed here. No modification possible at installation time;\n"
+"displayed here.\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"
@@ -4617,10 +4410,9 @@ msgstr ""
 "máy in.\n"
 "\n"
 " * \"Card âm thanh\": nếu card âm thanh được phát hiện, nó sẽ đhiển thị\n"
-"tại đây. Không có khả năng thay đổi trong lúc cài đặt.\n"
+"tại đây.\n"
 "\n"
 " * \"Card TV\": nếu card TV được phát hiện, nó sẽ hiển thị tại đây.\n"
-"Không có khả năng thay đổi trong lúc cài đặt.\n"
 "\n"
 " * \"Card ISDN\": nếu một card ISDN được phát hiện, nó sẽ hiển thị\n"
 "tại đây. Có thể nhấn lên nút để thay đổi các thông số liên quan đến\n"
@@ -4714,16 +4506,16 @@ msgstr ""
 msgid "Can't use broadcast with no NIS domain"
 msgstr "Không thể dùng phát thanh khi không có tên vùng NIS"
 
-#: ../../install_any.pm_.c:870
+#: ../../install_any.pm_.c:879
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
 msgstr "Nạp một đĩa mềm đã format vào ổ %s"
 
-#: ../../install_any.pm_.c:874
+#: ../../install_any.pm_.c:883
 msgid "This floppy is not FAT formatted"
 msgstr "Đĩa mềm này không phải định dạng FAT "
 
-#: ../../install_any.pm_.c:886
+#: ../../install_any.pm_.c:895
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
 "defcfg=floppy''"
@@ -4731,12 +4523,12 @@ msgstr ""
 "Để sử dụng các gói cứu chữa đã được lưu, khởi động cài đặt bằng ``linux "
 "defcfg=floppy''"
 
-#: ../../install_any.pm_.c:909 ../../partition_table.pm_.c:767
+#: ../../install_any.pm_.c:918 ../../partition_table.pm_.c:767
 #, c-format
 msgid "Error reading file %s"
 msgstr "Lỗi khi đọc tập tin %s"
 
-#: ../../install_any.pm_.c:1031
+#: ../../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"
@@ -4744,7 +4536,7 @@ msgstr ""
 "Bị lỗi - không tìm thấy thiết bị hợp lệ để tạo hệ thống tập tin mới. Hãy "
 "kiểm tra phần cứng để tìm nguyên nhân gây ra lỗi"
 
-#: ../../install_interactive.pm_.c:23
+#: ../../install_interactive.pm_.c:21
 #, c-format
 msgid ""
 "Some hardware on your computer needs ``proprietary'' drivers to work.\n"
@@ -4753,7 +4545,7 @@ msgstr ""
 "Một số phần cứng của máy tính cần các driver ``proprietary'' để hoạt động.\n"
 "Bạn có thể tìm thông tin về chúng tại: %s"
 
-#: ../../install_interactive.pm_.c:58
+#: ../../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"
@@ -4764,11 +4556,11 @@ msgstr ""
 "có).\n"
 "Sau đó chọn ``Điểm gắn kết'' và gắn nó vào `/'"
 
-#: ../../install_interactive.pm_.c:63
+#: ../../install_interactive.pm_.c:61
 msgid "You must have a swap partition"
 msgstr "Bạn phải có một phân vùng trao đổi (swap)"
 
-#: ../../install_interactive.pm_.c:64
+#: ../../install_interactive.pm_.c:62
 msgid ""
 "You don't have a swap partition.\n"
 "\n"
@@ -4778,59 +4570,59 @@ msgstr ""
 "\n"
 "Vẫn tiếp tục?"
 
-#: ../../install_interactive.pm_.c:67 ../../install_steps.pm_.c:169
+#: ../../install_interactive.pm_.c:65 ../../install_steps.pm_.c:169
 msgid "You must have a FAT partition mounted in /boot/efi"
 msgstr "Bạn phải có một phân vùng FAT được kết gán vào /boot/efi"
 
-#: ../../install_interactive.pm_.c:92
+#: ../../install_interactive.pm_.c:90
 msgid "Use free space"
 msgstr "Dùng không gian trống"
 
-#: ../../install_interactive.pm_.c:94
+#: ../../install_interactive.pm_.c:92
 msgid "Not enough free space to allocate new partitions"
 msgstr "Không đủ không gian trống để tạo các phân vùng mới"
 
-#: ../../install_interactive.pm_.c:102
+#: ../../install_interactive.pm_.c:100
 msgid "Use existing partitions"
 msgstr "Dùng phân vùng hiện thời"
 
-#: ../../install_interactive.pm_.c:104
+#: ../../install_interactive.pm_.c:102
 msgid "There is no existing partition to use"
 msgstr "Không có phân vùng hiện thời để dùng"
 
-#: ../../install_interactive.pm_.c:111
+#: ../../install_interactive.pm_.c:109
 msgid "Use the Windows partition for loopback"
 msgstr "Dùng phân vùng Windows để loopback"
 
-#: ../../install_interactive.pm_.c:114
+#: ../../install_interactive.pm_.c:112
 msgid "Which partition do you want to use for Linux4Win?"
 msgstr "Phân vùng nào bạn muốn sử dụng cho Linux4Win?"
 
-#: ../../install_interactive.pm_.c:116
+#: ../../install_interactive.pm_.c:114
 msgid "Choose the sizes"
 msgstr "Chọn kích thước"
 
-#: ../../install_interactive.pm_.c:117
+#: ../../install_interactive.pm_.c:115
 msgid "Root partition size in MB: "
 msgstr "Kích thước phân vùng root theo MB: "
 
-#: ../../install_interactive.pm_.c:118
+#: ../../install_interactive.pm_.c:116
 msgid "Swap partition size in MB: "
 msgstr "Kích thước phân vùng swap theo MB: "
 
-#: ../../install_interactive.pm_.c:128
+#: ../../install_interactive.pm_.c:126
 msgid "Use the free space on the Windows partition"
 msgstr "Dùng không gian trống của phân vùng Windows"
 
-#: ../../install_interactive.pm_.c:131
+#: ../../install_interactive.pm_.c:129
 msgid "Which partition do you want to resize?"
 msgstr "Bạn muốn lập lại kích thước phân vùng nào?"
 
-#: ../../install_interactive.pm_.c:133
+#: ../../install_interactive.pm_.c:131
 msgid "Resizing Windows partition"
 msgstr "Đang tính toán phạm vi hệ thống tập tin của Windows"
 
-#: ../../install_interactive.pm_.c:136
+#: ../../install_interactive.pm_.c:134
 #, c-format
 msgid ""
 "The FAT resizer is unable to handle your partition, \n"
@@ -4839,14 +4631,14 @@ msgstr ""
 "Sự lập lại kích thước FAT không thể quản lý phân vùng của bạn, \n"
 "xảy ra lỗi như sau: %s"
 
-#: ../../install_interactive.pm_.c:139
+#: ../../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 "Phân vùng Windows bị phân mảnh nhiều, hãy chạy ``defrag'' trước"
 
-#: ../../install_interactive.pm_.c:140
+#: ../../install_interactive.pm_.c:138
 msgid ""
 "WARNING!\n"
 "\n"
@@ -4867,21 +4659,21 @@ msgstr ""
 "Bạn cũng nên sao lưu dữ liệu.\n"
 "Khi thực hiện xong, nhấn OK."
 
-#: ../../install_interactive.pm_.c:150
+#: ../../install_interactive.pm_.c:148
 msgid "Which size do you want to keep for Windows on"
 msgstr "Bạn muốn giữ kích thước nào cho Windows"
 
-#: ../../install_interactive.pm_.c:151
+#: ../../install_interactive.pm_.c:149
 #, c-format
 msgid "partition %s"
 msgstr "Phân vùng %s"
 
-#: ../../install_interactive.pm_.c:158
+#: ../../install_interactive.pm_.c:156
 #, c-format
 msgid "FAT resizing failed: %s"
 msgstr "Không thiết lập lại được kích thước FAT: %s"
 
-#: ../../install_interactive.pm_.c:173
+#: ../../install_interactive.pm_.c:171
 msgid ""
 "There is no FAT partition to resize or to use as loopback (or not enough "
 "space left)"
@@ -4889,32 +4681,32 @@ msgstr ""
 "Không có phân vùng FAT nào để thiết lập lại kích thước hoặc để loopback "
 "(hoặc không đủ không gian trống)."
 
-#: ../../install_interactive.pm_.c:179
+#: ../../install_interactive.pm_.c:177
 msgid "Erase entire disk"
 msgstr "Xoá toàn bộ đĩa"
 
-#: ../../install_interactive.pm_.c:179
+#: ../../install_interactive.pm_.c:177
 msgid "Remove Windows(TM)"
 msgstr "Xoá Windows(TM)"
 
-#: ../../install_interactive.pm_.c:182
+#: ../../install_interactive.pm_.c:180
 msgid "You have more than one hard drive, which one do you install linux on?"
 msgstr "Bạn có hơn một đĩa cứng, bạn cài đặt Linux lên đĩa nào?"
 
-#: ../../install_interactive.pm_.c:185
+#: ../../install_interactive.pm_.c:183
 #, c-format
 msgid "ALL existing partitions and their data will be lost on drive %s"
 msgstr "Toàn bộ các phân vùng và dữ liệu hiện có sẽ bị xóa khỏi ổ đĩa %s"
 
-#: ../../install_interactive.pm_.c:193
+#: ../../install_interactive.pm_.c:191
 msgid "Custom disk partitioning"
 msgstr "Tùy chỉnh phân vùng đĩa "
 
-#: ../../install_interactive.pm_.c:197
+#: ../../install_interactive.pm_.c:195
 msgid "Use fdisk"
 msgstr "Dùng fdisk"
 
-#: ../../install_interactive.pm_.c:200
+#: ../../install_interactive.pm_.c:198
 #, c-format
 msgid ""
 "You can now partition %s.\n"
@@ -4923,28 +4715,28 @@ msgstr ""
 "Bây giờ bạn có thể phân vùng %s.\n"
 "Khi hoàn thành, đừng quên lưu lại bằng `w'"
 
-#: ../../install_interactive.pm_.c:229
+#: ../../install_interactive.pm_.c:227
 msgid "You don't have enough free space on your Windows partition"
 msgstr "Bạn không có đủ không gian trống trên phân vùng Windows"
 
-#: ../../install_interactive.pm_.c:245
+#: ../../install_interactive.pm_.c:243
 msgid "I can't find any room for installing"
 msgstr "Không tìm được nơi cài đặt"
 
-#: ../../install_interactive.pm_.c:248
+#: ../../install_interactive.pm_.c:246
 msgid "The DrakX Partitioning wizard found the following solutions:"
 msgstr "Đồ thuật phân vùng của DrakX tìm ra các giải pháp như sau:"
 
-#: ../../install_interactive.pm_.c:252
+#: ../../install_interactive.pm_.c:250
 #, c-format
 msgid "Partitioning failed: %s"
 msgstr "Quá trình phân vùng hỏng: %s"
 
-#: ../../install_interactive.pm_.c:262
+#: ../../install_interactive.pm_.c:260
 msgid "Bringing up the network"
 msgstr "Bật chức năng mạng"
 
-#: ../../install_interactive.pm_.c:267
+#: ../../install_interactive.pm_.c:265
 msgid "Bringing down the network"
 msgstr "Tắt chức năng mạng"
 
@@ -4972,12 +4764,12 @@ msgstr ""
 "Có thể do ổ đĩa cdrom hoặc đĩa cdrom của bạn bị lỗi.\n"
 "Kiểm tra cdrom trên máy tính bằng \"rpm -qpl Mandrake/RPMS/*.rpm\"\n"
 
-#: ../../install_steps.pm_.c:452
+#: ../../install_steps.pm_.c:450
 #, c-format
 msgid "Welcome to %s"
 msgstr "Chào mừng %s"
 
-#: ../../install_steps.pm_.c:542 ../../install_steps.pm_.c:781
+#: ../../install_steps.pm_.c:543 ../../install_steps.pm_.c:769
 msgid "No floppy drive available"
 msgstr "Hiện không có ổ đĩa mềm"
 
@@ -4987,7 +4779,7 @@ msgstr "Hiện không có ổ đĩa mềm"
 msgid "Entering step `%s'\n"
 msgstr "Đi vào giai đoạn `%s'\n"
 
-#: ../../install_steps_gtk.pm_.c:150
+#: ../../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 "
@@ -5000,77 +4792,77 @@ msgstr ""
 "chế độ văn bản bằng cách nhấn phím `F1' khi khởi động từ CDROM, rồi nhập "
 "`text'."
 
-#: ../../install_steps_gtk.pm_.c:161 ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_gtk.pm_.c:157 ../../install_steps_interactive.pm_.c:237
 msgid "Install Class"
 msgstr "Kiểu cài đặt"
 
-#: ../../install_steps_gtk.pm_.c:164
+#: ../../install_steps_gtk.pm_.c:160
 msgid "Please choose one of the following classes of installation:"
 msgstr "Hãy chọn một trong các loại cài đặt sau đây:"
 
-#: ../../install_steps_gtk.pm_.c:237 ../../install_steps_interactive.pm_.c:676
+#: ../../install_steps_gtk.pm_.c:236 ../../install_steps_interactive.pm_.c:683
 msgid "Package Group Selection"
 msgstr "Nhóm gói tin được chọn"
 
-#: ../../install_steps_gtk.pm_.c:270 ../../install_steps_interactive.pm_.c:691
+#: ../../install_steps_gtk.pm_.c:269 ../../install_steps_interactive.pm_.c:698
 msgid "Individual package selection"
 msgstr "Các gói riêng được chọn"
 
-#: ../../install_steps_gtk.pm_.c:293 ../../install_steps_interactive.pm_.c:614
+#: ../../install_steps_gtk.pm_.c:292 ../../install_steps_interactive.pm_.c:621
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr "Kích thước toàn bộ: %d / %d MB"
 
-#: ../../install_steps_gtk.pm_.c:335
+#: ../../install_steps_gtk.pm_.c:334
 msgid "Bad package"
 msgstr "Gói hỏng"
 
-#: ../../install_steps_gtk.pm_.c:336
+#: ../../install_steps_gtk.pm_.c:335
 #, c-format
 msgid "Name: %s\n"
 msgstr "Tên: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:337
+#: ../../install_steps_gtk.pm_.c:336
 #, c-format
 msgid "Version: %s\n"
 msgstr "Phiên bản: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:338
+#: ../../install_steps_gtk.pm_.c:337
 #, c-format
 msgid "Size: %d KB\n"
 msgstr "Kích thước: %d KB\n"
 
-#: ../../install_steps_gtk.pm_.c:339
+#: ../../install_steps_gtk.pm_.c:338
 #, c-format
 msgid "Importance: %s\n"
 msgstr "Quan trọng: %s\n"
 
-#: ../../install_steps_gtk.pm_.c:361
+#: ../../install_steps_gtk.pm_.c:360
 msgid ""
 "You can't select this package as there is not enough space left to install it"
 msgstr "Bạn không thể chọn gói này vì không còn đủ không gian để cài đặt"
 
-#: ../../install_steps_gtk.pm_.c:366
+#: ../../install_steps_gtk.pm_.c:365
 msgid "The following packages are going to be installed"
 msgstr "Các gói sau đây sẽ được cài đặt"
 
-#: ../../install_steps_gtk.pm_.c:367
+#: ../../install_steps_gtk.pm_.c:366
 msgid "The following packages are going to be removed"
 msgstr "Các gói sau đây sẽ được bỏ ra"
 
-#: ../../install_steps_gtk.pm_.c:379
+#: ../../install_steps_gtk.pm_.c:378
 msgid "You can't select/unselect this package"
 msgstr "Bạn không thể chọn/bỏ chọn gói này"
 
-#: ../../install_steps_gtk.pm_.c:391
+#: ../../install_steps_gtk.pm_.c:390
 msgid "This is a mandatory package, it can't be unselected"
 msgstr "Gói này bắt buộc chọn, không thể bỏ chọn nó"
 
-#: ../../install_steps_gtk.pm_.c:393
+#: ../../install_steps_gtk.pm_.c:392
 msgid "You can't unselect this package. It is already installed"
 msgstr "Bạn không thể bỏ chọn gói này. Nó được cài đặt rồi"
 
-#: ../../install_steps_gtk.pm_.c:396
+#: ../../install_steps_gtk.pm_.c:395
 msgid ""
 "This package must be upgraded.\n"
 "Are you sure you want to deselect it?"
@@ -5078,74 +4870,74 @@ msgstr ""
 "Gói này phải được nâng cấp\n"
 "Bạn có chắn là muốn bỏ chọn nó không?"
 
-#: ../../install_steps_gtk.pm_.c:399
+#: ../../install_steps_gtk.pm_.c:398
 msgid "You can't unselect this package. It must be upgraded"
 msgstr "Bạn không thể không chọn gói này. Nó phải được nâng cấp."
 
-#: ../../install_steps_gtk.pm_.c:404
+#: ../../install_steps_gtk.pm_.c:403
 msgid "Show automatically selected packages"
 msgstr "Hiển thị các gói được chọn tự động"
 
-#: ../../install_steps_gtk.pm_.c:405 ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
-#: ../../standalone/drakbackup_.c:4259
+#: ../../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 "Cài đặt"
 
-#: ../../install_steps_gtk.pm_.c:408
+#: ../../install_steps_gtk.pm_.c:407
 msgid "Load/Save on floppy"
 msgstr "Tải/Lưu vào đĩa mềm"
 
-#: ../../install_steps_gtk.pm_.c:409
+#: ../../install_steps_gtk.pm_.c:408
 msgid "Updating package selection"
 msgstr "Đang cập nhật sự lựa chọn các gói"
 
-#: ../../install_steps_gtk.pm_.c:414
+#: ../../install_steps_gtk.pm_.c:413
 msgid "Minimal install"
 msgstr "Cài đặt tối thiểu"
 
-#: ../../install_steps_gtk.pm_.c:429 ../../install_steps_interactive.pm_.c:522
+#: ../../install_steps_gtk.pm_.c:428 ../../install_steps_interactive.pm_.c:529
 msgid "Choose the packages you want to install"
 msgstr "Chọn các gói bạn muốn cài đặt "
 
-#: ../../install_steps_gtk.pm_.c:445 ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_gtk.pm_.c:444 ../../install_steps_interactive.pm_.c:767
 msgid "Installing"
 msgstr "Đang cài đặt"
 
-#: ../../install_steps_gtk.pm_.c:451
+#: ../../install_steps_gtk.pm_.c:450
 msgid "Estimating"
 msgstr "Đang ước lượng"
 
-#: ../../install_steps_gtk.pm_.c:458
+#: ../../install_steps_gtk.pm_.c:457
 msgid "Time remaining "
 msgstr "Thời gian còn lại"
 
-#: ../../install_steps_gtk.pm_.c:470
+#: ../../install_steps_gtk.pm_.c:469
 msgid "Please wait, preparing installation..."
 msgstr "Hãy chờ, đang chuẩn bị cài đặt."
 
-#: ../../install_steps_gtk.pm_.c:554
+#: ../../install_steps_gtk.pm_.c:551
 #, c-format
 msgid "%d packages"
 msgstr "%d gói"
 
-#: ../../install_steps_gtk.pm_.c:559
+#: ../../install_steps_gtk.pm_.c:556
 #, c-format
 msgid "Installing package %s"
 msgstr "Đang cài đặt gói %s"
 
-#: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
-#: ../../install_steps_interactive.pm_.c:784
-#: ../../standalone/drakautoinst_.c:202
+#: ../../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 "Chấp thuận"
 
-#: ../../install_steps_gtk.pm_.c:596 ../../install_steps_interactive.pm_.c:189
-#: ../../install_steps_interactive.pm_.c:784
+#: ../../install_steps_gtk.pm_.c:593 ../../install_steps_interactive.pm_.c:195
+#: ../../install_steps_interactive.pm_.c:791
 msgid "Refuse"
 msgstr "Từ chối"
 
-#: ../../install_steps_gtk.pm_.c:597 ../../install_steps_interactive.pm_.c:785
+#: ../../install_steps_gtk.pm_.c:594 ../../install_steps_interactive.pm_.c:792
 #, c-format
 msgid ""
 "Change your Cd-Rom!\n"
@@ -5159,17 +4951,17 @@ msgstr ""
 "Hãy nạp đĩa CD có nhãn \"%s\" vào ổ đĩa rồi nhấn OK khi đã xong.\n"
 "Nếu bạn không có, nhấn Bỏ qua để không chạy cài đặt từ đĩa này."
 
-#: ../../install_steps_gtk.pm_.c:611 ../../install_steps_gtk.pm_.c:615
-#: ../../install_steps_interactive.pm_.c:797
-#: ../../install_steps_interactive.pm_.c:801
+#: ../../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 "Vẫn cứ tiếp tục?"
 
-#: ../../install_steps_gtk.pm_.c:611 ../../install_steps_interactive.pm_.c:797
+#: ../../install_steps_gtk.pm_.c:608 ../../install_steps_interactive.pm_.c:804
 msgid "There was an error ordering packages:"
 msgstr "Lỗi khi đang xử lý các gói:"
 
-#: ../../install_steps_gtk.pm_.c:615 ../../install_steps_interactive.pm_.c:801
+#: ../../install_steps_gtk.pm_.c:612 ../../install_steps_interactive.pm_.c:808
 msgid "There was an error installing packages:"
 msgstr "Lỗi khi đang cài đặt các gói:"
 
@@ -5451,108 +5243,108 @@ msgstr ""
 "Paris - France.\n"
 "For any question on this document, please contact MandrakeSoft S.A.  \n"
 
-#: ../../install_steps_interactive.pm_.c:191
+#: ../../install_steps_interactive.pm_.c:197
 msgid "Are you sure you refuse the licence?"
 msgstr "Bạn có chắc là muốn từ chối giấy phép?"
 
-#: ../../install_steps_interactive.pm_.c:211
-#: ../../install_steps_interactive.pm_.c:1021
-#: ../../standalone/keyboarddrake_.c:31
+#: ../../install_steps_interactive.pm_.c:217
+#: ../../install_steps_interactive.pm_.c:995
+#: ../../standalone/keyboarddrake_.c:25
 msgid "Keyboard"
 msgstr "Bàn phím"
 
-#: ../../install_steps_interactive.pm_.c:212
+#: ../../install_steps_interactive.pm_.c:218
 msgid "Please choose your keyboard layout."
 msgstr "Hãy chọn tổ chức bàn phím."
 
-#: ../../install_steps_interactive.pm_.c:213
+#: ../../install_steps_interactive.pm_.c:219
 msgid "Here is the full list of keyboards available"
 msgstr "Đây là danh sách đầy đủ các bàn phím hiện có "
 
-#: ../../install_steps_interactive.pm_.c:231
+#: ../../install_steps_interactive.pm_.c:237
 msgid "Which installation class do you want?"
 msgstr "Bạn muốn chọn kiểu cài đặt nào?"
 
-#: ../../install_steps_interactive.pm_.c:235
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Install/Update"
 msgstr "Cài đặt/Cập nhật"
 
-#: ../../install_steps_interactive.pm_.c:235
+#: ../../install_steps_interactive.pm_.c:241
 msgid "Is this an install or an update?"
 msgstr "Đây là cài đặt hay cập nhật?"
 
-#: ../../install_steps_interactive.pm_.c:244
+#: ../../install_steps_interactive.pm_.c:250
 msgid "Recommended"
 msgstr "Gợi ý"
 
-#: ../../install_steps_interactive.pm_.c:247
-#: ../../install_steps_interactive.pm_.c:250
+#: ../../install_steps_interactive.pm_.c:253
+#: ../../install_steps_interactive.pm_.c:256
 msgid "Expert"
 msgstr "Chuyên gia"
 
-#: ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
+#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:265
 msgid "Upgrade"
 msgstr "Nâng cấp"
 
-#: ../../install_steps_interactive.pm_.c:255
-#: ../../install_steps_interactive.pm_.c:259
+#: ../../install_steps_interactive.pm_.c:261
+#: ../../install_steps_interactive.pm_.c:265
 msgid "Upgrade packages only"
 msgstr "Chỉ nâng cấp các gói tin"
 
-#: ../../install_steps_interactive.pm_.c:275
+#: ../../install_steps_interactive.pm_.c:282
 msgid "Please choose the type of your mouse."
 msgstr "Hãy chọn loại chuột."
 
-#: ../../install_steps_interactive.pm_.c:281 ../../standalone/mousedrake_.c:60
+#: ../../install_steps_interactive.pm_.c:288 ../../standalone/mousedrake_.c:52
 msgid "Mouse Port"
 msgstr "Cổng chuột"
 
-#: ../../install_steps_interactive.pm_.c:282 ../../standalone/mousedrake_.c:61
+#: ../../install_steps_interactive.pm_.c:289 ../../standalone/mousedrake_.c:53
 msgid "Please choose on which serial port your mouse is connected to."
 msgstr "Hãy chọn cổng nối tiếp mà bạn gắn chuột vào."
 
-#: ../../install_steps_interactive.pm_.c:290
+#: ../../install_steps_interactive.pm_.c:297
 msgid "Buttons emulation"
 msgstr "Mô phỏng các nút"
 
-#: ../../install_steps_interactive.pm_.c:292
+#: ../../install_steps_interactive.pm_.c:299
 msgid "Button 2 Emulation"
 msgstr "Mô phỏng nút thứ 2"
 
-#: ../../install_steps_interactive.pm_.c:293
+#: ../../install_steps_interactive.pm_.c:300
 msgid "Button 3 Emulation"
 msgstr "Mô phỏng nút 3"
 
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:321
 msgid "Configuring PCMCIA cards..."
 msgstr "Đang cấu hình card PCMCIA..."
 
-#: ../../install_steps_interactive.pm_.c:314
+#: ../../install_steps_interactive.pm_.c:321
 msgid "PCMCIA"
 msgstr "PCMCIA"
 
-#: ../../install_steps_interactive.pm_.c:321
+#: ../../install_steps_interactive.pm_.c:328
 msgid "Configuring IDE"
 msgstr "Đang cấu hình IDE"
 
-#: ../../install_steps_interactive.pm_.c:321
+#: ../../install_steps_interactive.pm_.c:328
 msgid "IDE"
 msgstr "IDE"
 
-#: ../../install_steps_interactive.pm_.c:338
+#: ../../install_steps_interactive.pm_.c:345
 msgid "No partition available"
 msgstr "không có sẵn các phân vùng"
 
-#: ../../install_steps_interactive.pm_.c:341
+#: ../../install_steps_interactive.pm_.c:348
 msgid "Scanning partitions to find mount points"
 msgstr "Quét các phân vùng để tìm điểm gắn kết"
 
-#: ../../install_steps_interactive.pm_.c:349
+#: ../../install_steps_interactive.pm_.c:356
 msgid "Choose the mount points"
 msgstr "Chọn điểm gắn kết"
 
-#: ../../install_steps_interactive.pm_.c:379
+#: ../../install_steps_interactive.pm_.c:386
 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"
@@ -5560,40 +5352,40 @@ msgstr ""
 "Không còn không gian trống 1MB cho bẫy khởi động! Tiếp tục cài đặt, nhưng để "
 "khởi động hệ thống, bạn cần tạo phân vùng bẫy khởi động trong DiskDrake."
 
-#: ../../install_steps_interactive.pm_.c:388
+#: ../../install_steps_interactive.pm_.c:395
 msgid "No root partition found to perform an upgrade"
 msgstr "Không có phân vùng root để thực hiện nâng cấp"
 
-#: ../../install_steps_interactive.pm_.c:389
+#: ../../install_steps_interactive.pm_.c:396
 msgid "Root Partition"
 msgstr "Phân vùng root"
 
-#: ../../install_steps_interactive.pm_.c:390
+#: ../../install_steps_interactive.pm_.c:397
 msgid "What is the root partition (/) of your system?"
 msgstr "Đâu là phân vùng root (/) của hệ thống?"
 
-#: ../../install_steps_interactive.pm_.c:404
+#: ../../install_steps_interactive.pm_.c:411
 msgid "You need to reboot for the partition table modifications to take place"
 msgstr "Bạn cần khởi động lại để các thay đổi trong bảng phân vùng có tác dụng"
 
-#: ../../install_steps_interactive.pm_.c:428
+#: ../../install_steps_interactive.pm_.c:435
 msgid "Choose the partitions you want to format"
 msgstr "Hãy chọn các phân vùng bạn muốn format"
 
-#: ../../install_steps_interactive.pm_.c:429
+#: ../../install_steps_interactive.pm_.c:436
 msgid "Check bad blocks?"
 msgstr "Kiểm tra lỗi bề mặt đĩa?"
 
-#: ../../install_steps_interactive.pm_.c:456
+#: ../../install_steps_interactive.pm_.c:463
 msgid "Formatting partitions"
 msgstr "Đang format các phân vùng"
 
-#: ../../install_steps_interactive.pm_.c:458
+#: ../../install_steps_interactive.pm_.c:465
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Đang tạo và format tập tin %s"
 
-#: ../../install_steps_interactive.pm_.c:463
+#: ../../install_steps_interactive.pm_.c:470
 #, c-format
 msgid ""
 "Failed to check filesystem %s. Do you want to repair the errors? (beware, "
@@ -5602,27 +5394,27 @@ msgstr ""
 "Không kiểm tra được hệ thống tập tin %s. Có muốn sửa lỗi không? (lưu ý: bạn "
 "có thể bị mất dữ liệu)"
 
-#: ../../install_steps_interactive.pm_.c:465
+#: ../../install_steps_interactive.pm_.c:472
 msgid "Not enough swap space to fulfill installation, please add some"
 msgstr "Swap không đủ để thực hiện cài đặt, hãy tăng thêm"
 
-#: ../../install_steps_interactive.pm_.c:472
+#: ../../install_steps_interactive.pm_.c:479
 msgid "Looking for available packages and rebuilding rpm database..."
 msgstr "Đang tìm các gói hiện có và xây dựng lại cơ sở dữ liệu rpm..."
 
-#: ../../install_steps_interactive.pm_.c:473
+#: ../../install_steps_interactive.pm_.c:480
 msgid "Looking for available packages..."
 msgstr "Đang tìm các gói hiện có"
 
-#: ../../install_steps_interactive.pm_.c:476
+#: ../../install_steps_interactive.pm_.c:483
 msgid "Looking at packages already installed..."
 msgstr "Đang nhìn vào các gói đã được cài đặt..."
 
-#: ../../install_steps_interactive.pm_.c:480
+#: ../../install_steps_interactive.pm_.c:487
 msgid "Finding packages to upgrade..."
 msgstr "Đang tìm các gói để nâng cấp"
 
-#: ../../install_steps_interactive.pm_.c:498
+#: ../../install_steps_interactive.pm_.c:505
 #, c-format
 msgid ""
 "Your system does not have enough space left for installation or upgrade (%d "
@@ -5630,7 +5422,7 @@ msgid ""
 msgstr ""
 "Hệ thống không đủ không gian để thực hiện cài đặt hay nâng cấp (%d > %d)"
 
-#: ../../install_steps_interactive.pm_.c:534
+#: ../../install_steps_interactive.pm_.c:541
 msgid ""
 "Please choose load or save package selection on floppy.\n"
 "The format is the same as auto_install generated floppies."
@@ -5638,35 +5430,35 @@ msgstr ""
 "Hãy chọn tải hay lưu lựa chọn gói tin vào đĩa mềm.\n"
 "Định dạng giống như các đĩa mềm được tạo ra khi cài đặt tự động."
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:543
 msgid "Load from floppy"
 msgstr "Tải từ đĩa mềm"
 
-#: ../../install_steps_interactive.pm_.c:536
+#: ../../install_steps_interactive.pm_.c:543
 msgid "Save on floppy"
 msgstr "Lưu vào đĩa mềm"
 
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:547
 msgid "Loading from floppy"
 msgstr "Đang tải từ đĩa mềm"
 
-#: ../../install_steps_interactive.pm_.c:540
+#: ../../install_steps_interactive.pm_.c:547
 msgid "Package selection"
 msgstr "Sự lựa chọn gói tin"
 
-#: ../../install_steps_interactive.pm_.c:545
+#: ../../install_steps_interactive.pm_.c:552
 msgid "Insert a floppy containing package selection"
 msgstr "Nạp một đĩa mềm có chứa sự lựa chọn gói tin"
 
-#: ../../install_steps_interactive.pm_.c:627
+#: ../../install_steps_interactive.pm_.c:634
 msgid "Selected size is larger than available space"
 msgstr "Cỡ được chọn quá lớn so với không gian hiện có"
 
-#: ../../install_steps_interactive.pm_.c:642
+#: ../../install_steps_interactive.pm_.c:649
 msgid "Type of install"
 msgstr "Kiểu cài đặt"
 
-#: ../../install_steps_interactive.pm_.c:643
+#: ../../install_steps_interactive.pm_.c:650
 msgid ""
 "You haven't selected any group of packages.\n"
 "Please choose the minimal installation you want:"
@@ -5674,19 +5466,19 @@ msgstr ""
 "Bạn đã không chọn bất kỳ một nhóm gói tin nào\n"
 "Hãy chọn việc cài đặt tối thiểu mà bạn muốn"
 
-#: ../../install_steps_interactive.pm_.c:646
+#: ../../install_steps_interactive.pm_.c:653
 msgid "With X"
 msgstr "Với X"
 
-#: ../../install_steps_interactive.pm_.c:648
+#: ../../install_steps_interactive.pm_.c:655
 msgid "With basic documentation (recommended!)"
 msgstr "Với tài liệu cơ bản (khuyến nghị!)"
 
-#: ../../install_steps_interactive.pm_.c:649
+#: ../../install_steps_interactive.pm_.c:656
 msgid "Truly minimal install (especially no urpmi)"
 msgstr "Thực sự cài đặt tối thiểu (đặc biệt là không có urpmi)"
 
-#: ../../install_steps_interactive.pm_.c:734
+#: ../../install_steps_interactive.pm_.c:741
 msgid ""
 "If you have all the CDs in the list below, click Ok.\n"
 "If you have none of those CDs, click Cancel.\n"
@@ -5696,16 +5488,16 @@ msgstr ""
 "Nếu bạn không có CD nào trong số này, nhấn Bỏ qua.\n"
 "Nếu chỉ thiếu một số CD, bỏ chọn chúng, rồi nhấn OK."
 
-#: ../../install_steps_interactive.pm_.c:739
+#: ../../install_steps_interactive.pm_.c:746
 #, c-format
 msgid "Cd-Rom labeled \"%s\""
 msgstr "Cd-Rom mang nhãn \"%s\""
 
-#: ../../install_steps_interactive.pm_.c:760
+#: ../../install_steps_interactive.pm_.c:767
 msgid "Preparing installation"
 msgstr "Chuẩn bị cài đặt"
 
-#: ../../install_steps_interactive.pm_.c:769
+#: ../../install_steps_interactive.pm_.c:776
 #, c-format
 msgid ""
 "Installing package %s\n"
@@ -5714,89 +5506,21 @@ msgstr ""
 "Đang cài đặt gói %s\n"
 "%d%%"
 
-#: ../../install_steps_interactive.pm_.c:815
+#: ../../install_steps_interactive.pm_.c:822
 msgid "Post-install configuration"
 msgstr "Cấu hình sau khi cài đặt"
 
-#: ../../install_steps_interactive.pm_.c:821
+#: ../../install_steps_interactive.pm_.c:828
 #, c-format
 msgid "Please insert the Boot floppy used in drive %s"
 msgstr "Nạp đĩa mềm khởi động vào ổ đĩa %s"
 
-#: ../../install_steps_interactive.pm_.c:827
+#: ../../install_steps_interactive.pm_.c:834
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
 msgstr "Nạp một đĩa mềm chứa các mô-đun cập nhật vào ổ đĩa %s"
 
-#: ../../install_steps_interactive.pm_.c:847
-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 ""
-"Bây giờ bạn có thể tải phần mềm mã hóa về dùng.\n"
-"\n"
-"Cảnh báo:\n"
-"\n"
-"Vì các nhu cầu chung khác nhau để sử dụng phần mềm này dưới sự rằng buộc\n"
-"pháp lý khác nhau, khách hàng và/hoặc người dùng đầu cuối sử dụng phần\n"
-"mềm này nên khẳng địng rằng luật pháp nước mình cho phép tải xuống, lưu\n"
-"giữ và/hoặc sử dụng.\n"
-"\n"
-"Hơn nữa, khách hàng và/hoặc người dùng đầu cuối sẽ phải biết là việc này\n"
-"không vi phạm luật pháp.\n"
-"\n"
-"\n"
-"Không một bộ phận nào của Mandrakesoft và/hoặc các nhà cung cấp chịu trách\n"
-"nhiện về các sự cố đặc biệt trực tiếp hay gián tiếp (bao gồm, nhưng không\n"
-"bị giới hạn cho các mất mát lợi ích, gián đoạn công việc, mất dữ liệu thương "
-"mại\n"
-"và các vấn đề tài chính khác, thậm chí các trách nhiệm và bồi thường phải "
-"trả\n"
-"theo quyết định của toà án) nảy sinh khi sử dụng, sở hữu, hay chỉ tải xuống\n"
-"các phần mềm này, do đó khách hàng và/hoặc người dùng đầu cuối có thể\n"
-"tiến hành sau khi đăng ký vào phần giao kèo hiện thời.\n"
-"\n"
-"\n"
-"Nếu muốn hỏi thêm về vấn đề này, hãy liên hệ với \n"
-"Mandrakesoft, Inc.\n"
-"2400 N. Lincoln Avenue Suite 243\n"
-"Altadena California 91001\n"
-"USA"
-
-#: ../../install_steps_interactive.pm_.c:886
+#: ../../install_steps_interactive.pm_.c:861
 msgid ""
 "You now have the opportunity to download updated packages. These packages\n"
 "have been released after the distribution was released. They may\n"
@@ -5816,157 +5540,157 @@ msgstr ""
 "\n"
 "Bạn có muốn cài đặt các gói cập nhật không ?"
 
-#: ../../install_steps_interactive.pm_.c:901
+#: ../../install_steps_interactive.pm_.c:876
 msgid ""
 "Contacting Mandrake Linux web site to get the list of available mirrors..."
 msgstr ""
 "Đang liên hệ với website của Mandrake Linux để lấy danh sách các mirrors "
 "hiện có"
 
-#: ../../install_steps_interactive.pm_.c:906
+#: ../../install_steps_interactive.pm_.c:881
 msgid "Choose a mirror from which to get the packages"
 msgstr "Chọn một mirror để tải các gói về"
 
-#: ../../install_steps_interactive.pm_.c:915
+#: ../../install_steps_interactive.pm_.c:890
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Đang liên hệ với mirror để lấy danh sách các gói hiện có"
 
-#: ../../install_steps_interactive.pm_.c:943
+#: ../../install_steps_interactive.pm_.c:918
 msgid "Which is your timezone?"
 msgstr "Múi giờ nào là của bạn?"
 
-#: ../../install_steps_interactive.pm_.c:948
+#: ../../install_steps_interactive.pm_.c:923
 msgid "Hardware clock set to GMT"
 msgstr "Đồng hồ trong máy đặt theo GMT"
 
-#: ../../install_steps_interactive.pm_.c:949
+#: ../../install_steps_interactive.pm_.c:924
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Đồng bộ hóa tự động thời gian (dùng NTP)"
 
-#: ../../install_steps_interactive.pm_.c:956
+#: ../../install_steps_interactive.pm_.c:931
 msgid "NTP Server"
 msgstr "Máy chủ NTP"
 
-#: ../../install_steps_interactive.pm_.c:990
-#: ../../install_steps_interactive.pm_.c:998
+#: ../../install_steps_interactive.pm_.c:965
+#: ../../install_steps_interactive.pm_.c:972
 msgid "Remote CUPS server"
 msgstr "Máy chủ CUPS ở xa"
 
-#: ../../install_steps_interactive.pm_.c:991
+#: ../../install_steps_interactive.pm_.c:966
 msgid "No printer"
 msgstr "Không có máy in"
 
-#: ../../install_steps_interactive.pm_.c:1008
+#: ../../install_steps_interactive.pm_.c:982
 msgid "Do you have an ISA sound card?"
 msgstr "Bạn có card âm thanh ISA không ?"
 
-#: ../../install_steps_interactive.pm_.c:1010
+#: ../../install_steps_interactive.pm_.c:984
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr "Chạy \"sndconfig\" sau khi cài đặt để cấu hình card âm thanh"
 
-#: ../../install_steps_interactive.pm_.c:1012
+#: ../../install_steps_interactive.pm_.c:986
 msgid "No sound card detected. Try \"harddrake\" after installation"
 msgstr ""
 "Không phát hiện được card âm thanh nào. Hãy thử \"harddrake\" sau khi cài đặt"
 
-#: ../../install_steps_interactive.pm_.c:1017 ../../steps.pm_.c:27
+#: ../../install_steps_interactive.pm_.c:991 ../../steps.pm_.c:27
 msgid "Summary"
 msgstr "Tóm tắt"
 
-#: ../../install_steps_interactive.pm_.c:1020
+#: ../../install_steps_interactive.pm_.c:994
 msgid "Mouse"
 msgstr "Chuột"
 
-#: ../../install_steps_interactive.pm_.c:1022
+#: ../../install_steps_interactive.pm_.c:996
 msgid "Timezone"
 msgstr "Múi giờ"
 
-#: ../../install_steps_interactive.pm_.c:1023 ../../printerdrake.pm_.c:2989
-#: ../../printerdrake.pm_.c:3078
+#: ../../install_steps_interactive.pm_.c:997
+#: ../../printer/printerdrake.pm_.c:2759 ../../printer/printerdrake.pm_.c:2844
 msgid "Printer"
 msgstr "Máy in"
 
-#: ../../install_steps_interactive.pm_.c:1025
+#: ../../install_steps_interactive.pm_.c:999
 msgid "ISDN card"
 msgstr "Card ISDN"
 
-#: ../../install_steps_interactive.pm_.c:1028
-#: ../../install_steps_interactive.pm_.c:1030
+#: ../../install_steps_interactive.pm_.c:1003
+#: ../../install_steps_interactive.pm_.c:1009
 msgid "Sound card"
 msgstr "Card âm thanh"
 
-#: ../../install_steps_interactive.pm_.c:1033
+#: ../../install_steps_interactive.pm_.c:1012
 msgid "TV card"
 msgstr "Card TV"
 
-#: ../../install_steps_interactive.pm_.c:1075
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1104
+#: ../../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_.c:1076
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1113
+#: ../../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_.c:1077
-#: ../../install_steps_interactive.pm_.c:1100
-#: ../../install_steps_interactive.pm_.c:1121
-#: ../../install_steps_interactive.pm_.c:1127
+#: ../../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 "Miền Windows"
 
-#: ../../install_steps_interactive.pm_.c:1078
-#: ../../install_steps_interactive.pm_.c:1100
+#: ../../install_steps_interactive.pm_.c:1058
+#: ../../install_steps_interactive.pm_.c:1080
 msgid "Local files"
 msgstr "Các tập tin cục bộ"
 
-#: ../../install_steps_interactive.pm_.c:1087
-#: ../../install_steps_interactive.pm_.c:1088 ../../steps.pm_.c:24
+#: ../../install_steps_interactive.pm_.c:1067
+#: ../../install_steps_interactive.pm_.c:1068 ../../steps.pm_.c:24
 msgid "Set root password"
 msgstr "Thiết lập mật khẩu root"
 
-#: ../../install_steps_interactive.pm_.c:1089
+#: ../../install_steps_interactive.pm_.c:1069
 msgid "No password"
 msgstr "Không có mật khẩu"
 
-#: ../../install_steps_interactive.pm_.c:1094
+#: ../../install_steps_interactive.pm_.c:1074
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Mật khẩu này đơn giản quá ( phải gồm ít nhất %d ký tự)"
 
-#: ../../install_steps_interactive.pm_.c:1100 ../../network/modem.pm_.c:49
-#: ../../standalone/drakconnect_.c:625 ../../standalone/logdrake_.c:173
+#: ../../install_steps_interactive.pm_.c:1080 ../../network/modem.pm_.c:72
+#: ../../standalone/drakconnect_.c:623 ../../standalone/logdrake_.c:144
 msgid "Authentication"
 msgstr "Xác nhận"
 
-#: ../../install_steps_interactive.pm_.c:1108
+#: ../../install_steps_interactive.pm_.c:1088
 msgid "Authentication LDAP"
 msgstr "Chứng thực "
 
-#: ../../install_steps_interactive.pm_.c:1109
+#: ../../install_steps_interactive.pm_.c:1089
 msgid "LDAP Base dn"
 msgstr "LDAP Base dn"
 
-#: ../../install_steps_interactive.pm_.c:1110
+#: ../../install_steps_interactive.pm_.c:1090
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
-#: ../../install_steps_interactive.pm_.c:1116
+#: ../../install_steps_interactive.pm_.c:1096
 msgid "Authentication NIS"
 msgstr "Chứng thực NIS"
 
-#: ../../install_steps_interactive.pm_.c:1117
+#: ../../install_steps_interactive.pm_.c:1097
 msgid "NIS Domain"
 msgstr "Miền NIS"
 
-#: ../../install_steps_interactive.pm_.c:1118
+#: ../../install_steps_interactive.pm_.c:1098
 msgid "NIS Server"
 msgstr "Máy chủ NIS"
 
-#: ../../install_steps_interactive.pm_.c:1124
+#: ../../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 /"
@@ -5994,19 +5718,19 @@ msgstr ""
 "thống.\n"
 "Lệnh 'wbinfo -t' sẽ kiểm tra việc bảo mật chứng thực đã tốt chưa."
 
-#: ../../install_steps_interactive.pm_.c:1126
+#: ../../install_steps_interactive.pm_.c:1106
 msgid "Authentication Windows Domain"
 msgstr "Chứng Thực Miền Windows"
 
-#: ../../install_steps_interactive.pm_.c:1128
+#: ../../install_steps_interactive.pm_.c:1108
 msgid "Domain Admin User Name"
 msgstr "Tên Người Quản Trị Miền"
 
-#: ../../install_steps_interactive.pm_.c:1129
+#: ../../install_steps_interactive.pm_.c:1109
 msgid "Domain Admin Password"
 msgstr "Mật Khẩu Quản Trị Miền"
 
-#: ../../install_steps_interactive.pm_.c:1164
+#: ../../install_steps_interactive.pm_.c:1144
 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 "
@@ -6036,19 +5760,20 @@ msgstr ""
 "Nếu bạn muốn tạo một đĩa mềm khởi động, nạp một đĩa mềm vào ổ đĩa mềm\n"
 "thứ nhất và nhấn \"OK\"."
 
-#: ../../install_steps_interactive.pm_.c:1180
+#: ../../install_steps_interactive.pm_.c:1160
 msgid "First floppy drive"
 msgstr "ổ đĩa mềm thứ nhất"
 
-#: ../../install_steps_interactive.pm_.c:1181
+#: ../../install_steps_interactive.pm_.c:1161
 msgid "Second floppy drive"
 msgstr "ổ đĩa mềm thứ hai"
 
-#: ../../install_steps_interactive.pm_.c:1182 ../../printerdrake.pm_.c:2515
+#: ../../install_steps_interactive.pm_.c:1162
+#: ../../printer/printerdrake.pm_.c:2397
 msgid "Skip"
 msgstr "Cho qua"
 
-#: ../../install_steps_interactive.pm_.c:1187
+#: ../../install_steps_interactive.pm_.c:1167
 #, c-format
 msgid ""
 "A custom bootdisk provides a way of booting into your Linux system without\n"
@@ -6074,7 +5799,7 @@ msgstr ""
 "sự cố.Bạn có muốn tạo một đĩa mềm khởi động cho hệ thống không?\n"
 "%s"
 
-#: ../../install_steps_interactive.pm_.c:1193
+#: ../../install_steps_interactive.pm_.c:1173
 msgid ""
 "\n"
 "\n"
@@ -6088,28 +5813,28 @@ msgstr ""
 "việc tạo một đĩa mềm khởi động 1.44 Mb có thể thất bại,\n"
 "vì XFS cần một ổ đĩa rất lớn)."
 
-#: ../../install_steps_interactive.pm_.c:1201
+#: ../../install_steps_interactive.pm_.c:1181
 msgid "Sorry, no floppy drive available"
 msgstr "Xin lỗi, hiện thời không có ổ đĩa mềm nào"
 
-#: ../../install_steps_interactive.pm_.c:1205
+#: ../../install_steps_interactive.pm_.c:1185
 msgid "Choose the floppy drive you want to use to make the bootdisk"
 msgstr "Chọn ổ đĩa mềm bạn muốn dùng để tạo đĩa khởi động"
 
-#: ../../install_steps_interactive.pm_.c:1209
+#: ../../install_steps_interactive.pm_.c:1189
 #, c-format
 msgid "Insert a floppy in %s"
 msgstr "Nạp đĩa mềm vào %s"
 
-#: ../../install_steps_interactive.pm_.c:1212
+#: ../../install_steps_interactive.pm_.c:1192
 msgid "Creating bootdisk..."
 msgstr "Đang tạo đĩa khởi động"
 
-#: ../../install_steps_interactive.pm_.c:1219
+#: ../../install_steps_interactive.pm_.c:1199
 msgid "Preparing bootloader..."
 msgstr "Đang chuẩn bị trình khởi động"
 
-#: ../../install_steps_interactive.pm_.c:1230
+#: ../../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"
@@ -6121,11 +5846,11 @@ msgstr ""
 "Tiếp tục cài đặt, nhưng bạn sẽ cần phải\n"
 " sử dụng BootX để khởi động máy tính."
 
-#: ../../install_steps_interactive.pm_.c:1236
+#: ../../install_steps_interactive.pm_.c:1216
 msgid "Do you want to use aboot?"
 msgstr "Bạn có muốn sử dụng aboot không?"
 
-#: ../../install_steps_interactive.pm_.c:1239
+#: ../../install_steps_interactive.pm_.c:1219
 msgid ""
 "Error installing aboot, \n"
 "try to force installation even if that destroys the first partition?"
@@ -6133,15 +5858,15 @@ msgstr ""
 "Lỗi khi cài đặt aboot, \n"
 "Cố gắng cài đặt kể cả khi nó có thể phá hỏng phân vùng đầu tiên?"
 
-#: ../../install_steps_interactive.pm_.c:1246
+#: ../../install_steps_interactive.pm_.c:1226
 msgid "Installing bootloader"
 msgstr "Đang cài đặt trình nạp khởi động"
 
-#: ../../install_steps_interactive.pm_.c:1252
+#: ../../install_steps_interactive.pm_.c:1232
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Không cài đặt được trình khởi động. Xảy ra lỗi như sau:"
 
-#: ../../install_steps_interactive.pm_.c:1260
+#: ../../install_steps_interactive.pm_.c:1240
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -6159,17 +5884,17 @@ msgstr ""
 " Rồi gõ: shut-down\n"
 "Lần khởi động tiếp theo, bạn sẽ nhìn thấy dấu nhắc của trình khởi động."
 
-#: ../../install_steps_interactive.pm_.c:1294
-#: ../../standalone/drakautoinst_.c:79
+#: ../../install_steps_interactive.pm_.c:1274
+#: ../../standalone/drakautoinst_.c:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
 msgstr "Nạp một đĩa mềm trắng vào ổ %s"
 
-#: ../../install_steps_interactive.pm_.c:1298
+#: ../../install_steps_interactive.pm_.c:1278
 msgid "Creating auto install floppy..."
 msgstr "Đang tạo đĩa mềm cài đặt tự động"
 
-#: ../../install_steps_interactive.pm_.c:1309
+#: ../../install_steps_interactive.pm_.c:1289
 msgid ""
 "Some steps are not completed.\n"
 "\n"
@@ -6179,7 +5904,7 @@ msgstr ""
 "\n"
 "Bạn thực sự muốn thoát ra bây giờ?"
 
-#: ../../install_steps_interactive.pm_.c:1320
+#: ../../install_steps_interactive.pm_.c:1300
 #, c-format
 msgid ""
 "Congratulations, installation is complete.\n"
@@ -6211,15 +5936,15 @@ msgstr ""
 "Thông tin cấu hình hệ thống có sẵn trong chương sau cài đặt của\n"
 "hướng dẫn sử dụng chính (Official Mandrake Linux User's Guide)."
 
-#: ../../install_steps_interactive.pm_.c:1333
+#: ../../install_steps_interactive.pm_.c:1313
 msgid "http://www.mandrakelinux.com/en/90errata.php3"
 msgstr "http://www.mandrakelinux.com/en/90errata.php3"
 
-#: ../../install_steps_interactive.pm_.c:1338
+#: ../../install_steps_interactive.pm_.c:1318
 msgid "Generate auto install floppy"
 msgstr "Tạo đĩa mềm cài đặt tự động"
 
-#: ../../install_steps_interactive.pm_.c:1340
+#: ../../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"
@@ -6233,25 +5958,25 @@ msgstr ""
 "\n"
 "Có thể bạn thích diễn lại quá trình cài đặt.\n"
 
-#: ../../install_steps_interactive.pm_.c:1345
+#: ../../install_steps_interactive.pm_.c:1325
 msgid "Automated"
 msgstr "Tự động"
 
-#: ../../install_steps_interactive.pm_.c:1345
+#: ../../install_steps_interactive.pm_.c:1325
 msgid "Replay"
 msgstr "Diễn lại"
 
-#: ../../install_steps_interactive.pm_.c:1348
+#: ../../install_steps_interactive.pm_.c:1328
 msgid "Save packages selection"
 msgstr "Lưu lựa chọn các gói"
 
-#: ../../install_steps_newt.pm_.c:22
+#: ../../install_steps_newt.pm_.c:20
 #, c-format
 msgid "Mandrake Linux Installation %s"
 msgstr "Cài đặt Mandrake Linux %s"
 
 #. -PO This string must fit in a 80-char wide text screen
-#: ../../install_steps_newt.pm_.c:35
+#: ../../install_steps_newt.pm_.c:33
 msgid ""
 "  <Tab>/<Alt-Tab> between elements  | <Space> selects | <F12> next screen "
 msgstr ""
@@ -6270,22 +5995,22 @@ msgstr "thiếu trình trợ giúp trong console"
 msgid "Choose a file"
 msgstr "Chọn một tập tin"
 
-#: ../../interactive.pm_.c:320
+#: ../../interactive.pm_.c:318
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: ../../interactive.pm_.c:321 ../../security/main.pm_.c:103
+#: ../../interactive.pm_.c:319 ../../security/main.pm_.c:117
 msgid "Basic"
 msgstr "Cơ bản"
 
-#: ../../interactive/newt.pm_.c:195 ../../my_gtk.pm_.c:158
-#: ../../printerdrake.pm_.c:2169
+#: ../../interactive/newt.pm_.c:194 ../../my_gtk.pm_.c:158
+#: ../../printer/printerdrake.pm_.c:2055 ../../ugtk2.pm_.c:434
 msgid "<- Previous"
 msgstr "<- Về trước"
 
-#: ../../interactive/newt.pm_.c:195 ../../interactive/newt.pm_.c:197
-#: ../../standalone/drakbackup_.c:4114 ../../standalone/drakbackup_.c:4141
-#: ../../standalone/drakbackup_.c:4171 ../../standalone/drakbackup_.c:4197
+#: ../../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 "Tiếp theo"
 
@@ -6358,371 +6083,375 @@ msgstr ""
 msgid "Re-submit"
 msgstr "Đệ trình lại"
 
-#: ../../keyboard.pm_.c:152 ../../keyboard.pm_.c:187
+#: ../../keyboard.pm_.c:153 ../../keyboard.pm_.c:188
 msgid "Czech (QWERTZ)"
 msgstr "Czech (QWERTZ)"
 
-#: ../../keyboard.pm_.c:153 ../../keyboard.pm_.c:189
+#: ../../keyboard.pm_.c:154 ../../keyboard.pm_.c:190
 msgid "German"
 msgstr "Đức"
 
-#: ../../keyboard.pm_.c:154
+#: ../../keyboard.pm_.c:155
 msgid "Dvorak"
 msgstr "Dvorak"
 
-#: ../../keyboard.pm_.c:155 ../../keyboard.pm_.c:197
+#: ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:198
 msgid "Spanish"
 msgstr "Tây ban nha"
 
-#: ../../keyboard.pm_.c:156 ../../keyboard.pm_.c:198
+#: ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:199
 msgid "Finnish"
 msgstr "Phần lan"
 
-#: ../../keyboard.pm_.c:157 ../../keyboard.pm_.c:199
+#: ../../keyboard.pm_.c:158 ../../keyboard.pm_.c:200
 msgid "French"
 msgstr "Pháp"
 
-#: ../../keyboard.pm_.c:158 ../../keyboard.pm_.c:231
+#: ../../keyboard.pm_.c:159 ../../keyboard.pm_.c:233
 msgid "Norwegian"
 msgstr "Na uy"
 
-#: ../../keyboard.pm_.c:159
+#: ../../keyboard.pm_.c:160
 msgid "Polish"
 msgstr "Ba lan"
 
-#: ../../keyboard.pm_.c:160 ../../keyboard.pm_.c:239
+#: ../../keyboard.pm_.c:161 ../../keyboard.pm_.c:241
 msgid "Russian"
 msgstr "Nga"
 
-#: ../../keyboard.pm_.c:162 ../../keyboard.pm_.c:241
+#: ../../keyboard.pm_.c:163 ../../keyboard.pm_.c:243
 msgid "Swedish"
 msgstr "Thụy điển"
 
-#: ../../keyboard.pm_.c:163 ../../keyboard.pm_.c:257
+#: ../../keyboard.pm_.c:164 ../../keyboard.pm_.c:259
 msgid "UK keyboard"
 msgstr "Bàn phím Anh"
 
-#: ../../keyboard.pm_.c:164 ../../keyboard.pm_.c:258
+#: ../../keyboard.pm_.c:165 ../../keyboard.pm_.c:260
 msgid "US keyboard"
 msgstr "Bàn phím Mỹ"
 
-#: ../../keyboard.pm_.c:166
+#: ../../keyboard.pm_.c:167
 msgid "Albanian"
 msgstr "Albanian"
 
-#: ../../keyboard.pm_.c:167
+#: ../../keyboard.pm_.c:168
 msgid "Armenian (old)"
 msgstr "Mỹ (cổ)"
 
-#: ../../keyboard.pm_.c:168
+#: ../../keyboard.pm_.c:169
 msgid "Armenian (typewriter)"
 msgstr "Mỹ (máy chữ)"
 
-#: ../../keyboard.pm_.c:169
+#: ../../keyboard.pm_.c:170
 msgid "Armenian (phonetic)"
 msgstr "Mỹ (ngữ âm)"
 
-#: ../../keyboard.pm_.c:174
+#: ../../keyboard.pm_.c:175
 msgid "Azerbaidjani (latin)"
 msgstr "Azerbaidjani (latin)"
 
-#: ../../keyboard.pm_.c:176
+#: ../../keyboard.pm_.c:177
 msgid "Belgian"
 msgstr "Bỉ"
 
-#: ../../keyboard.pm_.c:177
+#: ../../keyboard.pm_.c:178
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../../keyboard.pm_.c:178
+#: ../../keyboard.pm_.c:179
 msgid "Bulgarian (phonetic)"
 msgstr "Bulgarian (phonetic)"
 
-#: ../../keyboard.pm_.c:179
+#: ../../keyboard.pm_.c:180
 msgid "Bulgarian (BDS)"
 msgstr "Bulgarian (BDS)"
 
-#: ../../keyboard.pm_.c:180
+#: ../../keyboard.pm_.c:181
 msgid "Brazilian (ABNT-2)"
 msgstr "Brazilian (ABNT-2)"
 
-#: ../../keyboard.pm_.c:183
+#: ../../keyboard.pm_.c:184
 msgid "Bosnian"
 msgstr "Bosnian"
 
-#: ../../keyboard.pm_.c:184
+#: ../../keyboard.pm_.c:185
 msgid "Belarusian"
 msgstr "Belarusian"
 
-#: ../../keyboard.pm_.c:185
+#: ../../keyboard.pm_.c:186
 msgid "Swiss (German layout)"
 msgstr "Thụy Sĩ (bàn phím Đức)"
 
-#: ../../keyboard.pm_.c:186
+#: ../../keyboard.pm_.c:187
 msgid "Swiss (French layout)"
 msgstr "Thụy sỹ (bàn phím Pháp)"
 
-#: ../../keyboard.pm_.c:188
+#: ../../keyboard.pm_.c:189
 msgid "Czech (QWERTY)"
 msgstr "Czech (QWERTY)"
 
-#: ../../keyboard.pm_.c:190
+#: ../../keyboard.pm_.c:191
 msgid "German (no dead keys)"
 msgstr "Đức (không có phím chết)"
 
-#: ../../keyboard.pm_.c:191
+#: ../../keyboard.pm_.c:192
 msgid "Devanagari"
 msgstr "Devanagari"
 
-#: ../../keyboard.pm_.c:192
+#: ../../keyboard.pm_.c:193
 msgid "Danish"
 msgstr "Đan mạch"
 
-#: ../../keyboard.pm_.c:193
+#: ../../keyboard.pm_.c:194
 msgid "Dvorak (US)"
 msgstr "Dvorak (US)"
 
-#: ../../keyboard.pm_.c:194
+#: ../../keyboard.pm_.c:195
 msgid "Dvorak (Norwegian)"
 msgstr "Dvorak (Norwegian)"
 
-#: ../../keyboard.pm_.c:195
+#: ../../keyboard.pm_.c:196
 msgid "Dvorak (Swedish)"
 msgstr "Dvorak (Thụy điển)"
 
-#: ../../keyboard.pm_.c:196
+#: ../../keyboard.pm_.c:197
 msgid "Estonian"
 msgstr "Estonian"
 
-#: ../../keyboard.pm_.c:200
+#: ../../keyboard.pm_.c:201
 msgid "Georgian (\"Russian\" layout)"
 msgstr " (Georgian (\"Russian\" layout)"
 
-#: ../../keyboard.pm_.c:201
+#: ../../keyboard.pm_.c:202
 msgid "Georgian (\"Latin\" layout)"
 msgstr "Tổ chức bàn phím Georgian (\"Latin\")"
 
-#: ../../keyboard.pm_.c:202
+#: ../../keyboard.pm_.c:203
 msgid "Greek"
 msgstr "Hy lạp"
 
-#: ../../keyboard.pm_.c:203
+#: ../../keyboard.pm_.c:204
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../../keyboard.pm_.c:204
+#: ../../keyboard.pm_.c:205
 msgid "Gurmukhi"
 msgstr "Gurmukhi"
 
-#: ../../keyboard.pm_.c:205
+#: ../../keyboard.pm_.c:206
 msgid "Hungarian"
 msgstr "Hungarian"
 
-#: ../../keyboard.pm_.c:206
+#: ../../keyboard.pm_.c:207
 msgid "Croatian"
 msgstr "Croatian"
 
-#: ../../keyboard.pm_.c:207
+#: ../../keyboard.pm_.c:208
 msgid "Israeli"
 msgstr "Israeli"
 
-#: ../../keyboard.pm_.c:208
+#: ../../keyboard.pm_.c:209
 msgid "Israeli (Phonetic)"
 msgstr "Israeli (Phonetic)"
 
-#: ../../keyboard.pm_.c:209
+#: ../../keyboard.pm_.c:210
 msgid "Iranian"
 msgstr "Iranian"
 
-#: ../../keyboard.pm_.c:210
+#: ../../keyboard.pm_.c:211
 msgid "Icelandic"
 msgstr "Icelandic"
 
-#: ../../keyboard.pm_.c:211
+#: ../../keyboard.pm_.c:212
 msgid "Italian"
 msgstr "Ý"
 
-#: ../../keyboard.pm_.c:212
+#: ../../keyboard.pm_.c:213
 msgid "Inuktitut"
 msgstr "Inuktitut"
 
-#: ../../keyboard.pm_.c:213
+#: ../../keyboard.pm_.c:214
 msgid "Japanese 106 keys"
 msgstr "Nhật bản 106 keys"
 
-#: ../../keyboard.pm_.c:216
+#: ../../keyboard.pm_.c:217
 msgid "Korean keyboard"
 msgstr "Bàn phím Hàn quốc"
 
-#: ../../keyboard.pm_.c:217
+#: ../../keyboard.pm_.c:218
 msgid "Latin American"
 msgstr "Latin American"
 
-#: ../../keyboard.pm_.c:218
+#: ../../keyboard.pm_.c:219
 msgid "Laotian"
 msgstr "Laotian"
 
-#: ../../keyboard.pm_.c:219
+#: ../../keyboard.pm_.c:220
 msgid "Lithuanian AZERTY (old)"
 msgstr "Lithuanian AZERTY (old)"
 
-#: ../../keyboard.pm_.c:221
+#: ../../keyboard.pm_.c:222
 msgid "Lithuanian AZERTY (new)"
 msgstr "Lithuanian AZERTY (new)"
 
-#: ../../keyboard.pm_.c:222
+#: ../../keyboard.pm_.c:223
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Lithuanian \"number row\" QWERTY"
 
-#: ../../keyboard.pm_.c:223
+#: ../../keyboard.pm_.c:224
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Lithuanian \"phonetic\" QWERTY"
 
-#: ../../keyboard.pm_.c:224
+#: ../../keyboard.pm_.c:225
 msgid "Latvian"
 msgstr "Latvian"
 
-#: ../../keyboard.pm_.c:225
+#: ../../keyboard.pm_.c:226
+msgid "Malayalam"
+msgstr "Malayalam"
+
+#: ../../keyboard.pm_.c:227
 msgid "Macedonian"
 msgstr "Macedonian"
 
-#: ../../keyboard.pm_.c:226
+#: ../../keyboard.pm_.c:228
 msgid "Myanmar (Burmese)"
 msgstr "Myanmar (Burmese)"
 
-#: ../../keyboard.pm_.c:227
+#: ../../keyboard.pm_.c:229
 msgid "Mongolian (cyrillic)"
 msgstr "Mongolian (cyrillic)"
 
-#: ../../keyboard.pm_.c:228
+#: ../../keyboard.pm_.c:230
 msgid "Maltese (UK)"
 msgstr "Maltese (UK)"
 
-#: ../../keyboard.pm_.c:229
+#: ../../keyboard.pm_.c:231
 msgid "Maltese (US)"
 msgstr "Maltese (US)"
 
-#: ../../keyboard.pm_.c:230
+#: ../../keyboard.pm_.c:232
 msgid "Dutch"
 msgstr "Dutch"
 
-#: ../../keyboard.pm_.c:232
+#: ../../keyboard.pm_.c:234
 msgid "Polish (qwerty layout)"
 msgstr "Polish (qwerty layout)"
 
-#: ../../keyboard.pm_.c:233
+#: ../../keyboard.pm_.c:235
 msgid "Polish (qwertz layout)"
 msgstr "Polish (qwertz layout)"
 
-#: ../../keyboard.pm_.c:234
+#: ../../keyboard.pm_.c:236
 msgid "Portuguese"
 msgstr "Portuguese"
 
-#: ../../keyboard.pm_.c:235
+#: ../../keyboard.pm_.c:237
 msgid "Canadian (Quebec)"
 msgstr "Canadian (Quebec)"
 
-#: ../../keyboard.pm_.c:237
+#: ../../keyboard.pm_.c:239
 msgid "Romanian (qwertz)"
 msgstr "Romanian (qwertz)"
 
-#: ../../keyboard.pm_.c:238
+#: ../../keyboard.pm_.c:240
 msgid "Romanian (qwerty)"
 msgstr "Romanian (qwerty)"
 
-#: ../../keyboard.pm_.c:240
+#: ../../keyboard.pm_.c:242
 msgid "Russian (Yawerty)"
 msgstr "Russian (Yawerty)"
 
-#: ../../keyboard.pm_.c:242
+#: ../../keyboard.pm_.c:244
 msgid "Slovenian"
 msgstr "Slovenian"
 
-#: ../../keyboard.pm_.c:243
+#: ../../keyboard.pm_.c:245
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovakian (QWERTZ)"
 
-#: ../../keyboard.pm_.c:244
+#: ../../keyboard.pm_.c:246
 msgid "Slovakian (QWERTY)"
 msgstr "Slovakian (QWERTY)"
 
-#: ../../keyboard.pm_.c:246
+#: ../../keyboard.pm_.c:248
 msgid "Serbian (cyrillic)"
 msgstr "Serbian (cyrillic)"
 
-#: ../../keyboard.pm_.c:248
+#: ../../keyboard.pm_.c:250
 msgid "Tamil (Unicode)"
 msgstr "Tamil (Unicode)"
 
-#: ../../keyboard.pm_.c:249
+#: ../../keyboard.pm_.c:251
 msgid "Tamil (TSCII)"
 msgstr "Tamil (TSCII)"
 
-#: ../../keyboard.pm_.c:250
+#: ../../keyboard.pm_.c:252
 msgid "Thai keyboard"
 msgstr "Thai keyboard"
 
-#: ../../keyboard.pm_.c:252
+#: ../../keyboard.pm_.c:254
 msgid "Tajik keyboard"
 msgstr "Tajik keyboard"
 
-#: ../../keyboard.pm_.c:253
+#: ../../keyboard.pm_.c:255
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Turkish (traditional \"F\" model)"
 
-#: ../../keyboard.pm_.c:254
+#: ../../keyboard.pm_.c:256
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Turkish (modern \"Q\" model)"
 
-#: ../../keyboard.pm_.c:256
+#: ../../keyboard.pm_.c:258
 msgid "Ukrainian"
 msgstr "Ukrainian"
 
-#: ../../keyboard.pm_.c:259
+#: ../../keyboard.pm_.c:261
 msgid "US keyboard (international)"
 msgstr "US keyboard (international)"
 
-#: ../../keyboard.pm_.c:260
+#: ../../keyboard.pm_.c:262
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnamese \"numeric row\" QWERTY"
 
-#: ../../keyboard.pm_.c:261
+#: ../../keyboard.pm_.c:263
 msgid "Yugoslavian (latin)"
 msgstr "Yugoslavian (latin)"
 
-#: ../../keyboard.pm_.c:268
+#: ../../keyboard.pm_.c:270
 msgid "Right Alt key"
 msgstr "Phím Alt phải"
 
-#: ../../keyboard.pm_.c:269
+#: ../../keyboard.pm_.c:271
 msgid "Both Shift keys simultaneously"
 msgstr "Cả 2 phím Shift đồng thời"
 
-#: ../../keyboard.pm_.c:270
+#: ../../keyboard.pm_.c:272
 msgid "Control and Shift keys simultaneously"
 msgstr "Phím Control và Shift đồng thời"
 
-#: ../../keyboard.pm_.c:271
+#: ../../keyboard.pm_.c:273
 msgid "CapsLock key"
 msgstr "Phím CapsLock"
 
-#: ../../keyboard.pm_.c:272
+#: ../../keyboard.pm_.c:274
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Phím Ctrl và Alt đồng thời"
 
-#: ../../keyboard.pm_.c:273
+#: ../../keyboard.pm_.c:275
 msgid "Alt and Shift keys simultaneously"
 msgstr "Phím Alt và Shift đồng thời "
 
-#: ../../keyboard.pm_.c:274
+#: ../../keyboard.pm_.c:276
 msgid "\"Menu\" key"
 msgstr "Phím \"Menu\""
 
-#: ../../keyboard.pm_.c:275
+#: ../../keyboard.pm_.c:277
 msgid "Left \"Windows\" key"
 msgstr "Phím \"Windows\" trái"
 
-#: ../../keyboard.pm_.c:276
+#: ../../keyboard.pm_.c:278
 msgid "Right \"Windows\" key"
 msgstr "Phím \"Windows\" phải"
 
@@ -6735,33 +6464,41 @@ msgstr "Các gắn kết vòng %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "Bỏ các ổ lý luận trước tiên\n"
 
-#: ../../modparm.pm_.c:50
+#: ../../modules.pm_.c:290
+msgid ""
+"PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
+msgstr "Các nhân Kernel 2.2 không còn hỗ trợ PCMCIA nữa, hãy dùng 2.4."
+
+#: ../../modules/interactive.pm_.c:16
+msgid "You can configure each parameter of the module here."
+msgstr "Có thể cấu hình từng tham số của module tại đây."
+
+#: ../../modules/parameters.pm_.c:18
+msgid "modinfo is not available"
+msgstr "Hiện không có modinfo"
+
+#: ../../modules/parameters.pm_.c:50
 msgid "a number"
 msgstr "Số"
 
-#: ../../modparm.pm_.c:52
+#: ../../modules/parameters.pm_.c:52
 #, c-format
 msgid "%d comma separated numbers"
 msgstr "%d dấu phẩu phân cách các số"
 
-#: ../../modparm.pm_.c:52
+#: ../../modules/parameters.pm_.c:52
 #, c-format
 msgid "%d comma separated strings"
 msgstr "%d dấu phẩy phân cách các chuỗi"
 
-#: ../../modparm.pm_.c:54
+#: ../../modules/parameters.pm_.c:54
 msgid "comma separated numbers"
 msgstr "dấu phẩy phân cách các số"
 
-#: ../../modparm.pm_.c:54
+#: ../../modules/parameters.pm_.c:54
 msgid "comma separated strings"
 msgstr "dấu phẩy ngăn cách các chuỗi"
 
-#: ../../modules.pm_.c:293
-msgid ""
-"PCMCIA support no longer exists for 2.2 kernels. Please use a 2.4 kernel."
-msgstr "Các nhân Kernel 2.2 không còn hỗ trợ PCMCIA nữa, hãy dùng 2.4."
-
 #: ../../mouse.pm_.c:25
 msgid "Sun - Mouse"
 msgstr "Chuột của hãng Sun"
@@ -6866,55 +6603,76 @@ msgstr "không có"
 msgid "No mouse"
 msgstr "Không có chuột"
 
-#: ../../mouse.pm_.c:486
+#: ../../mouse.pm_.c:490
 msgid "Please test the mouse"
 msgstr "Hãy thử chuột"
 
-#: ../../mouse.pm_.c:487
+#: ../../mouse.pm_.c:491
 msgid "To activate the mouse,"
 msgstr "Để chuột hoạt động,"
 
-#: ../../mouse.pm_.c:488
+#: ../../mouse.pm_.c:492
 msgid "MOVE YOUR WHEEL!"
 msgstr "Hãy lăn chuột!"
 
-#: ../../my_gtk.pm_.c:64
+#: ../../my_gtk.pm_.c:65
 msgid "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-utopia-regular-r-*-*-25-*-*-*-p-*-iso8859-*,*-r-*"
 
-#: ../../my_gtk.pm_.c:159
+#: ../../my_gtk.pm_.c:159 ../../ugtk2.pm_.c:435
 msgid "Finish"
 msgstr "Kết thúc"
 
-#: ../../my_gtk.pm_.c:159 ../../printerdrake.pm_.c:2171
+#: ../../my_gtk.pm_.c:159 ../../printer/printerdrake.pm_.c:2057
+#: ../../ugtk2.pm_.c:435
 msgid "Next ->"
 msgstr "Tiếp theo ->"
 
-#: ../../my_gtk.pm_.c:287
+#: ../../my_gtk.pm_.c:287 ../../ugtk2.pm_.c:926
 msgid "Is this correct?"
 msgstr "Có đúng không?"
 
-#: ../../my_gtk.pm_.c:359 ../../services.pm_.c:222
+#: ../../my_gtk.pm_.c:359 ../../services.pm_.c:227 ../../ugtk2.pm_.c:1011
 msgid "Info"
 msgstr "Thông tin"
 
-#: ../../my_gtk.pm_.c:380
+#: ../../my_gtk.pm_.c:380 ../../ugtk2.pm_.c:1036
 msgid "Expand Tree"
 msgstr "Mở rộng Cây"
 
-#: ../../my_gtk.pm_.c:381
+#: ../../my_gtk.pm_.c:381 ../../ugtk2.pm_.c:1037
 msgid "Collapse Tree"
 msgstr "Thu gọn Cây"
 
-#: ../../my_gtk.pm_.c:382
+#: ../../my_gtk.pm_.c:382 ../../ugtk2.pm_.c:1038
 msgid "Toggle between flat and group sorted"
 msgstr "Chuyển giữa dãy và nhóm được phân loại"
 
-#: ../../network/adsl.pm_.c:23 ../../network/ethernet.pm_.c:36
+#: ../../network/adsl.pm_.c:23
+msgid "use pppoe"
+msgstr "dùng PPPOE"
+
+#: ../../network/adsl.pm_.c:24
+msgid "use pptp"
+msgstr "dùng PPTP"
+
+#: ../../network/adsl.pm_.c:25
+msgid "use dhcp"
+msgstr "dùng DHCP"
+
+#: ../../network/adsl.pm_.c:26
+msgid "Alcatel speedtouch usb"
+msgstr "Alcatel speedtouch usb"
+
+#: ../../network/adsl.pm_.c:27
+msgid "Sagem (using pppoe) usb"
+msgstr "Sagem (dùng pppoe) usb"
+
+#: ../../network/adsl.pm_.c:29 ../../network/ethernet.pm_.c:36
 msgid "Connect to the Internet"
 msgstr "Kết nối vào Internet"
 
-#: ../../network/adsl.pm_.c:24
+#: ../../network/adsl.pm_.c:30
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
 "Some connections use pptp, a few ones use dhcp.\n"
@@ -6924,21 +6682,17 @@ msgstr ""
 "Một số kết nối dùng PPTP, số ít dùng DHCP.\n"
 "Nếu bạn không rõ, hãy dùng 'dùng PPPOE'"
 
-#: ../../network/adsl.pm_.c:26
-msgid "Alcatel speedtouch usb"
-msgstr "Alcatel speedtouch usb"
-
-#: ../../network/adsl.pm_.c:26
-msgid "use dhcp"
-msgstr "dùng DHCP"
-
-#: ../../network/adsl.pm_.c:26
-msgid "use pppoe"
-msgstr "dùng PPPOE"
-
-#: ../../network/adsl.pm_.c:26
-msgid "use pptp"
-msgstr "dùng PPTP"
+#: ../../network/adsl.pm_.c:166
+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 ""
+"Bạn cần alcatel microcode.\n"
+"Tải xuống tại\n"
+"http://www.speedtouchdsl.com/dvrreg_lx.htm\n"
+"và sao chép mgmt.o vào /usr/share/speedtouch"
 
 #: ../../network/drakfirewall.pm_.c:12
 msgid "Web Server"
@@ -7022,7 +6776,7 @@ msgstr "Các cổng khác"
 #: ../../network/ethernet.pm_.c:37
 msgid ""
 "Which dhcp client do you want to use?\n"
-"Default is dhcpcd"
+"Default is dhcp-client"
 msgstr ""
 "Bạn muốn dùng DHCP khách (client) nào?\n"
 "Mặc định là DHCPD"
@@ -7035,7 +6789,7 @@ msgstr ""
 "Không dò tìm được adapter mạng ethernet.\n"
 "Không thể thiết lập kiểu kết nối này."
 
-#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:238
+#: ../../network/ethernet.pm_.c:92 ../../standalone/drakgw_.c:234
 msgid "Choose the network interface"
 msgstr "Chọn giao diện mạng"
 
@@ -7044,15 +6798,15 @@ msgid ""
 "Please choose which network adapter you want to use to connect to Internet"
 msgstr "Hãy chọn adapter mạng bạn muốn dùng để kết nối Internet"
 
-#: ../../network/ethernet.pm_.c:178
+#: ../../network/ethernet.pm_.c:176
 msgid "no network card found"
 msgstr "không tìm thấy card mạng"
 
-#: ../../network/ethernet.pm_.c:202 ../../network/network.pm_.c:362
+#: ../../network/ethernet.pm_.c:200 ../../network/network.pm_.c:349
 msgid "Configuring network"
 msgstr "Đang cấu hình mạng"
 
-#: ../../network/ethernet.pm_.c:203
+#: ../../network/ethernet.pm_.c:201
 msgid ""
 "Please enter your host name if you know it.\n"
 "Some DHCP servers require the hostname to work.\n"
@@ -7064,15 +6818,15 @@ msgstr ""
 "Tên máy chủ của bạn phải có đủ thành phần, ví dụ như\n"
 " ``mybox.mylab.myco.com''."
 
-#: ../../network/ethernet.pm_.c:207 ../../network/network.pm_.c:367
+#: ../../network/ethernet.pm_.c:205 ../../network/network.pm_.c:354
 msgid "Host name"
 msgstr "Tên máy chủ"
 
 #: ../../network/isdn.pm_.c:21 ../../network/isdn.pm_.c:44
-#: ../../network/netconnect.pm_.c:90 ../../network/netconnect.pm_.c:104
-#: ../../network/netconnect.pm_.c:159 ../../network/netconnect.pm_.c:174
-#: ../../network/netconnect.pm_.c:201 ../../network/netconnect.pm_.c:224
-#: ../../network/netconnect.pm_.c:232
+#: ../../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 "Đồ Thuật Cấu Hình Mạng"
 
@@ -7118,13 +6872,13 @@ msgstr "Cấu hình mới (isdn-light)"
 msgid "Old configuration (isdn4net)"
 msgstr "Cấu hình cũ (isdn4net)"
 
-#: ../../network/isdn.pm_.c:170 ../../network/isdn.pm_.c:188
-#: ../../network/isdn.pm_.c:200 ../../network/isdn.pm_.c:206
-#: ../../network/isdn.pm_.c:213 ../../network/isdn.pm_.c:223
+#: ../../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 "Cấu hình ISDN"
 
-#: ../../network/isdn.pm_.c:170
+#: ../../network/isdn.pm_.c:166
 msgid ""
 "Select your provider.\n"
 "If it isn't listed, choose Unlisted."
@@ -7132,19 +6886,19 @@ msgstr ""
 "Chọn nhà cung cấp dịch vụ.\n"
 " Nếu không có trong danh sách, chọn Không có trong danh sách"
 
-#: ../../network/isdn.pm_.c:183
+#: ../../network/isdn.pm_.c:179
 msgid "Europe protocol"
 msgstr "Giao thức châu Âu"
 
-#: ../../network/isdn.pm_.c:183
+#: ../../network/isdn.pm_.c:179
 msgid "Europe protocol (EDSS1)"
 msgstr "Giao thức châu Âu (EDSS1)"
 
-#: ../../network/isdn.pm_.c:185
+#: ../../network/isdn.pm_.c:181
 msgid "Protocol for the rest of the world"
 msgstr "Giao thức cho phần còn lại của thế giới"
 
-#: ../../network/isdn.pm_.c:185
+#: ../../network/isdn.pm_.c:181
 msgid ""
 "Protocol for the rest of the world\n"
 "No D-Channel (leased lines)"
@@ -7152,32 +6906,32 @@ msgstr ""
 "Giao thức cho phần còn lại của thế giới \n"
 " không có D-Channel (đường truyền thuê)"
 
-#: ../../network/isdn.pm_.c:189
+#: ../../network/isdn.pm_.c:185
 msgid "Which protocol do you want to use?"
 msgstr "Bạn muốn sử dụng giao thức nào?"
 
-#: ../../network/isdn.pm_.c:200
+#: ../../network/isdn.pm_.c:196
 #, c-format
 msgid "Found \"%s\" interface do you want to use it ?"
 msgstr "Tìm thấy giao diện \"%s\" , bạn có muốn dùng không ?"
 
-#: ../../network/isdn.pm_.c:207
+#: ../../network/isdn.pm_.c:203
 msgid "What kind of card do you have?"
 msgstr "Bạn có loại card nào ?"
 
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
 msgid "I don't know"
 msgstr "Tôi không biết"
 
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: ../../network/isdn.pm_.c:208
+#: ../../network/isdn.pm_.c:204
 msgid "PCI"
 msgstr "PCI"
 
-#: ../../network/isdn.pm_.c:214
+#: ../../network/isdn.pm_.c:210
 msgid ""
 "\n"
 "If you have an ISA card, the values on the next screen should be right.\n"
@@ -7190,19 +6944,19 @@ msgstr ""
 "\n"
 "Nếu bạn có card PCMCIA, bạn cần biết thông số IRQ và IO của card.\n"
 
-#: ../../network/isdn.pm_.c:218
+#: ../../network/isdn.pm_.c:214
 msgid "Abort"
 msgstr "Hủy bỏ"
 
-#: ../../network/isdn.pm_.c:218
+#: ../../network/isdn.pm_.c:214
 msgid "Continue"
 msgstr "Tiếp tục"
 
-#: ../../network/isdn.pm_.c:224
+#: ../../network/isdn.pm_.c:220
 msgid "Which is your ISDN card?"
 msgstr "Cái nào là card ISDN của bạn?"
 
-#: ../../network/isdn.pm_.c:243
+#: ../../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."
@@ -7210,58 +6964,85 @@ msgstr ""
 "Phát hiện ra card ISDN PCI, nhưng không biết loại nào. Hãy chọn một card PCI "
 "ở màn hình tiếp theo."
 
-#: ../../network/isdn.pm_.c:252
+#: ../../network/isdn.pm_.c:248
 msgid "No ISDN PCI card found. Please select one on the next screen."
 msgstr "Không tìm được card ISDN PCI. Hãy chọn ở màn hình tiếp theo"
 
-#: ../../network/modem.pm_.c:39
+#: ../../network/modem.pm_.c:57
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Hãy chọn cổng nối tiếp (serial) nối với modem của bạn."
 
-#: ../../network/modem.pm_.c:44
+#: ../../network/modem.pm_.c:67
 msgid "Dialup options"
 msgstr "Tùy chọn kết nối quay số"
 
-#: ../../network/modem.pm_.c:45 ../../standalone/drakconnect_.c:621
+#: ../../network/modem.pm_.c:68 ../../standalone/drakconnect_.c:619
 msgid "Connection name"
 msgstr "Tên kết nối"
 
-#: ../../network/modem.pm_.c:46 ../../standalone/drakconnect_.c:622
+#: ../../network/modem.pm_.c:69 ../../standalone/drakconnect_.c:620
 msgid "Phone number"
 msgstr "Số điện thoại"
 
-#: ../../network/modem.pm_.c:47 ../../standalone/drakconnect_.c:623
+#: ../../network/modem.pm_.c:70 ../../standalone/drakconnect_.c:621
 msgid "Login ID"
 msgstr "ID đăng nhập"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
 msgid "CHAP"
 msgstr "CHAP"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
 msgid "PAP"
 msgstr "PAP"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
 msgid "Script-based"
 msgstr "Script-based"
 
-#: ../../network/modem.pm_.c:49 ../../standalone/drakconnect_.c:625
+#: ../../network/modem.pm_.c:72 ../../standalone/drakconnect_.c:623
 msgid "Terminal-based"
 msgstr "Terminal-based"
 
-#: ../../network/modem.pm_.c:50 ../../standalone/drakconnect_.c:626
+#: ../../network/modem.pm_.c:73 ../../standalone/drakconnect_.c:624
 msgid "Domain name"
 msgstr "Tên miền"
 
-#: ../../network/modem.pm_.c:51 ../../standalone/drakconnect_.c:627
+#: ../../network/modem.pm_.c:74 ../../standalone/drakconnect_.c:625
 msgid "First DNS Server (optional)"
 msgstr "Máy chủ DNS thứ nhất"
 
-#: ../../network/modem.pm_.c:52 ../../standalone/drakconnect_.c:628
+#: ../../network/modem.pm_.c:75 ../../standalone/drakconnect_.c:626
 msgid "Second DNS Server (optional)"
 msgstr "Máy chủ DNS thứ hai"
 
+#: ../../network/modem.pm_.c:95
+msgid ""
+"Your modem isn't supported by the system.\n"
+"Take a look at http://www.linmodems.org"
+msgstr ""
+"Hệ thống không hỗ trợ modem của bạn.\n"
+"Hãy xem tại http://www.linmodems.org"
+
+#: ../../network/modem.pm_.c:97
+#, c-format
+msgid ""
+"\"%s\" based winmodem detected, do you want to install needed software ?"
+msgstr ""
+"Phát hiện winmodem dựa trên \"%s\", có cài đặt phần mềm cần thiết không ?"
+
+#: ../../network/modem.pm_.c:97
+msgid "Do nothing"
+msgstr "Không làm gì"
+
+#: ../../network/modem.pm_.c:97
+msgid "Install rpm"
+msgstr "Cài đặt rpm"
+
+#: ../../network/modem.pm_.c:97
+msgid "Title"
+msgstr "Tiêu đề"
+
 #: ../../network/netconnect.pm_.c:29
 msgid ""
 "\n"
@@ -7298,24 +7079,24 @@ msgstr "Hiện tại bạn chưa kết nối vào Internet"
 msgid "Connect"
 msgstr "Kết nối"
 
-#: ../../network/netconnect.pm_.c:38
+#: ../../network/netconnect.pm_.c:37
 msgid "Disconnect"
 msgstr "Ngắt kết nối"
 
-#: ../../network/netconnect.pm_.c:40
+#: ../../network/netconnect.pm_.c:38
 msgid "Configure the connection"
 msgstr "Cấu hình kết nối"
 
-#: ../../network/netconnect.pm_.c:45
+#: ../../network/netconnect.pm_.c:41
 msgid "Internet connection & configuration"
 msgstr "Kết nối Internet và cấu hình"
 
-#: ../../network/netconnect.pm_.c:95
+#: ../../network/netconnect.pm_.c:94
 #, c-format
 msgid "We are now going to configure the %s connection."
 msgstr "Bây giờ sẽ cấu hình kết nối %s."
 
-#: ../../network/netconnect.pm_.c:104
+#: ../../network/netconnect.pm_.c:103
 #, c-format
 msgid ""
 "\n"
@@ -7334,12 +7115,12 @@ msgstr ""
 "\n"
 "Nhấn OK để tiếp tục."
 
-#: ../../network/netconnect.pm_.c:133 ../../network/netconnect.pm_.c:251
-#: ../../network/netconnect.pm_.c:271 ../../network/tools.pm_.c:63
+#: ../../network/netconnect.pm_.c:132 ../../network/netconnect.pm_.c:272
+#: ../../network/netconnect.pm_.c:292 ../../network/tools.pm_.c:77
 msgid "Network Configuration"
 msgstr "Cấu Hình Mạng"
 
-#: ../../network/netconnect.pm_.c:134
+#: ../../network/netconnect.pm_.c:133
 msgid ""
 "Because you are doing a network installation, your network is already "
 "configured.\n"
@@ -7350,7 +7131,7 @@ msgstr ""
 "Nhấn OK để giữ cấu hình của bạn, hoặc Bỏ qua để cấu hình lại kết nối "
 "Internet và mạng.\n"
 
-#: ../../network/netconnect.pm_.c:160
+#: ../../network/netconnect.pm_.c:157
 msgid ""
 "Welcome to The Network Configuration Wizard.\n"
 "\n"
@@ -7362,72 +7143,75 @@ msgstr ""
 "Chúng ta sắp cấu hình kết nối internet/mạng. Nếu bạn không\n"
 "muốn dùng chức năng dò tìm tự động, hãy bỏ chọn ở hộp kiểm.\n"
 
-#: ../../network/netconnect.pm_.c:166
+#: ../../network/netconnect.pm_.c:163
 msgid "Choose the profile to configure"
 msgstr "Chọn lý lịch để cấu hình"
 
-#: ../../network/netconnect.pm_.c:167
+#: ../../network/netconnect.pm_.c:164
 msgid "Use auto detection"
 msgstr "Dùng chức năng dò tìm tự động"
 
-#: ../../network/netconnect.pm_.c:168 ../../printerdrake.pm_.c:3203
-#: ../../standalone/drakconnect_.c:274 ../../standalone/drakconnect_.c:277
-#: ../../standalone/drakfloppy_.c:146
+#: ../../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 "Chế độ Chuyên Gia"
 
-#: ../../network/netconnect.pm_.c:174 ../../printerdrake.pm_.c:399
+#: ../../network/netconnect.pm_.c:171 ../../printer/printerdrake.pm_.c:364
 msgid "Detecting devices..."
 msgstr "Đang dò tìm thiết bị..."
 
-#: ../../network/netconnect.pm_.c:185 ../../network/netconnect.pm_.c:194
+#: ../../network/netconnect.pm_.c:214
 msgid "Normal modem connection"
 msgstr "Kết nối modem bình thường"
 
-#: ../../network/netconnect.pm_.c:185 ../../network/netconnect.pm_.c:194
+#: ../../network/netconnect.pm_.c:214
 #, c-format
 msgid "detected on port %s"
 msgstr "dò tìm được tại cổng %s"
 
-#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
+#: ../../network/netconnect.pm_.c:215
+msgid "Winmodem connection"
+msgstr "Kết nối winmodem"
+
+#: ../../network/netconnect.pm_.c:215 ../../network/netconnect.pm_.c:217
+msgid "detected"
+msgstr "dò tìm được"
+
+#: ../../network/netconnect.pm_.c:216
 msgid "ISDN connection"
 msgstr "Kết nối ISDN"
 
-#: ../../network/netconnect.pm_.c:186 ../../network/netconnect.pm_.c:195
+#: ../../network/netconnect.pm_.c:216
 #, c-format
 msgid "detected %s"
 msgstr "dò tìm được %s"
 
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
+#: ../../network/netconnect.pm_.c:217
 msgid "ADSL connection"
 msgstr "Kết nối ADSL"
 
-#: ../../network/netconnect.pm_.c:187 ../../network/netconnect.pm_.c:196
-#, c-format
-msgid "detected on interface %s"
-msgstr "dò tìm được trên giao diện %s"
-
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
+#: ../../network/netconnect.pm_.c:218
 msgid "Cable connection"
 msgstr "Kết nối cáp"
 
-#: ../../network/netconnect.pm_.c:188 ../../network/netconnect.pm_.c:197
+#: ../../network/netconnect.pm_.c:218
 msgid "cable connection detected"
 msgstr "Phát hiện kết nối cáp"
 
-#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
+#: ../../network/netconnect.pm_.c:219
 msgid "LAN connection"
 msgstr "Kết nối LAN"
 
-#: ../../network/netconnect.pm_.c:189 ../../network/netconnect.pm_.c:198
+#: ../../network/netconnect.pm_.c:219
 msgid "ethernet card(s) detected"
 msgstr "Dò tìm thấy card ethernet"
 
-#: ../../network/netconnect.pm_.c:201
+#: ../../network/netconnect.pm_.c:222
 msgid "Choose the connection you want to configure"
 msgstr "Chọn kết nối để cấu hình"
 
-#: ../../network/netconnect.pm_.c:225
+#: ../../network/netconnect.pm_.c:246
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
 "Choose the one you want to use.\n"
@@ -7437,23 +7221,23 @@ msgstr ""
 "Hãy chọn một đường kết nối bạn muốn dùng.\n"
 "\n"
 
-#: ../../network/netconnect.pm_.c:226
+#: ../../network/netconnect.pm_.c:247
 msgid "Internet connection"
 msgstr "Kết nối Internet"
 
-#: ../../network/netconnect.pm_.c:232
+#: ../../network/netconnect.pm_.c:253
 msgid "Do you want to start the connection at boot?"
 msgstr "Bạn có muốn bật kết nối khi khởi động máy tính?"
 
-#: ../../network/netconnect.pm_.c:246
+#: ../../network/netconnect.pm_.c:267
 msgid "Network configuration"
 msgstr "Cấu hình mạng"
 
-#: ../../network/netconnect.pm_.c:247
+#: ../../network/netconnect.pm_.c:268
 msgid "The network needs to be restarted"
 msgstr "Cần khởi động lại Mạng"
 
-#: ../../network/netconnect.pm_.c:251
+#: ../../network/netconnect.pm_.c:272
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -7464,7 +7248,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../network/netconnect.pm_.c:261
+#: ../../network/netconnect.pm_.c:282
 msgid ""
 "Congratulations, the network and Internet configuration is finished.\n"
 "The configuration will now be applied to your system.\n"
@@ -7474,7 +7258,7 @@ msgstr ""
 "Cấu hình bây giờ sẽ được áp dụng cho hệ thống.\n"
 "\n"
 
-#: ../../network/netconnect.pm_.c:265
+#: ../../network/netconnect.pm_.c:286
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
 "avoid any hostname-related problems."
@@ -7482,7 +7266,7 @@ msgstr ""
 "Sau khi xong, bạn nên khởi động lại môi trường X để tránh mọi sự cố liên "
 "quan tới tên máy chủ (hostname)."
 
-#: ../../network/netconnect.pm_.c:266
+#: ../../network/netconnect.pm_.c:287
 msgid ""
 "Problems occured during configuration.\n"
 "Test your connection via net_monitor or mcc. If your connection doesn't "
@@ -7492,7 +7276,7 @@ msgstr ""
 "Chạy thử kết nối qua net_monitor hay mcc. Nếu kết nối không hoạt động, có "
 "thể sẽ phải thực hiện lại việc cấu hình"
 
-#: ../../network/network.pm_.c:291
+#: ../../network/network.pm_.c:278
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
 "Internet.\n"
@@ -7503,7 +7287,7 @@ msgstr ""
 "Đơn giản chỉ việc đồng ý giữ thiết bị đã được cấu hình này.\n"
 "Thay đổi các trường dưới đây sẽ ghi đè lên cấu hình này."
 
-#: ../../network/network.pm_.c:296
+#: ../../network/network.pm_.c:283
 msgid ""
 "Please enter the IP configuration for this machine.\n"
 "Each item should be entered as an IP address in dotted-decimal\n"
@@ -7513,43 +7297,59 @@ msgstr ""
 "Mỗi một mục cần được điền vào một địa chỉ IP là ký hiệu thập\n"
 "phân và dấu chấm đầy đủ (VD: 1.2.3.4)."
 
-#: ../../network/network.pm_.c:306 ../../network/network.pm_.c:307
+#: ../../network/network.pm_.c:293 ../../network/network.pm_.c:294
 #, c-format
 msgid "Configuring network device %s"
 msgstr "Đang cấu hình thiết bị mạng %s"
 
-#: ../../network/network.pm_.c:307
+#: ../../network/network.pm_.c:294
 #, c-format
 msgid " (driver %s)"
 msgstr " (driver %s)"
 
-#: ../../network/network.pm_.c:309 ../../standalone/drakconnect_.c:231
-#: ../../standalone/drakconnect_.c:467
+#: ../../network/network.pm_.c:296 ../../standalone/drakconnect_.c:228
+#: ../../standalone/drakconnect_.c:464
 msgid "IP address"
 msgstr "Địa chỉ IP"
 
-#: ../../network/network.pm_.c:310 ../../standalone/drakconnect_.c:468
-#: ../../standalone/drakgw_.c:295
+#: ../../network/network.pm_.c:297 ../../standalone/drakconnect_.c:465
+#: ../../standalone/drakgw_.c:291
 msgid "Netmask"
 msgstr "Mặt nạ mạng"
 
-#: ../../network/network.pm_.c:311
+#: ../../network/network.pm_.c:298
 msgid "(bootp/dhcp)"
 msgstr "(bootp/dhcp)"
 
-#: ../../network/network.pm_.c:311
+#: ../../network/network.pm_.c:298
 msgid "Automatic IP"
 msgstr "IP tự động"
 
-#: ../../network/network.pm_.c:312
+#: ../../network/network.pm_.c:299
 msgid "Start at boot"
 msgstr "Chạy lúc khởi động "
 
-#: ../../network/network.pm_.c:333 ../../printerdrake.pm_.c:875
+#: ../../network/network.pm_.c:320 ../../printer/printerdrake.pm_.c:812
 msgid "IP address should be in format 1.2.3.4"
 msgstr "Địa chỉ IP phải có dạng 1.2.3.4"
 
-#: ../../network/network.pm_.c:363
+#: ../../network/network.pm_.c:326
+msgid ""
+"Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
+"frequency), or add enough '0'."
+msgstr ""
+"Tần số nên có tiếp vị ngữ k, M hay G (ví dụ: \"2.46G\" là cho tần số 2.46 "
+"GHz), hay thêm đủ '0' ."
+
+#: ../../network/network.pm_.c:330
+msgid ""
+"Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
+"enough '0'."
+msgstr ""
+"Rate nên có tiếp vị ngữ k, M hay G (ví dụ: \"11M\" cho 11M), hoặc thêm đủ "
+"'0' ."
+
+#: ../../network/network.pm_.c:350
 msgid ""
 "Please enter your host name.\n"
 "Your host name should be a fully-qualified host name,\n"
@@ -7561,56 +7361,56 @@ msgstr ""
 " ``mybox.mylab.myco.com''.\n"
 "Bạn có thể điền địa chỉ IP của cổng kết nối nếu bạn biết"
 
-#: ../../network/network.pm_.c:368
+#: ../../network/network.pm_.c:355
 msgid "DNS server"
 msgstr "Máy chủ DNS"
 
-#: ../../network/network.pm_.c:369
+#: ../../network/network.pm_.c:356
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Gateway (ví dụ: %s)"
 
-#: ../../network/network.pm_.c:371
+#: ../../network/network.pm_.c:358
 msgid "Gateway device"
 msgstr "Thiết bị Gateway"
 
-#: ../../network/network.pm_.c:376
+#: ../../network/network.pm_.c:363
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Địa chỉ máy chủ DNS nên có dạng 1.2.3.4"
 
-#: ../../network/network.pm_.c:380
+#: ../../network/network.pm_.c:367
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Địa chỉ Gateway nên có dạng 1.2.3.4"
 
-#: ../../network/network.pm_.c:394
+#: ../../network/network.pm_.c:381
 msgid "Proxies configuration"
 msgstr "Cấu hình máy chủ ủy nhiệm"
 
-#: ../../network/network.pm_.c:395
+#: ../../network/network.pm_.c:382
 msgid "HTTP proxy"
 msgstr "Máy chủ ủy nhiệm HTTP"
 
-#: ../../network/network.pm_.c:396
+#: ../../network/network.pm_.c:383
 msgid "FTP proxy"
 msgstr "Máy chủ ủy nhiệm FTP"
 
-#: ../../network/network.pm_.c:397
+#: ../../network/network.pm_.c:384
 msgid "Track network card id (useful for laptops)"
 msgstr "Kiểm tra định danh card mạng (hữu ích cho laptop)"
 
-#: ../../network/network.pm_.c:400
+#: ../../network/network.pm_.c:387
 msgid "Proxy should be http://..."
 msgstr "Máy chủ ủy nhiệm nên là http://..."
 
-#: ../../network/network.pm_.c:401 ../../proxy.pm_.c:65
+#: ../../network/network.pm_.c:388
 msgid "Url should begin with 'ftp:' or 'http:'"
 msgstr "URL nên bắt đầu bằng 'fpt:' hay 'http:'"
 
-#: ../../network/shorewall.pm_.c:25
+#: ../../network/shorewall.pm_.c:26
 msgid "Firewalling configuration detected!"
 msgstr "Phát hiện ra cấu hình tường lửa!"
 
-#: ../../network/shorewall.pm_.c:26
+#: ../../network/shorewall.pm_.c:27
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
 "need some manual fix after installation."
@@ -7618,27 +7418,27 @@ msgstr ""
 "Cảnh báo! Cấu hình tường lửa hiện thời được phát hiện. Có thể bạn cần ấn "
 "định thêm một số chi tiết sau khi cài đặt."
 
-#: ../../network/tools.pm_.c:41
+#: ../../network/tools.pm_.c:57
 msgid "Internet configuration"
 msgstr "Cấu hình Internet"
 
-#: ../../network/tools.pm_.c:42
+#: ../../network/tools.pm_.c:58
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Bạn có muốn thử kết nối Internet bây giờ không?"
 
-#: ../../network/tools.pm_.c:46 ../../standalone/drakconnect_.c:196
+#: ../../network/tools.pm_.c:61 ../../standalone/drakconnect_.c:193
 msgid "Testing your connection..."
 msgstr "Đang kiểm tra kết nối..."
 
-#: ../../network/tools.pm_.c:56
+#: ../../network/tools.pm_.c:70
 msgid "The system is now connected to Internet."
 msgstr "Hệ thống bây giờ được nối với Internet."
 
-#: ../../network/tools.pm_.c:57
+#: ../../network/tools.pm_.c:71
 msgid "For security reason, it will be disconnected now."
 msgstr "Vì lý do bảo mật, bây giờ ngắt kết nối."
 
-#: ../../network/tools.pm_.c:58
+#: ../../network/tools.pm_.c:72
 msgid ""
 "The system doesn't seem to be connected to internet.\n"
 "Try to reconfigure your connection."
@@ -7646,92 +7446,92 @@ msgstr ""
 "Hệ thống không có vẻ như đang kết nối với Internet.\n"
 "Thử cấu hình lại kết nối."
 
-#: ../../network/tools.pm_.c:82
+#: ../../network/tools.pm_.c:96
 msgid "Connection Configuration"
 msgstr "Cấu hình kết nối"
 
-#: ../../network/tools.pm_.c:83
+#: ../../network/tools.pm_.c:97
 msgid "Please fill or check the field below"
 msgstr "Hãy điền hoặc kiểm tra trường dưới đây"
 
-#: ../../network/tools.pm_.c:85 ../../standalone/drakconnect_.c:607
+#: ../../network/tools.pm_.c:99 ../../standalone/drakconnect_.c:605
 msgid "Card IRQ"
 msgstr "Card IRQ"
 
-#: ../../network/tools.pm_.c:86 ../../standalone/drakconnect_.c:608
+#: ../../network/tools.pm_.c:100 ../../standalone/drakconnect_.c:606
 msgid "Card mem (DMA)"
 msgstr "Card mem (DMA)"
 
-#: ../../network/tools.pm_.c:87 ../../standalone/drakconnect_.c:609
+#: ../../network/tools.pm_.c:101 ../../standalone/drakconnect_.c:607
 msgid "Card IO"
 msgstr "Card IO"
 
-#: ../../network/tools.pm_.c:88 ../../standalone/drakconnect_.c:610
+#: ../../network/tools.pm_.c:102 ../../standalone/drakconnect_.c:608
 msgid "Card IO_0"
 msgstr "Card IO_0"
 
-#: ../../network/tools.pm_.c:89 ../../standalone/drakconnect_.c:611
+#: ../../network/tools.pm_.c:103 ../../standalone/drakconnect_.c:609
 msgid "Card IO_1"
 msgstr "Card IO_1"
 
-#: ../../network/tools.pm_.c:90 ../../standalone/drakconnect_.c:612
+#: ../../network/tools.pm_.c:104 ../../standalone/drakconnect_.c:610
 msgid "Your personal phone number"
 msgstr "Số điện thoại cá nhân của bạn"
 
-#: ../../network/tools.pm_.c:91 ../../standalone/drakconnect_.c:613
+#: ../../network/tools.pm_.c:105 ../../standalone/drakconnect_.c:611
 msgid "Provider name (ex provider.net)"
 msgstr "Tên nhà cung cấp (VD: provider.net)"
 
-#: ../../network/tools.pm_.c:92 ../../standalone/drakconnect_.c:614
+#: ../../network/tools.pm_.c:106 ../../standalone/drakconnect_.c:612
 msgid "Provider phone number"
 msgstr "Số điện thoại của nhà cung cấp"
 
-#: ../../network/tools.pm_.c:93 ../../standalone/drakconnect_.c:615
+#: ../../network/tools.pm_.c:107 ../../standalone/drakconnect_.c:613
 msgid "Provider dns 1 (optional)"
 msgstr "Tên miền thứ nhất của nhà cung cấp"
 
-#: ../../network/tools.pm_.c:94 ../../standalone/drakconnect_.c:616
+#: ../../network/tools.pm_.c:108 ../../standalone/drakconnect_.c:614
 msgid "Provider dns 2 (optional)"
 msgstr "Tên miền thứ hai của nhà cung cấp"
 
-#: ../../network/tools.pm_.c:95
+#: ../../network/tools.pm_.c:109
 msgid "Choose your country"
 msgstr "Chọn quốc gia của bạn"
 
-#: ../../network/tools.pm_.c:96 ../../standalone/drakconnect_.c:619
+#: ../../network/tools.pm_.c:110 ../../standalone/drakconnect_.c:617
 msgid "Dialing mode"
 msgstr "Chế độ quay số"
 
-#: ../../network/tools.pm_.c:97 ../../standalone/drakconnect_.c:631
+#: ../../network/tools.pm_.c:111 ../../standalone/drakconnect_.c:629
 msgid "Connection speed"
 msgstr "Tốc độ kết nối"
 
-#: ../../network/tools.pm_.c:98 ../../standalone/drakconnect_.c:632
+#: ../../network/tools.pm_.c:112 ../../standalone/drakconnect_.c:630
 msgid "Connection timeout (in sec)"
 msgstr "Hết thời gian kết nối (theo giây):"
 
-#: ../../network/tools.pm_.c:99 ../../standalone/drakconnect_.c:617
+#: ../../network/tools.pm_.c:113 ../../standalone/drakconnect_.c:615
 msgid "Account Login (user name)"
 msgstr "Account đăng nhập (tên người dùng)"
 
-#: ../../network/tools.pm_.c:100 ../../standalone/drakconnect_.c:618
-#: ../../standalone/drakconnect_.c:649
+#: ../../network/tools.pm_.c:114 ../../standalone/drakconnect_.c:616
+#: ../../standalone/drakconnect_.c:647
 msgid "Account Password"
 msgstr "Mật khẩu account"
 
-#: ../../network/tools.pm_.c:104 ../../network/tools.pm_.c:118
+#: ../../network/tools.pm_.c:118 ../../network/tools.pm_.c:132
 msgid "United Kingdom"
 msgstr "Anh Quốc"
 
-#: ../../partition_table.pm_.c:602
+#: ../../partition_table.pm_.c:603
 msgid "mount failed: "
 msgstr "Gắn kết không được: "
 
-#: ../../partition_table.pm_.c:666
+#: ../../partition_table.pm_.c:667
 msgid "Extended partition not supported on this platform"
 msgstr "Phân vùng mở rộng không được hỗ trợ trên nền tảng này"
 
-#: ../../partition_table.pm_.c:684
+#: ../../partition_table.pm_.c:685
 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 "
@@ -7750,12 +7550,12 @@ msgstr "Khôi phục từ tập tin %s không được: %s"
 msgid "Bad backup file"
 msgstr "Tập tin sao lưu hỏng"
 
-#: ../../partition_table.pm_.c:798
+#: ../../partition_table.pm_.c:796
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Lỗi ghi vào tập tin %s"
 
-#: ../../partition_table/raw.pm_.c:189
+#: ../../partition_table/raw.pm_.c:192
 msgid ""
 "Something bad is happening on your drive. \n"
 "A test to check the integrity of data has failed. \n"
@@ -7785,182 +7585,183 @@ msgstr "tuyệt"
 msgid "maybe"
 msgstr "có thể là"
 
-#: ../../printer.pm_.c:26
-msgid "CUPS - Common Unix Printing System"
-msgstr "CUPS - Hệ thống in ấn Unix thông dụng"
+#: ../../printer/data.pm_.c:18
+msgid "PDQ - Print, Don't Queue"
+msgstr "PDQ - In, không xếp hàng"
 
-#: ../../printer.pm_.c:27
-msgid "LPRng - LPR New Generation"
-msgstr "Thế hệ LPRng - LPR mới"
+#: ../../printer/data.pm_.c:19
+msgid "PDQ"
+msgstr "PDQ"
 
-#: ../../printer.pm_.c:28
+#: ../../printer/data.pm_.c:30
 msgid "LPD - Line Printer Daemon"
 msgstr "LPD - Daemon in ấn theo tuyến"
 
-#: ../../printer.pm_.c:29
-msgid "PDQ - Print, Don't Queue"
-msgstr "PDQ - In, không xếp hàng"
+#: ../../printer/data.pm_.c:31
+msgid "LPD"
+msgstr "LPD"
 
-#: ../../printer.pm_.c:34 ../../printer.pm_.c:1181
-msgid "CUPS"
-msgstr "CUPS"
+#: ../../printer/data.pm_.c:51
+msgid "LPRng - LPR New Generation"
+msgstr "Thế hệ LPRng - LPR mới"
 
-#: ../../printer.pm_.c:35
+#: ../../printer/data.pm_.c:52
 msgid "LPRng"
 msgstr "LPRng"
 
-#: ../../printer.pm_.c:36
-msgid "LPD"
-msgstr "LPD"
+#: ../../printer/data.pm_.c:75
+msgid "CUPS - Common Unix Printing System"
+msgstr "CUPS - Hệ thống in ấn Unix thông dụng"
 
-#: ../../printer.pm_.c:37
-msgid "PDQ"
-msgstr "PDQ"
+#: ../../printer/data.pm_.c:76 ../../printer/main.pm_.c:677
+msgid "CUPS"
+msgstr "CUPS"
+
+#: ../../printer/detect.pm_.c:80 ../../printer/detect.pm_.c:213
+#: ../../printer/detect.pm_.c:250
+msgid "Unknown Model"
+msgstr "Model không xác định"
 
-#: ../../printer.pm_.c:49
+#: ../../printer/main.pm_.c:26
 msgid "Local printer"
 msgstr "Máy in cục bộ"
 
-#: ../../printer.pm_.c:50
+#: ../../printer/main.pm_.c:27
 msgid "Remote printer"
 msgstr "Máy in ở xa"
 
-#: ../../printer.pm_.c:51
+#: ../../printer/main.pm_.c:28
 msgid "Printer on remote CUPS server"
 msgstr "Máy in của máy chủ CUPS ở xa"
 
-#: ../../printer.pm_.c:52 ../../printerdrake.pm_.c:898
+#: ../../printer/main.pm_.c:29 ../../printer/printerdrake.pm_.c:835
 msgid "Printer on remote lpd server"
 msgstr "Máy in của máy chủ LPD ở xa"
 
-#: ../../printer.pm_.c:53
+#: ../../printer/main.pm_.c:30
 msgid "Network printer (TCP/Socket)"
 msgstr "Máy in mạng (TCP/Socket)"
 
-#: ../../printer.pm_.c:54
+#: ../../printer/main.pm_.c:31
 msgid "Printer on SMB/Windows 95/98/NT server"
 msgstr "Máy in của máy chủ SMB/Windows 95/98/NT"
 
-#: ../../printer.pm_.c:55
+#: ../../printer/main.pm_.c:32
 msgid "Printer on NetWare server"
 msgstr "Máy in của máy chủ NetWare"
 
-#: ../../printer.pm_.c:56 ../../printerdrake.pm_.c:902
+#: ../../printer/main.pm_.c:33 ../../printer/printerdrake.pm_.c:839
 msgid "Enter a printer device URI"
 msgstr "Hãy nhập thiết bị in URI"
 
-#: ../../printer.pm_.c:57
+#: ../../printer/main.pm_.c:34
 msgid "Pipe job into a command"
 msgstr "Pipe (đặt ống dẫn) vào trong lệnh"
 
-#: ../../printer.pm_.c:346 ../../printer.pm_.c:388 ../../printer.pm_.c:570
-msgid "Unknown Model"
-msgstr "Model không xác định"
-
-#: ../../printer.pm_.c:791 ../../printer.pm_.c:982 ../../printer.pm_.c:1374
-#: ../../printerdrake.pm_.c:2305 ../../printerdrake.pm_.c:3471
+#: ../../printer/main.pm_.c:290 ../../printer/main.pm_.c:478
+#: ../../printer/main.pm_.c:794 ../../printer/printerdrake.pm_.c:3228
 msgid "Unknown model"
 msgstr "Kiểu không xác định"
 
-#: ../../printer.pm_.c:819
+#: ../../printer/main.pm_.c:317
 msgid "Local Printers"
 msgstr "Các máy in cục bộ"
 
-#: ../../printer.pm_.c:821 ../../printer.pm_.c:1182
+#: ../../printer/main.pm_.c:319 ../../printer/main.pm_.c:678
 msgid "Remote Printers"
 msgstr "Các máy in ở xa"
 
-#: ../../printer.pm_.c:828 ../../printerdrake.pm_.c:417
+#: ../../printer/main.pm_.c:326 ../../printer/printerdrake.pm_.c:381
 #, c-format
 msgid " on parallel port \\/*%s"
 msgstr " ở cổng song song \\/*%s"
 
-#: ../../printer.pm_.c:831 ../../printerdrake.pm_.c:419
+#: ../../printer/main.pm_.c:329 ../../printer/printerdrake.pm_.c:383
 #, c-format
 msgid ", USB printer \\/*%s"
 msgstr ", máy in USB \\/*%s"
 
-#: ../../printer.pm_.c:836
+#: ../../printer/main.pm_.c:334
 #, c-format
 msgid ", multi-function device on parallel port \\/*%s"
 msgstr ", thiết bị đa năng ở cổng song song \\/*%s"
 
-#: ../../printer.pm_.c:839
+#: ../../printer/main.pm_.c:337
 msgid ", multi-function device on USB"
 msgstr ", thiết bị đa năng trên USB"
 
-#: ../../printer.pm_.c:841
+#: ../../printer/main.pm_.c:339
 msgid ", multi-function device on HP JetDirect"
 msgstr ", thiết bị đa năng trên HP JetDirect"
 
-#: ../../printer.pm_.c:843
+#: ../../printer/main.pm_.c:341
 msgid ", multi-function device"
 msgstr ", thiết bị đa năng"
 
-#: ../../printer.pm_.c:846
+#: ../../printer/main.pm_.c:344
 #, c-format
 msgid ", printing to %s"
 msgstr ", đang in tới %s"
 
-#: ../../printer.pm_.c:848
+#: ../../printer/main.pm_.c:346
 #, c-format
 msgid " on LPD server \"%s\", printer \"%s\""
 msgstr " trên máy chủ LPD \"%s\", máy in \"%s\""
 
-#: ../../printer.pm_.c:850
+#: ../../printer/main.pm_.c:348
 #, c-format
 msgid ", TCP/IP host \"%s\", port %s"
 msgstr ", TCP/IP chủ \"%s\", cổng %s"
 
-#: ../../printer.pm_.c:854
+#: ../../printer/main.pm_.c:352
 #, c-format
 msgid " on SMB/Windows server \"%s\", share \"%s\""
 msgstr " trên máy chủ SMB/Windows \"%s\", chia sẻ \"%s\""
 
-#: ../../printer.pm_.c:858
+#: ../../printer/main.pm_.c:356
 #, c-format
 msgid " on Novell server \"%s\", printer \"%s\""
 msgstr " trên máy chủ Novell \"%s\", máy in \"%s\""
 
-#: ../../printer.pm_.c:860
+#: ../../printer/main.pm_.c:358
 #, c-format
 msgid ", using command %s"
 msgstr ", dùng trong lệnh %s"
 
-#: ../../printer.pm_.c:979 ../../printerdrake.pm_.c:1701
+#: ../../printer/main.pm_.c:475 ../../printer/printerdrake.pm_.c:1603
 msgid "Raw printer (No driver)"
 msgstr "Máy in Raw (không có driver)"
 
-#: ../../printer.pm_.c:1151
+#: ../../printer/main.pm_.c:647
 #, c-format
 msgid "(on %s)"
 msgstr "(trên %s)"
 
-#: ../../printer.pm_.c:1153
+#: ../../printer/main.pm_.c:649
 msgid "(on this machine)"
 msgstr "(trên máy tính này)"
 
-#: ../../printer.pm_.c:1178
+#: ../../printer/main.pm_.c:674
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "Trên máy chủ CUPS \"%s\""
 
-#: ../../printer.pm_.c:1184 ../../printerdrake.pm_.c:3123
-#: ../../printerdrake.pm_.c:3134 ../../printerdrake.pm_.c:3360
-#: ../../printerdrake.pm_.c:3412 ../../printerdrake.pm_.c:3438
-#: ../../printerdrake.pm_.c:3613 ../../printerdrake.pm_.c:3615
+#: ../../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 " (Mặc định)"
 
-#: ../../printerdrake.pm_.c:25
+#: ../../printer/printerdrake.pm_.c:27
 msgid "Select Printer Connection"
 msgstr "Chọn Kết Nối Máy In"
 
-#: ../../printerdrake.pm_.c:26
+#: ../../printer/printerdrake.pm_.c:28
 msgid "How is the printer connected?"
 msgstr "Máy in được kết nối như thế nào?"
 
-#: ../../printerdrake.pm_.c:28
+#: ../../printer/printerdrake.pm_.c:30
 msgid ""
 "\n"
 "Printers on remote CUPS servers you do not have to configure here; these "
@@ -7970,19 +7771,19 @@ msgstr ""
 "Các máy in trên máy chủ CUPS ở xa thì không phải cấu hình tại đây, các máy "
 "in sẽ được phát hiện tự động."
 
-#: ../../printerdrake.pm_.c:36
+#: ../../printer/printerdrake.pm_.c:38
 msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
 msgstr "Tự động phát hiện máy in (cục bộ, TCP/Socket và SMB)"
 
-#: ../../printerdrake.pm_.c:84 ../../printerdrake.pm_.c:3187
+#: ../../printer/printerdrake.pm_.c:81 ../../printer/printerdrake.pm_.c:2950
 msgid "CUPS configuration"
 msgstr "Cấu hình CUPS"
 
-#: ../../printerdrake.pm_.c:85 ../../printerdrake.pm_.c:3188
+#: ../../printer/printerdrake.pm_.c:82 ../../printer/printerdrake.pm_.c:2951
 msgid "Specify CUPS server"
 msgstr "Chỉ định máy chủ CUPS"
 
-#: ../../printerdrake.pm_.c:86
+#: ../../printer/printerdrake.pm_.c:83
 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 "
@@ -8000,7 +7801,7 @@ msgstr ""
 "CUPS và tùy chọn số hiệu cổng để nhận thông tin về máy in từ máy chủ. Nếu "
 "không, hãy để các trường này trống."
 
-#: ../../printerdrake.pm_.c:87
+#: ../../printer/printerdrake.pm_.c:84
 msgid ""
 "\n"
 "Normally, CUPS is automatically configured according to your network "
@@ -8017,53 +7818,53 @@ msgstr ""
 "tin /etc/cups/cupsd.conf . Sau đó, xin đừng quên khởi động lại\n"
 "CUPS (với lệnh: \"service cups restart\")."
 
-#: ../../printerdrake.pm_.c:91
+#: ../../printer/printerdrake.pm_.c:88
 msgid "The IP address should look like 192.168.1.20"
 msgstr "Địa chỉ IP phải có dạng 192.168.1.20"
 
-#: ../../printerdrake.pm_.c:95 ../../printerdrake.pm_.c:1109
+#: ../../printer/printerdrake.pm_.c:92 ../../printer/printerdrake.pm_.c:1041
 msgid "The port number should be an integer!"
 msgstr "Số hiệu cổng nên là một số nguyên !"
 
-#: ../../printerdrake.pm_.c:102
+#: ../../printer/printerdrake.pm_.c:99
 msgid "CUPS server IP"
 msgstr "IP của máy chủ CUPS"
 
-#: ../../printerdrake.pm_.c:103 ../../printerdrake.pm_.c:1129
+#: ../../printer/printerdrake.pm_.c:100 ../../printer/printerdrake.pm_.c:1061
+#: ../../standalone/harddrake2_.c:63
 msgid "Port"
 msgstr "Cổng"
 
-#: ../../printerdrake.pm_.c:105
+#: ../../printer/printerdrake.pm_.c:102
 msgid "Automatic CUPS configuration"
 msgstr "Cấu hình CUPS tự động"
 
-#: ../../printerdrake.pm_.c:177 ../../printerdrake.pm_.c:247
-#: ../../printerdrake.pm_.c:1574 ../../printerdrake.pm_.c:1578
-#: ../../printerdrake.pm_.c:1696 ../../printerdrake.pm_.c:2248
-#: ../../printerdrake.pm_.c:2401 ../../printerdrake.pm_.c:2460
-#: ../../printerdrake.pm_.c:2533 ../../printerdrake.pm_.c:2554
-#: ../../printerdrake.pm_.c:2747 ../../printerdrake.pm_.c:2792
-#: ../../printerdrake.pm_.c:2797 ../../printerdrake.pm_.c:2831
-#: ../../printerdrake.pm_.c:2836 ../../printerdrake.pm_.c:2873
-#: ../../printerdrake.pm_.c:2926 ../../printerdrake.pm_.c:2946
-#: ../../printerdrake.pm_.c:2960 ../../printerdrake.pm_.c:2994
-#: ../../printerdrake.pm_.c:3040 ../../printerdrake.pm_.c:3058
-#: ../../printerdrake.pm_.c:3147 ../../printerdrake.pm_.c:3226
-#: ../../printerdrake.pm_.c:3528 ../../printerdrake.pm_.c:3583
-#: ../../printerdrake.pm_.c:3636 ../../standalone/printerdrake_.c:57
-msgid "Printerdrake"
-msgstr "Printerdrake"
-
-#: ../../printerdrake.pm_.c:178
+#: ../../printer/printerdrake.pm_.c:159
 msgid "Checking your system..."
 msgstr "Đang kiểm tra hệ thống của bạn..."
 
-#: ../../printerdrake.pm_.c:186
+#: ../../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"
+
+#: ../../printer/printerdrake.pm_.c:167
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Không tìm thấy máy in nào được nối trực tiếp với máy tính này"
 
-#: ../../printerdrake.pm_.c:198
+#: ../../printer/printerdrake.pm_.c:179
 msgid ""
 "The following printers\n"
 "\n"
@@ -8071,7 +7872,7 @@ msgstr ""
 "Các máy in sau đây\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:199
+#: ../../printer/printerdrake.pm_.c:180
 msgid ""
 "The following printer\n"
 "\n"
@@ -8079,7 +7880,7 @@ msgstr ""
 "Máy in sau đây\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:201
+#: ../../printer/printerdrake.pm_.c:182
 msgid ""
 "\n"
 "and one unknown printer are "
@@ -8087,7 +7888,7 @@ msgstr ""
 "\n"
 "và một máy in không xác định là "
 
-#: ../../printerdrake.pm_.c:203
+#: ../../printer/printerdrake.pm_.c:184
 #, c-format
 msgid ""
 "\n"
@@ -8096,7 +7897,7 @@ msgstr ""
 "\n"
 "và %d máy in không xác định là "
 
-#: ../../printerdrake.pm_.c:207
+#: ../../printer/printerdrake.pm_.c:187
 msgid ""
 "\n"
 "are "
@@ -8104,7 +7905,7 @@ msgstr ""
 "\n"
 "là "
 
-#: ../../printerdrake.pm_.c:208
+#: ../../printer/printerdrake.pm_.c:187
 msgid ""
 "\n"
 "is "
@@ -8112,11 +7913,11 @@ msgstr ""
 "\n"
 "là "
 
-#: ../../printerdrake.pm_.c:210
+#: ../../printer/printerdrake.pm_.c:189
 msgid "directly connected to your system"
 msgstr "được kết nối trực tiếp vào hệ thống của bạn"
 
-#: ../../printerdrake.pm_.c:213
+#: ../../printer/printerdrake.pm_.c:192
 msgid ""
 "\n"
 "There is one unknown printer directly connected to your system"
@@ -8124,7 +7925,7 @@ msgstr ""
 "\n"
 "Có một máy in không xác định được nối trực tiếp với hệ thống này"
 
-#: ../../printerdrake.pm_.c:215
+#: ../../printer/printerdrake.pm_.c:194
 #, c-format
 msgid ""
 "\n"
@@ -8133,11 +7934,11 @@ msgstr ""
 "\n"
 "Có %d máy in không xác định được nối trực tiếp với hệ thống này"
 
-#: ../../printerdrake.pm_.c:221
+#: ../../printer/printerdrake.pm_.c:200
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr " (Hãy đảm bảo là mọi máy in đã được nối và bật lên).\n"
 
-#: ../../printerdrake.pm_.c:235
+#: ../../printer/printerdrake.pm_.c:214
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
 "printers in the local network?\n"
@@ -8145,19 +7946,19 @@ msgstr ""
 "Bạn có muốn cho phép in trên các máy in kể trên hoặc trên các máy in mạng "
 "hay không?\n"
 
-#: ../../printerdrake.pm_.c:236
+#: ../../printer/printerdrake.pm_.c:215
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "Bạn có muốn cho phép in trên các máy in trong mạng cục bộ không?\n"
 
-#: ../../printerdrake.pm_.c:238
+#: ../../printer/printerdrake.pm_.c:217
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "Bạn có muốn cho phép in trên các máy in kể trên không?\n"
 
-#: ../../printerdrake.pm_.c:239
+#: ../../printer/printerdrake.pm_.c:218
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr "Bạn có chắc là muốn thiết lập việc in trên máy này không?\n"
 
-#: ../../printerdrake.pm_.c:240
+#: ../../printer/printerdrake.pm_.c:219
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -8166,13 +7967,13 @@ msgstr ""
 "Lưu ý: Tùy theo model máy in và hệ thống in, %d MB của phần mềm bổ sung sẽ "
 "được cài đặt."
 
-#: ../../printerdrake.pm_.c:279 ../../printerdrake.pm_.c:291
-#: ../../printerdrake.pm_.c:361 ../../printerdrake.pm_.c:3169
-#: ../../printerdrake.pm_.c:3299
+#: ../../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 "Thêm máy in mới"
 
-#: ../../printerdrake.pm_.c:280
+#: ../../printer/printerdrake.pm_.c:259
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8194,7 +7995,7 @@ msgstr ""
 "cập tới toàn bộ driver máy in sẵn có, tùy chọn driver, và kiểu kết nối của "
 "máy in."
 
-#: ../../printerdrake.pm_.c:293
+#: ../../printer/printerdrake.pm_.c:272
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8232,7 +8033,7 @@ msgstr ""
 " Hãy nhấn \"Tiếp Theo\" khi bạn đã sẵn sàng, và nhấn \"Bỏ Qua\" khi bạn "
 "không muốn thiết lập máy in vào lúc này."
 
-#: ../../printerdrake.pm_.c:302 ../../printerdrake.pm_.c:319
+#: ../../printer/printerdrake.pm_.c:281 ../../printer/printerdrake.pm_.c:298
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8257,7 +8058,7 @@ msgstr ""
 " Hãy nhấn \"Tiếp Theo\" khi bạn đã sẵn sàng, và nhấn \"Bỏ Qua\" khi bạn "
 "không muốn thiết lập máy in vào lúc này."
 
-#: ../../printerdrake.pm_.c:310
+#: ../../printer/printerdrake.pm_.c:289
 msgid ""
 "\n"
 "Welcome to the Printer Setup Wizard\n"
@@ -8293,20 +8094,20 @@ msgstr ""
 " Hãy nhấn \"Tiếp Theo\" khi bạn đã sẵn sàng, và nhấn \"Bỏ Qua\" khi bạn "
 "không muốn thiết lập máy in vào lúc này."
 
-#: ../../printerdrake.pm_.c:328
+#: ../../printer/printerdrake.pm_.c:307
 msgid "Auto-detect printers connected to this machine"
 msgstr "Tự động phát hiện máy in nối với máy tính này"
 
-#: ../../printerdrake.pm_.c:331
+#: ../../printer/printerdrake.pm_.c:310
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Tự động phát hiện máy in kết nối trực tiếp với mạng cục bộ"
 
-#: ../../printerdrake.pm_.c:334
+#: ../../printer/printerdrake.pm_.c:313
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr ""
 "Tự động phát hiện máy ih kết nối với các máy tính chạy Microsoft Windows"
 
-#: ../../printerdrake.pm_.c:362
+#: ../../printer/printerdrake.pm_.c:329
 msgid ""
 "\n"
 "Congratulations, your printer is now installed and configured!\n"
@@ -8329,53 +8130,53 @@ msgstr ""
 "các  thiết lập tùy chọn mặc định (khay nạp giấy, chất lượng in, v.v...), hãy "
 "chọn \"Máy in\" trong mục \"Phần cứng\" ở Mandrake Control Center."
 
-#: ../../printerdrake.pm_.c:399 ../../printerdrake.pm_.c:590
-#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
+#: ../../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 "Dò tìm tự động máy in"
 
-#: ../../printerdrake.pm_.c:421
+#: ../../printer/printerdrake.pm_.c:385
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", máy in mạng \"%s\", cổng %s"
 
-#: ../../printerdrake.pm_.c:423
+#: ../../printer/printerdrake.pm_.c:387
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", Máy in \"%s\" trên máy chủ SMB/Windows \"%s\""
 
-#: ../../printerdrake.pm_.c:429
+#: ../../printer/printerdrake.pm_.c:391
 #, c-format
 msgid "Detected %s"
 msgstr "Phát hiện được %s"
 
-#: ../../printerdrake.pm_.c:433 ../../printerdrake.pm_.c:464
-#: ../../printerdrake.pm_.c:483
+#: ../../printer/printerdrake.pm_.c:395 ../../printer/printerdrake.pm_.c:423
+#: ../../printer/printerdrake.pm_.c:440
 #, c-format
 msgid "Printer on parallel port \\/*%s"
 msgstr "Máy in tại cổng song song \\/*%s"
 
-#: ../../printerdrake.pm_.c:435 ../../printerdrake.pm_.c:466
-#: ../../printerdrake.pm_.c:488
+#: ../../printer/printerdrake.pm_.c:397 ../../printer/printerdrake.pm_.c:425
+#: ../../printer/printerdrake.pm_.c:443
 #, c-format
 msgid "USB printer \\/*%s"
 msgstr "Máy in USB \\/*%s"
 
-#: ../../printerdrake.pm_.c:437
+#: ../../printer/printerdrake.pm_.c:399
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Máy in mạng \"%s\", cổng %s"
 
-#: ../../printerdrake.pm_.c:439
+#: ../../printer/printerdrake.pm_.c:401
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Máy in \"%s\" trên máy chủ SMB/Windows \"%s\""
 
-#: ../../printerdrake.pm_.c:575 ../../printerdrake.pm_.c:600
+#: ../../printer/printerdrake.pm_.c:525 ../../printer/printerdrake.pm_.c:547
 msgid "Local Printer"
 msgstr "Máy in Cục bộ"
 
-#: ../../printerdrake.pm_.c:576
+#: ../../printer/printerdrake.pm_.c:526
 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, ..., "
@@ -8387,19 +8188,19 @@ msgstr ""
 "đương với LPT1:, LPT2:, ...; máy in USB thứ nhất: /dev/usb/lp0, thứ hai : /"
 "dev/usb/lp1, ...)."
 
-#: ../../printerdrake.pm_.c:580
+#: ../../printer/printerdrake.pm_.c:530
 msgid "You must enter a device or file name!"
 msgstr "Phải nhập một thiết bị hoặc một tên file!"
 
-#: ../../printerdrake.pm_.c:591
+#: ../../printer/printerdrake.pm_.c:539
 msgid "No printer found!"
 msgstr "Không tìm thấy máy in nào!"
 
-#: ../../printerdrake.pm_.c:601
+#: ../../printer/printerdrake.pm_.c:548
 msgid "Available printers"
 msgstr "Các máy in sẵn có"
 
-#: ../../printerdrake.pm_.c:605
+#: ../../printer/printerdrake.pm_.c:552
 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"
@@ -8407,7 +8208,7 @@ msgstr ""
 "Tự động phát hiện được máy in sau đây, nếu không phải là cái bạn muốn cấu "
 "hình, nhập tên thiết bị/file vào dòng nhập"
 
-#: ../../printerdrake.pm_.c:606
+#: ../../printer/printerdrake.pm_.c:553
 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"
@@ -8415,7 +8216,7 @@ msgstr ""
 "Đây là danh sách các máy in đã được tự động phát hiện. Hãy chọn máy in bạn "
 "muốn thiết lập hoặc nhập tên thiết bị/file vào dòng nhập"
 
-#: ../../printerdrake.pm_.c:608
+#: ../../printer/printerdrake.pm_.c:555
 msgid ""
 "The following printer was auto-detected. The configuration of the printer "
 "will work fully automatically. If your printer was not correctly detected or "
@@ -8426,7 +8227,7 @@ msgstr ""
 "tự động. Nếu máy in không được phát hiện đúng hoặc nếu muốn thực hiện tùy "
 "chỉnh cấu hình máy in, hãy bật \"Cấu hình bằng tay\"."
 
-#: ../../printerdrake.pm_.c:609
+#: ../../printer/printerdrake.pm_.c:556
 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 "
@@ -8438,7 +8239,7 @@ msgstr ""
 "máy in không được phát hiện đúng hay nếu bạn muốn tùy chỉnh việc cấu hình, "
 "hãy bật \"Cấu hình bằng tay\"."
 
-#: ../../printerdrake.pm_.c:611
+#: ../../printer/printerdrake.pm_.c:558
 msgid ""
 "Please choose the port where your printer is connected to or enter a device "
 "name/file name in the input line"
@@ -8446,11 +8247,11 @@ msgstr ""
 "Hãy chọ cổng nơi máy in được nối vào hoặc nhập một tên cho thiết bị /file "
 "vào dòng nhập"
 
-#: ../../printerdrake.pm_.c:612
+#: ../../printer/printerdrake.pm_.c:559
 msgid "Please choose the port where your printer is connected to."
 msgstr "Hãy chọn cổng nối với máy in."
 
-#: ../../printerdrake.pm_.c:614
+#: ../../printer/printerdrake.pm_.c:561
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
 "1st USB printer: /dev/usb/lp0, 2nd USB printer: /dev/usb/lp1, ...)."
@@ -8458,19 +8259,19 @@ msgstr ""
 " (Cổng song song: /dev/lp0, /dev/lp1, ..., tương đương với LPT1:, "
 "LPT2:, ...; máy in USB thứ nhất: /dev/usb/lp0, thứ hai: /dev/usb/lp1, ...)."
 
-#: ../../printerdrake.pm_.c:619
+#: ../../printer/printerdrake.pm_.c:565
 msgid "You must choose/enter a printer/device!"
 msgstr "Phải chọn/nhập một máy in/thiết bị!"
 
-#: ../../printerdrake.pm_.c:639
+#: ../../printer/printerdrake.pm_.c:584
 msgid "Manual configuration"
 msgstr "Cấu hình bằng tay"
 
-#: ../../printerdrake.pm_.c:693
+#: ../../printer/printerdrake.pm_.c:633
 msgid "Remote lpd Printer Options"
 msgstr "Các tùy chọn máy in LPD ở xa"
 
-#: ../../printerdrake.pm_.c:694
+#: ../../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."
@@ -8478,46 +8279,46 @@ msgstr ""
 "Để sử dụng máy in lpd ở xa, bạn cần cung cấp tên chủ của máy chủ in ấn và "
 "tên máy in của máy chủ đó."
 
-#: ../../printerdrake.pm_.c:695
+#: ../../printer/printerdrake.pm_.c:635
 msgid "Remote host name"
 msgstr "Tên máy chủ ở xa"
 
-#: ../../printerdrake.pm_.c:696
+#: ../../printer/printerdrake.pm_.c:636
 msgid "Remote printer name"
 msgstr "Tên máy in ở xa"
 
-#: ../../printerdrake.pm_.c:699
+#: ../../printer/printerdrake.pm_.c:639
 msgid "Remote host name missing!"
 msgstr "Thiếu tên máy chủ ở xa!"
 
-#: ../../printerdrake.pm_.c:703
+#: ../../printer/printerdrake.pm_.c:643
 msgid "Remote printer name missing!"
 msgstr "Thiếu tên máy in ở xa !"
 
-#: ../../printerdrake.pm_.c:727 ../../printerdrake.pm_.c:1244
+#: ../../printer/printerdrake.pm_.c:665 ../../printer/printerdrake.pm_.c:1170
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Phát hiện được model: %s %s"
 
-#: ../../printerdrake.pm_.c:805 ../../printerdrake.pm_.c:1045
+#: ../../printer/printerdrake.pm_.c:742 ../../printer/printerdrake.pm_.c:978
 msgid "Scanning network..."
 msgstr "Đang rà quét mạng ..."
 
-#: ../../printerdrake.pm_.c:814 ../../printerdrake.pm_.c:835
+#: ../../printer/printerdrake.pm_.c:751 ../../printer/printerdrake.pm_.c:772
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", máy in \"%s\" trên máy chủ \"%s\""
 
-#: ../../printerdrake.pm_.c:817 ../../printerdrake.pm_.c:838
+#: ../../printer/printerdrake.pm_.c:754 ../../printer/printerdrake.pm_.c:775
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Máy in \"%s\" trên máy chủ \"%s\""
 
-#: ../../printerdrake.pm_.c:858
+#: ../../printer/printerdrake.pm_.c:795
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "Tùy chọn máy in SMB (Windows 9x/NT)"
 
-#: ../../printerdrake.pm_.c:859
+#: ../../printer/printerdrake.pm_.c:796
 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 "
@@ -8529,7 +8330,7 @@ msgstr ""
 "in ấn, cũng như là tên chia sẻ cho máy in bạn muốn truy cập và thông tin tên "
 "người dùng phù hợp nào đó, mật khẩu, nhóm làm việc."
 
-#: ../../printerdrake.pm_.c:860
+#: ../../printer/printerdrake.pm_.c:797
 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."
@@ -8537,39 +8338,39 @@ msgstr ""
 " Nếu đã phát hiện được máy in mong muốn, hãy chọn nó trong danh sách rồi "
 "thêm tên người dùng, mật khẩu, và/hoặc nhóm làm việc nếu cần."
 
-#: ../../printerdrake.pm_.c:861
+#: ../../printer/printerdrake.pm_.c:799
 msgid "SMB server host"
 msgstr "Máy chủ SMB"
 
-#: ../../printerdrake.pm_.c:862
+#: ../../printer/printerdrake.pm_.c:800
 msgid "SMB server IP"
 msgstr "IP của máy chủ SMB"
 
-#: ../../printerdrake.pm_.c:863
+#: ../../printer/printerdrake.pm_.c:801
 msgid "Share name"
 msgstr "Tên chia sẻ"
 
-#: ../../printerdrake.pm_.c:866
+#: ../../printer/printerdrake.pm_.c:804
 msgid "Workgroup"
 msgstr "Nhóm làm việc"
 
-#: ../../printerdrake.pm_.c:868
+#: ../../printer/printerdrake.pm_.c:806
 msgid "Auto-detected"
 msgstr "Dò tìm Tự động"
 
-#: ../../printerdrake.pm_.c:879
+#: ../../printer/printerdrake.pm_.c:816
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Phải có tên hoặc IP của máy chủ!"
 
-#: ../../printerdrake.pm_.c:883
+#: ../../printer/printerdrake.pm_.c:820
 msgid "Samba share name missing!"
 msgstr "Thiếu tên chia sẻ SAMBA!"
 
-#: ../../printerdrake.pm_.c:889
+#: ../../printer/printerdrake.pm_.c:826
 msgid "SECURITY WARNING!"
 msgstr "Cảnh Báo Bảo Mật !"
 
-#: ../../printerdrake.pm_.c:890
+#: ../../printer/printerdrake.pm_.c:827
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -8611,7 +8412,7 @@ msgstr ""
 "Printerdrake.\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:900
+#: ../../printer/printerdrake.pm_.c:837
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -8624,7 +8425,7 @@ msgstr ""
 "Printerdrake.\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:903
+#: ../../printer/printerdrake.pm_.c:840
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
 "connect to it as a client.\n"
@@ -8636,11 +8437,11 @@ msgstr ""
 "\n"
 "Có thật sự muốn tiếp tục thiết lập máy in này như bạn đang làm bây giờ không?"
 
-#: ../../printerdrake.pm_.c:975
+#: ../../printer/printerdrake.pm_.c:911
 msgid "NetWare Printer Options"
 msgstr "Các tùy chọn máy in NetWare"
 
-#: ../../printerdrake.pm_.c:976
+#: ../../printer/printerdrake.pm_.c:912
 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 "
@@ -8651,37 +8452,37 @@ msgstr ""
 "ý! Tên này có thể khác với tên máy chủ TCP/IP của nó!), tên hàng in cho máy "
 "in mà bạn muốn truy cập và tên người dùng, mật khẩu phù hợp."
 
-#: ../../printerdrake.pm_.c:977
+#: ../../printer/printerdrake.pm_.c:913
 msgid "Printer Server"
 msgstr "Máy chủ in ấn"
 
-#: ../../printerdrake.pm_.c:978
+#: ../../printer/printerdrake.pm_.c:914
 msgid "Print Queue Name"
 msgstr "Tên hàng in"
 
-#: ../../printerdrake.pm_.c:983
+#: ../../printer/printerdrake.pm_.c:919
 msgid "NCP server name missing!"
 msgstr "Thiếu tên máy chủ NCP!"
 
-#: ../../printerdrake.pm_.c:987
+#: ../../printer/printerdrake.pm_.c:923
 msgid "NCP queue name missing!"
 msgstr "Thiếu tên hàng in NCP!"
 
-#: ../../printerdrake.pm_.c:1054 ../../printerdrake.pm_.c:1074
+#: ../../printer/printerdrake.pm_.c:987 ../../printer/printerdrake.pm_.c:1007
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", máy chủ \"%s\", cổng %s"
 
-#: ../../printerdrake.pm_.c:1057 ../../printerdrake.pm_.c:1077
+#: ../../printer/printerdrake.pm_.c:990 ../../printer/printerdrake.pm_.c:1010
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "Máy chủ \"%s\", cổng %s"
 
-#: ../../printerdrake.pm_.c:1097
+#: ../../printer/printerdrake.pm_.c:1030
 msgid "TCP/Socket Printer Options"
 msgstr "Tùy chọn của máy in TCP/Socket"
 
-#: ../../printerdrake.pm_.c:1099
+#: ../../printer/printerdrake.pm_.c:1032
 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."
@@ -8689,7 +8490,7 @@ msgstr ""
 "Hãy chọn một trong những máy in được phát hiện tự động trong danh sách hoặc "
 "nhập tên máy chủ hay IP và số cổng (mặc định là 9100) vào các trường nhập."
 
-#: ../../printerdrake.pm_.c:1100
+#: ../../printer/printerdrake.pm_.c:1033
 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 "
@@ -8701,19 +8502,19 @@ msgstr ""
 "chủ HP JetDirect, số cổng thường là 9100, và thay đổi trên các máy khác. Hãy "
 "xem tài liệu đi kèm phần cứng."
 
-#: ../../printerdrake.pm_.c:1105
+#: ../../printer/printerdrake.pm_.c:1037
 msgid "Printer host name or IP missing!"
 msgstr "Thiếu tên máy chủ in hoặc IP!"
 
-#: ../../printerdrake.pm_.c:1127
+#: ../../printer/printerdrake.pm_.c:1059
 msgid "Printer host name or IP"
 msgstr "Tên máy chủ in hoặc IP"
 
-#: ../../printerdrake.pm_.c:1177 ../../printerdrake.pm_.c:1179
+#: ../../printer/printerdrake.pm_.c:1107 ../../printer/printerdrake.pm_.c:1109
 msgid "Printer Device URI"
 msgstr "Thiết bị in URI"
 
-#: ../../printerdrake.pm_.c:1178
+#: ../../printer/printerdrake.pm_.c:1108
 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 "
@@ -8723,11 +8524,11 @@ msgstr ""
 "CUPS hay các đặc tả Foomatic. Lưu ý là không phải mọi loại URI đều được tất "
 "cả các spooler hỗ trợ."
 
-#: ../../printerdrake.pm_.c:1193
+#: ../../printer/printerdrake.pm_.c:1123
 msgid "A valid URI must be entered!"
 msgstr "Cần nhập một URI hợp lệ!"
 
-#: ../../printerdrake.pm_.c:1560
+#: ../../printer/printerdrake.pm_.c:1463
 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."
@@ -8735,27 +8536,31 @@ msgstr ""
 "Mọi máy in cần được đặt tên (ví dụ: \"printer\"). Các trường Mô tả và Vị trí "
 "không nhất thiết phải điền vào. Chúng là các chú thích cho người dùng."
 
-#: ../../printerdrake.pm_.c:1561
+#: ../../printer/printerdrake.pm_.c:1464
 msgid "Name of printer"
 msgstr "Tên máy in"
 
-#: ../../printerdrake.pm_.c:1563
+#: ../../printer/printerdrake.pm_.c:1465 ../../standalone/harddrake2_.c:38
+msgid "Description"
+msgstr "Mô tả"
+
+#: ../../printer/printerdrake.pm_.c:1466
 msgid "Location"
 msgstr "Vị trí"
 
-#: ../../printerdrake.pm_.c:1575 ../../printerdrake.pm_.c:1697
+#: ../../printer/printerdrake.pm_.c:1478 ../../printer/printerdrake.pm_.c:1599
 msgid "Reading printer database..."
 msgstr "Đang đọc cơ sở dữ liệu máy in ..."
 
-#: ../../printerdrake.pm_.c:1579
+#: ../../printer/printerdrake.pm_.c:1482
 msgid "Preparing printer database..."
 msgstr "Đang chuẩn bị cơ sở dữ liệu của máy in ..."
 
-#: ../../printerdrake.pm_.c:1676
+#: ../../printer/printerdrake.pm_.c:1578
 msgid "Your printer model"
 msgstr "Model máy in của bạn"
 
-#: ../../printerdrake.pm_.c:1677
+#: ../../printer/printerdrake.pm_.c:1579
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -8780,24 +8585,24 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../../printerdrake.pm_.c:1682 ../../printerdrake.pm_.c:1685
+#: ../../printer/printerdrake.pm_.c:1584 ../../printer/printerdrake.pm_.c:1587
 msgid "The model is correct"
 msgstr "Model đúng"
 
-#: ../../printerdrake.pm_.c:1683 ../../printerdrake.pm_.c:1684
-#: ../../printerdrake.pm_.c:1687
+#: ../../printer/printerdrake.pm_.c:1585 ../../printer/printerdrake.pm_.c:1586
+#: ../../printer/printerdrake.pm_.c:1589
 msgid "Select model manually"
 msgstr "Chọn model thủ công"
 
-#: ../../printerdrake.pm_.c:1704
+#: ../../printer/printerdrake.pm_.c:1606
 msgid "Printer model selection"
 msgstr "Lựa chọn loại máy in"
 
-#: ../../printerdrake.pm_.c:1705
+#: ../../printer/printerdrake.pm_.c:1607
 msgid "Which printer model do you have?"
 msgstr "Bạn có loại máy in nào?"
 
-#: ../../printerdrake.pm_.c:1706
+#: ../../printer/printerdrake.pm_.c:1608
 msgid ""
 "\n"
 "\n"
@@ -8811,7 +8616,7 @@ msgstr ""
 "không. Hãy tìm kiểu máy in đúng trong danh sách khi con chỏ nằm ở kểu máy in "
 "sai hoặc ở \"Máy in Raw\"."
 
-#: ../../printerdrake.pm_.c:1709
+#: ../../printer/printerdrake.pm_.c:1611
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
 "similar one."
@@ -8819,11 +8624,11 @@ msgstr ""
 "Nếu máy in của bạn không được liệt kê, hãy chọn một cái tương đương hay "
 "tương tự (xem tài liệu máy in)."
 
-#: ../../printerdrake.pm_.c:1786
+#: ../../printer/printerdrake.pm_.c:1697
 msgid "OKI winprinter configuration"
 msgstr "Cấu hình máy in Windows OKI"
 
-#: ../../printerdrake.pm_.c:1787
+#: ../../printer/printerdrake.pm_.c:1698
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
 "use a very special communication protocol and therefore they work only when "
@@ -8839,11 +8644,11 @@ msgstr ""
 "hiện in thử. Nếu không làm như vậy, máy in sẽ không chạy. Kiểu nối đó sẽ bị "
 "driver bỏ qua."
 
-#: ../../printerdrake.pm_.c:1830 ../../printerdrake.pm_.c:1857
+#: ../../printer/printerdrake.pm_.c:1718 ../../printer/printerdrake.pm_.c:1745
 msgid "Lexmark inkjet configuration"
 msgstr "Cấu hình Lexmark inkjet"
 
-#: ../../printerdrake.pm_.c:1831
+#: ../../printer/printerdrake.pm_.c:1719
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
 "no printers on remote machines or print server boxes. Please connect your "
@@ -8854,7 +8659,7 @@ msgstr ""
 "trợ các máy in ở xa hay máy chủ in ấn. Hãy nối máy in vào một cổng của máy "
 "tính hoặc cấu hình nó trên máy tính mà nó được nối vào."
 
-#: ../../printerdrake.pm_.c:1858
+#: ../../printer/printerdrake.pm_.c:1746
 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."
@@ -8874,11 +8679,11 @@ msgstr ""
 "in các trang định vị đầu in với \"lexmarkmaintain\" và điều chỉnh thiết lập "
 "vị trí đầu in bằng chương trình này."
 
-#: ../../printerdrake.pm_.c:1861
+#: ../../printer/printerdrake.pm_.c:1749
 msgid "GDI Laser Printer using the Zenographics ZJ-Stream Format"
 msgstr "Máy in Laser GDI sử dụng định dạng Zenographics ZJ-Stream"
 
-#: ../../printerdrake.pm_.c:1862
+#: ../../printer/printerdrake.pm_.c:1750
 msgid ""
 "Your printer belongs to the group of GDI laser printers (winprinters) sold "
 "by different manufacturers which uses the Zenographics ZJ-stream raster "
@@ -8919,7 +8724,7 @@ msgstr ""
 "hai thì bắt buộc phải chạy trong root. Sau khi hoàn tất mọi thứ, bạn có thể "
 "in như bình thường.\n"
 
-#: ../../printerdrake.pm_.c:2085
+#: ../../printer/printerdrake.pm_.c:1972
 msgid ""
 "Printer default settings\n"
 "\n"
@@ -8935,22 +8740,22 @@ msgstr ""
 "được thiết lập đúng. Lưu ý là với một chất lượng in cao/độ phân giải lớn, về "
 "cơ bản, thì quá trình in ấn sẽ bị chậm đi."
 
-#: ../../printerdrake.pm_.c:2094
+#: ../../printer/printerdrake.pm_.c:1981
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Tùy chọn %s phải là một số nguyên!"
 
-#: ../../printerdrake.pm_.c:2098
+#: ../../printer/printerdrake.pm_.c:1985
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Tùy chọn %s phải là một số !"
 
-#: ../../printerdrake.pm_.c:2103
+#: ../../printer/printerdrake.pm_.c:1989
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Tùy chọn %s không có trong danh mục!"
 
-#: ../../printerdrake.pm_.c:2142
+#: ../../printer/printerdrake.pm_.c:2028
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -8959,11 +8764,11 @@ msgstr ""
 "Bạn có muốn thiết lập máy in (\"%s\") này\n"
 "là máy in mặc định?"
 
-#: ../../printerdrake.pm_.c:2165
+#: ../../printer/printerdrake.pm_.c:2051
 msgid "Test pages"
 msgstr "Trang in thử"
 
-#: ../../printerdrake.pm_.c:2166
+#: ../../printer/printerdrake.pm_.c:2052
 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 "
@@ -8975,39 +8780,39 @@ msgstr ""
 "các máy in laser có bộ nhớ quá ít thì có thể còn không in ra được. Đa số các "
 "trường hợp, nó có đủ khả năng để in thử một trang chuẩn."
 
-#: ../../printerdrake.pm_.c:2170
+#: ../../printer/printerdrake.pm_.c:2056
 msgid "No test pages"
 msgstr "Không có trang in thử"
 
-#: ../../printerdrake.pm_.c:2171
+#: ../../printer/printerdrake.pm_.c:2057
 msgid "Print"
 msgstr "In"
 
-#: ../../printerdrake.pm_.c:2228
+#: ../../printer/printerdrake.pm_.c:2114
 msgid "Standard test page"
 msgstr "Trang in thử chuẩn"
 
-#: ../../printerdrake.pm_.c:2231
+#: ../../printer/printerdrake.pm_.c:2117
 msgid "Alternative test page (Letter)"
 msgstr "Trang in thử thay thế (Letter)"
 
-#: ../../printerdrake.pm_.c:2234
+#: ../../printer/printerdrake.pm_.c:2120
 msgid "Alternative test page (A4)"
 msgstr "Trang in thử thay thế (A4)"
 
-#: ../../printerdrake.pm_.c:2236
+#: ../../printer/printerdrake.pm_.c:2122
 msgid "Photo test page"
 msgstr "Trang ảnh in thử"
 
-#: ../../printerdrake.pm_.c:2240
+#: ../../printer/printerdrake.pm_.c:2126
 msgid "Do not print any test page"
 msgstr "Không in thử ra giấy"
 
-#: ../../printerdrake.pm_.c:2249 ../../printerdrake.pm_.c:2402
+#: ../../printer/printerdrake.pm_.c:2134 ../../printer/printerdrake.pm_.c:2285
 msgid "Printing test page(s)..."
 msgstr "Đang in thử trang..."
 
-#: ../../printerdrake.pm_.c:2274
+#: ../../printer/printerdrake.pm_.c:2159
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -9022,7 +8827,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2278
+#: ../../printer/printerdrake.pm_.c:2163
 msgid ""
 "Test page(s) have been sent to the printer.\n"
 "It may take some time before the printer starts.\n"
@@ -9030,15 +8835,15 @@ msgstr ""
 "Trang in thử đã được gửi tới máy in.\n"
 "Cần chút thời gian trước khi máy in làm việc.\n"
 
-#: ../../printerdrake.pm_.c:2285
+#: ../../printer/printerdrake.pm_.c:2170
 msgid "Did it work properly?"
 msgstr "Trang in thử có tốt không?"
 
-#: ../../printerdrake.pm_.c:2307 ../../printerdrake.pm_.c:3473
+#: ../../printer/printerdrake.pm_.c:2190 ../../printer/printerdrake.pm_.c:3229
 msgid "Raw printer"
 msgstr "máy in Raw"
 
-#: ../../printerdrake.pm_.c:2333
+#: ../../printer/printerdrake.pm_.c:2216
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -9051,7 +8856,7 @@ msgstr ""
 "<file>\". Các công cụ đồ họa cho phép chọn máy in và thay đổi các thiết lập "
 "tùy chọn dễ dàng.\n"
 
-#: ../../printerdrake.pm_.c:2335
+#: ../../printer/printerdrake.pm_.c:2218
 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 "
@@ -9061,8 +8866,8 @@ msgstr ""
 "trong nhiều ứng dụng, nhưng không cung cấp tên tập tin tại đây bởi vì tập "
 "tin để in là do ứng dụng cung cấp.\n"
 
-#: ../../printerdrake.pm_.c:2338 ../../printerdrake.pm_.c:2355
-#: ../../printerdrake.pm_.c:2365
+#: ../../printer/printerdrake.pm_.c:2221 ../../printer/printerdrake.pm_.c:2238
+#: ../../printer/printerdrake.pm_.c:2248
 #, c-format
 msgid ""
 "\n"
@@ -9071,11 +8876,11 @@ msgid ""
 "line, e. g. \"%s <file>\". "
 msgstr ""
 "\n"
-"Lệnh \"%s\" cũng cho phép thay đổi các thiết lập tùy chọn cho một tác vụ in "
+"Lệnh \"%s\" cũng cho phép biến đổi các thiết lập tùy chọn cho một tác vụ in "
 "đặc biệt. Đơn giản là thêm các thiết lập mong muốn vào dòng lệnh, ví dụ: \"%"
 "s <file>\". "
 
-#: ../../printerdrake.pm_.c:2341 ../../printerdrake.pm_.c:2381
+#: ../../printer/printerdrake.pm_.c:2224 ../../printer/printerdrake.pm_.c:2264
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -9086,7 +8891,7 @@ msgstr ""
 "dưới hoặc nhấn chuột lên \"Danh sách tùy chọn máy in\" .%s%s\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2345
+#: ../../printer/printerdrake.pm_.c:2228
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
 "\n"
@@ -9094,7 +8899,7 @@ msgstr ""
 "Đây là danh sách các tùy chọn in sẵn có cho máy in hiện thời:\n"
 "\n"
 
-#: ../../printerdrake.pm_.c:2350 ../../printerdrake.pm_.c:2360
+#: ../../printer/printerdrake.pm_.c:2233 ../../printer/printerdrake.pm_.c:2243
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -9103,8 +8908,8 @@ msgstr ""
 "Để in tập tin từ dòng lệnh (trong cửa sổ terminal), hãy dùng lệnh \"%s <tập "
 "tin>\".\n"
 
-#: ../../printerdrake.pm_.c:2352 ../../printerdrake.pm_.c:2362
-#: ../../printerdrake.pm_.c:2372
+#: ../../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 "
@@ -9114,7 +8919,7 @@ msgstr ""
 "trong rất nhiều ứng dụng. Nhưng đừng cung cấp tên tập tin ở đây vì tập tin "
 "để in đã được ứng dụng cung cấp.\n"
 
-#: ../../printerdrake.pm_.c:2357 ../../printerdrake.pm_.c:2367
+#: ../../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."
@@ -9122,7 +8927,7 @@ msgstr ""
 "Đê có danh sách các tùy chọn sẵn có cho máy in hiện hành, nhấn lên nút "
 "\"Danh sách tùy chọn in\"."
 
-#: ../../printerdrake.pm_.c:2370
+#: ../../printer/printerdrake.pm_.c:2253
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -9131,7 +8936,7 @@ msgstr ""
 "Để in một tập tin từ dòng lệnh (trong cửa sổ terminal), hãy dùng lệnh \"%s "
 "<tập tin>\" hoặc \"%s <tập tin>\".\n"
 
-#: ../../printerdrake.pm_.c:2374
+#: ../../printer/printerdrake.pm_.c:2257
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
 "handling printing jobs.\n"
@@ -9146,7 +8951,7 @@ msgstr ""
 "biểu tượng trên màn hình nền, có nhãn \"Dừng Máy in!\", để dừng ngay mọi tác "
 "vụ in khi nhấn chuột lên. Nút này có ích ví dụ như khi bị kẹt giấy.\n"
 
-#: ../../printerdrake.pm_.c:2378
+#: ../../printer/printerdrake.pm_.c:2261
 #, c-format
 msgid ""
 "\n"
@@ -9159,40 +8964,40 @@ msgstr ""
 "vụ in đặc biệt. Đơn giản là thêm các thiết lập mong muốn vào dòng lệnh ví dụ "
 "\"%s <tập tin>\".\n"
 
-#: ../../printerdrake.pm_.c:2388
+#: ../../printer/printerdrake.pm_.c:2271
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "In/Quét/Thẻ photo trên \"%s\""
 
-#: ../../printerdrake.pm_.c:2389
+#: ../../printer/printerdrake.pm_.c:2272
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "In/Quét trên \"%s\""
 
-#: ../../printerdrake.pm_.c:2391
+#: ../../printer/printerdrake.pm_.c:2274
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Truy cập In/Quét/Thẻ Photo trên \"%s\""
 
-#: ../../printerdrake.pm_.c:2392
+#: ../../printer/printerdrake.pm_.c:2275
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "In trên máy in \"%s\""
 
-#: ../../printerdrake.pm_.c:2395 ../../printerdrake.pm_.c:2398
-#: ../../printerdrake.pm_.c:2399 ../../printerdrake.pm_.c:2400
-#: ../../printerdrake.pm_.c:3457 ../../standalone/drakTermServ_.c:248
-#: ../../standalone/drakbackup_.c:1562 ../../standalone/drakbackup_.c:4210
-#: ../../standalone/drakbug_.c:130 ../../standalone/drakfont_.c:705
-#: ../../standalone/drakfont_.c:1014
+#: ../../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 "Đóng"
 
-#: ../../printerdrake.pm_.c:2398
+#: ../../printer/printerdrake.pm_.c:2281
 msgid "Print option list"
 msgstr "Danh sách tùy chọn in"
 
-#: ../../printerdrake.pm_.c:2418
+#: ../../printer/printerdrake.pm_.c:2301
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -9214,7 +9019,7 @@ msgstr ""
 "\n"
 "Xin đừng dùng \"scannerdrake\" cho thiết bị này!"
 
-#: ../../printerdrake.pm_.c:2439
+#: ../../printer/printerdrake.pm_.c:2322
 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 "
@@ -9236,17 +9041,17 @@ msgstr ""
 "\", có thể chuyển qua lại giữa các chữ cái tên của drive trong trường nằm "
 "tại góc trên - phải của danh sách file."
 
-#: ../../printerdrake.pm_.c:2461 ../../printerdrake.pm_.c:2927
-#: ../../printerdrake.pm_.c:3227
+#: ../../printer/printerdrake.pm_.c:2344 ../../printer/printerdrake.pm_.c:2702
+#: ../../printer/printerdrake.pm_.c:2990
 msgid "Reading printer data..."
 msgstr "Đang đọc dữ liệu máy in..."
 
-#: ../../printerdrake.pm_.c:2481 ../../printerdrake.pm_.c:2509
-#: ../../printerdrake.pm_.c:2544
+#: ../../printer/printerdrake.pm_.c:2364 ../../printer/printerdrake.pm_.c:2391
+#: ../../printer/printerdrake.pm_.c:2426
 msgid "Transfer printer configuration"
 msgstr "Chuyển tải cấu hình máy in"
 
-#: ../../printerdrake.pm_.c:2482
+#: ../../printer/printerdrake.pm_.c:2365
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -9255,14 +9060,14 @@ msgid ""
 "overtaken, but jobs will not be transferred.\n"
 "Not all queues can be transferred due to the following reasons:\n"
 msgstr ""
-"Bạn có thể sao chép cấu hình máy in mà bạn đã hoàn thành cho spooler %s đến %"
-"s, là spooler hiện thời của bạn. Mọi dữ liệu về cấu hình (tên máy in, mô tả, "
-"vị trí, loại kết nối, và các thiết lập tùy chọn mặc định) được bắt kịp, "
-"nhưng các công việc in ấn sẽ không được truyền tải.\n"
-"Không phải toàn bộ các hàng đợi in có thể được truyền tải do những nguyên "
-"nhân sau đây:\n"
+"Có thể sao chép cấu hình máy in mà bạn đã hoàn thành cho spooler %s đến %s, "
+"là spooler hiện thời của bạn. Mọi dữ liệu về cấu hình (tên máy in, mô tả, vị "
+"trí, loại kết nối, và các thiết lập tùy chọn mặc định) được bắt kịp, nhưng "
+"các công việc in ấn sẽ không được truyền tải.\n"
+"Không phải toàn bộ các hàng đợi in đều được truyền tải bởi những nguyên do "
+"sau đây:\n"
 
-#: ../../printerdrake.pm_.c:2485
+#: ../../printer/printerdrake.pm_.c:2368
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
 "data into a free-formed command.\n"
@@ -9270,7 +9075,7 @@ msgstr ""
 "CUPS không hỗ trợ các máy in của các máy chủ Novell hoặc các máy in gửi dữ "
 "liệu vào trong một lệnh có khuôn thức tự do.\n"
 
-#: ../../printerdrake.pm_.c:2487
+#: ../../printer/printerdrake.pm_.c:2370
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
 "printers.\n"
@@ -9278,11 +9083,11 @@ msgstr ""
 "PDQ chỉ hỗ trợ các máy in cục bộ, các máy in LPD ở xa, và các máy in Socket/"
 "TCP.\n"
 
-#: ../../printerdrake.pm_.c:2489
+#: ../../printer/printerdrake.pm_.c:2372
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD và LPRng không hỗ trợ máy in IPP.\n"
 
-#: ../../printerdrake.pm_.c:2491
+#: ../../printer/printerdrake.pm_.c:2374
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
 "cannot be transferred."
@@ -9290,7 +9095,7 @@ msgstr ""
 "Hơn nữa, các hàng đợi in không được tạo với chương trình này hoặc không thể "
 "truyền tải \"cấu hình foomatic\"."
 
-#: ../../printerdrake.pm_.c:2492
+#: ../../printer/printerdrake.pm_.c:2375
 msgid ""
 "\n"
 "Also printers configured with the PPD files provided by their manufacturers "
@@ -9300,7 +9105,7 @@ msgstr ""
 "Cũng như vậy, các máy in được cấu hình với các file PPD do hãng chế tạo cung "
 "cấp hoặc đi kèm với các driver CUPS có thể không được truyền tải."
 
-#: ../../printerdrake.pm_.c:2493
+#: ../../printer/printerdrake.pm_.c:2376
 msgid ""
 "\n"
 "Mark the printers which you want to transfer and click \n"
@@ -9310,15 +9115,15 @@ msgstr ""
 "Đánh dấu vào máy in mà bạn muốn gửi tới và nhấn lên \n"
 "\"Truyền\"."
 
-#: ../../printerdrake.pm_.c:2496
+#: ../../printer/printerdrake.pm_.c:2379
 msgid "Do not transfer printers"
 msgstr "Không truyền tới máy in"
 
-#: ../../printerdrake.pm_.c:2497 ../../printerdrake.pm_.c:2514
+#: ../../printer/printerdrake.pm_.c:2380 ../../printer/printerdrake.pm_.c:2396
 msgid "Transfer"
 msgstr "Truyền"
 
-#: ../../printerdrake.pm_.c:2510
+#: ../../printer/printerdrake.pm_.c:2392
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -9329,11 +9134,11 @@ msgstr ""
 "Nhấn \"Truyền\" để ghi đè lên nó.\n"
 "Bạn cũng có thể gõ tên mới hay bỏ qua máy in này."
 
-#: ../../printerdrake.pm_.c:2518
+#: ../../printer/printerdrake.pm_.c:2400
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "Tên máy in chỉ nên dùng các chữ, số và dấu gạch ngang thấp"
 
-#: ../../printerdrake.pm_.c:2523
+#: ../../printer/printerdrake.pm_.c:2405
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -9342,16 +9147,16 @@ msgstr ""
 "Máy in \"%s\" đang tồn tại,\n"
 "bạn thực sự muốn ghi đè lên cấu hình của nó?"
 
-#: ../../printerdrake.pm_.c:2531
+#: ../../printer/printerdrake.pm_.c:2413
 msgid "New printer name"
 msgstr "Tên máy in mới"
 
-#: ../../printerdrake.pm_.c:2534
+#: ../../printer/printerdrake.pm_.c:2416
 #, c-format
 msgid "Transferring %s..."
 msgstr "Đang truyền %s ..."
 
-#: ../../printerdrake.pm_.c:2545
+#: ../../printer/printerdrake.pm_.c:2427
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -9360,29 +9165,29 @@ msgstr ""
 "Bạn đã hoàn thành việc truyền biểu mẫu máy in mặc định (\"%s\"). Bạn có muốn "
 "dùng nó cũng là máy in mặc định trong hệ thống in ấn %s mới?"
 
-#: ../../printerdrake.pm_.c:2555
+#: ../../printer/printerdrake.pm_.c:2437
 msgid "Refreshing printer data..."
 msgstr "Làm mới lại dữ liệu máy in ..."
 
-#: ../../printerdrake.pm_.c:2563 ../../printerdrake.pm_.c:2638
-#: ../../printerdrake.pm_.c:2650
+#: ../../printer/printerdrake.pm_.c:2445 ../../printer/printerdrake.pm_.c:2516
+#: ../../printer/printerdrake.pm_.c:2528
 msgid "Configuration of a remote printer"
 msgstr "Cấu hình của một máy in ở xa"
 
-#: ../../printerdrake.pm_.c:2564
+#: ../../printer/printerdrake.pm_.c:2446
 msgid "Starting network..."
 msgstr "Đang khởi chạy mạng ..."
 
-#: ../../printerdrake.pm_.c:2599 ../../printerdrake.pm_.c:2603
-#: ../../printerdrake.pm_.c:2605
+#: ../../printer/printerdrake.pm_.c:2479 ../../printer/printerdrake.pm_.c:2483
+#: ../../printer/printerdrake.pm_.c:2485
 msgid "Configure the network now"
 msgstr "Cấu hình mạng bây giờ"
 
-#: ../../printerdrake.pm_.c:2600
+#: ../../printer/printerdrake.pm_.c:2480
 msgid "Network functionality not configured"
 msgstr "Chưa cấu hình chức năng mạng"
 
-#: ../../printerdrake.pm_.c:2601
+#: ../../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 "
@@ -9394,11 +9199,11 @@ msgstr ""
 "bạn sẽ không thể dùng máy in mà bạn đang cấu hình lúc này. Bạn muốn tiến "
 "hành thế nào?"
 
-#: ../../printerdrake.pm_.c:2604
+#: ../../printer/printerdrake.pm_.c:2484
 msgid "Go on without configuring the network"
 msgstr "Tiếp tục mà không cấu hình mạng"
 
-#: ../../printerdrake.pm_.c:2640
+#: ../../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 "
@@ -9413,7 +9218,7 @@ msgstr ""
 "\"Kết nối\", rồi tiến hành thiết lập máy in, cũng sử dụng Trung tâm Điều "
 "khiển Mandrake, mục \"Phần cứng\"/\"Máy in\""
 
-#: ../../printerdrake.pm_.c:2641
+#: ../../printer/printerdrake.pm_.c:2519
 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 "
@@ -9422,24 +9227,24 @@ msgstr ""
 "Truy cập mạng đã không chạy và không thẻ khởi chạy. Hãy kiểm tra cấu hình và "
 "phần cứng của bạn. Sau đó thử cấu hình máy in ở xa lại một lần nữa."
 
-#: ../../printerdrake.pm_.c:2651
+#: ../../printer/printerdrake.pm_.c:2529
 msgid "Restarting printing system..."
 msgstr "Khởi chạy lại hệ thống in ấn ..."
 
-#: ../../printerdrake.pm_.c:2689
+#: ../../printer/printerdrake.pm_.c:2568
 msgid "high"
 msgstr "cao"
 
-#: ../../printerdrake.pm_.c:2689
+#: ../../printer/printerdrake.pm_.c:2568
 msgid "paranoid"
 msgstr "hoang tưởng"
 
-#: ../../printerdrake.pm_.c:2690
+#: ../../printer/printerdrake.pm_.c:2569
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Cài đặt hệ thống in ấn với mức bảo mật %s"
 
-#: ../../printerdrake.pm_.c:2691
+#: ../../printer/printerdrake.pm_.c:2570
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
@@ -9463,11 +9268,11 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn cấu hình việc in trên máy tính này?"
 
-#: ../../printerdrake.pm_.c:2723
+#: ../../printer/printerdrake.pm_.c:2604
 msgid "Starting the printing system at boot time"
 msgstr "Khởi chạy hệ thống in ấn khi khởi động máy"
 
-#: ../../printerdrake.pm_.c:2724
+#: ../../printer/printerdrake.pm_.c:2605
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -9487,59 +9292,59 @@ msgstr ""
 "\n"
 "Bạn có muốn bật lại chức năng khởi chạy tự động của hệ thống in ấn không?"
 
-#: ../../printerdrake.pm_.c:2748 ../../printerdrake.pm_.c:2793
-#: ../../printerdrake.pm_.c:2832 ../../printerdrake.pm_.c:2874
-#: ../../printerdrake.pm_.c:2995
+#: ../../printer/printerdrake.pm_.c:2625 ../../printer/printerdrake.pm_.c:2765
 msgid "Checking installed software..."
 msgstr "Đang kiểm tra phần mềm đã cài đặt..."
 
-#: ../../printerdrake.pm_.c:2798
-msgid "Removing LPRng..."
-msgstr "Đang gỡ bỏ LPRng..."
+#: ../../printer/printerdrake.pm_.c:2630
+#, c-format
+msgid "Removing %s ..."
+msgstr "Đang gỡ bỏ %s ..."
 
-#: ../../printerdrake.pm_.c:2837
-msgid "Removing LPD..."
-msgstr "Đang gỡ bỏ LPD..."
+#: ../../printer/printerdrake.pm_.c:2636
+#, c-format
+msgid "Installing %s ..."
+msgstr "Đang cài đặt %s ..."
 
-#: ../../printerdrake.pm_.c:2910
+#: ../../printer/printerdrake.pm_.c:2685
 msgid "Select Printer Spooler"
 msgstr "Chọn Spooler Máy In"
 
-#: ../../printerdrake.pm_.c:2911
+#: ../../printer/printerdrake.pm_.c:2686
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Bạn muốn sử dụng hệ thống in ấn (spooler) nào?"
 
-#: ../../printerdrake.pm_.c:2947
+#: ../../printer/printerdrake.pm_.c:2720
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "Đang cấu hình máy in \"%s\" ..."
 
-#: ../../printerdrake.pm_.c:2961
+#: ../../printer/printerdrake.pm_.c:2731
 msgid "Installing Foomatic..."
 msgstr "Đang cài đặt Foomatic ..."
 
-#: ../../printerdrake.pm_.c:3031 ../../printerdrake.pm_.c:3072
-#: ../../printerdrake.pm_.c:3474 ../../printerdrake.pm_.c:3547
+#: ../../printer/printerdrake.pm_.c:2800 ../../printer/printerdrake.pm_.c:2838
+#: ../../printer/printerdrake.pm_.c:3230 ../../printer/printerdrake.pm_.c:3300
 msgid "Printer options"
 msgstr "Các tùy chọn máy in"
 
-#: ../../printerdrake.pm_.c:3041
+#: ../../printer/printerdrake.pm_.c:2810
 msgid "Preparing Printerdrake..."
 msgstr "Đang chuẩn bị Printerdrake..."
 
-#: ../../printerdrake.pm_.c:3059 ../../printerdrake.pm_.c:3637
+#: ../../printer/printerdrake.pm_.c:2825 ../../printer/printerdrake.pm_.c:3369
 msgid "Configuring applications..."
 msgstr "Cấu hình ứng dụng ..."
 
-#: ../../printerdrake.pm_.c:3079
+#: ../../printer/printerdrake.pm_.c:2845
 msgid "Would you like to configure printing?"
 msgstr "Bạn có muốn cấu hình in ấn không?"
 
-#: ../../printerdrake.pm_.c:3091
+#: ../../printer/printerdrake.pm_.c:2857
 msgid "Printing system: "
 msgstr "Hệ thống in ấn: "
 
-#: ../../printerdrake.pm_.c:3151
+#: ../../printer/printerdrake.pm_.c:2915
 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; "
@@ -9550,7 +9355,7 @@ msgstr ""
 "lập: làm nó thành máy in mặc định, xem thông tin máy in, hoặc lập một máy in "
 "sẵn có dùng với Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3152
+#: ../../printer/printerdrake.pm_.c:2916
 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 "
@@ -9560,30 +9365,30 @@ msgstr ""
 "đổi các thiết lập, để lập nó là máy in mặc định, hay để xem thông tin máy in "
 "đó."
 
-#: ../../printerdrake.pm_.c:3179
+#: ../../printer/printerdrake.pm_.c:2942
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Làm mới lại danh sách máy in (để hiển thị toàn bộ các máy in CUPS ở xa hiện "
 "có)"
 
-#: ../../printerdrake.pm_.c:3197
+#: ../../printer/printerdrake.pm_.c:2960
 msgid "Change the printing system"
 msgstr "Thay đổi hệ thống in"
 
-#: ../../printerdrake.pm_.c:3202 ../../standalone/drakconnect_.c:277
+#: ../../printer/printerdrake.pm_.c:2965 ../../standalone/drakconnect_.c:274
 msgid "Normal Mode"
 msgstr "Chế độ bình thường"
 
-#: ../../printerdrake.pm_.c:3367 ../../printerdrake.pm_.c:3417
-#: ../../printerdrake.pm_.c:3630
+#: ../../printer/printerdrake.pm_.c:3127 ../../printer/printerdrake.pm_.c:3176
+#: ../../printer/printerdrake.pm_.c:3363
 msgid "Do you want to configure another printer?"
 msgstr "Bạn có muốn cấu hình một máy in khác?"
 
-#: ../../printerdrake.pm_.c:3452
+#: ../../printer/printerdrake.pm_.c:3211
 msgid "Modify printer configuration"
 msgstr "Thay đổi cấu hình máy in"
 
-#: ../../printerdrake.pm_.c:3454
+#: ../../printer/printerdrake.pm_.c:3213
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -9592,189 +9397,111 @@ msgstr ""
 "Máy in %s\n"
 "Bạn muốn thay đổi gì trên máy in này?"
 
-#: ../../printerdrake.pm_.c:3458
+#: ../../printer/printerdrake.pm_.c:3217
 msgid "Do it!"
 msgstr "Hãy thực hiện!"
 
-#: ../../printerdrake.pm_.c:3463 ../../printerdrake.pm_.c:3518
+#: ../../printer/printerdrake.pm_.c:3222 ../../printer/printerdrake.pm_.c:3271
 msgid "Printer connection type"
 msgstr "Kiểu kết nối máy in"
 
-#: ../../printerdrake.pm_.c:3464 ../../printerdrake.pm_.c:3522
+#: ../../printer/printerdrake.pm_.c:3223 ../../printer/printerdrake.pm_.c:3275
 msgid "Printer name, description, location"
 msgstr "Tên, mô tả, vị trí của máy in"
 
-#: ../../printerdrake.pm_.c:3466 ../../printerdrake.pm_.c:3540
+#: ../../printer/printerdrake.pm_.c:3225 ../../printer/printerdrake.pm_.c:3293
 msgid "Printer manufacturer, model, driver"
 msgstr "Hãng sản xuất, kiểu, driver của máy in"
 
-#: ../../printerdrake.pm_.c:3467 ../../printerdrake.pm_.c:3541
+#: ../../printer/printerdrake.pm_.c:3226 ../../printer/printerdrake.pm_.c:3294
 msgid "Printer manufacturer, model"
 msgstr "Hãng sản xuất, kiểu của máy in"
 
-#: ../../printerdrake.pm_.c:3476 ../../printerdrake.pm_.c:3551
+#: ../../printer/printerdrake.pm_.c:3232 ../../printer/printerdrake.pm_.c:3304
 msgid "Set this printer as the default"
 msgstr "Thiết lập máy in này làm mặc định"
 
-#: ../../printerdrake.pm_.c:3478 ../../printerdrake.pm_.c:3556
+#: ../../printer/printerdrake.pm_.c:3234 ../../printer/printerdrake.pm_.c:3309
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Bổ sung máy in này vào Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3479 ../../printerdrake.pm_.c:3565
+#: ../../printer/printerdrake.pm_.c:3235 ../../printer/printerdrake.pm_.c:3314
 msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Bỏ máy in này ra khỏi Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3480 ../../printerdrake.pm_.c:3574
+#: ../../printer/printerdrake.pm_.c:3236 ../../printer/printerdrake.pm_.c:3319
 msgid "Print test pages"
 msgstr "Trang in thử "
 
-#: ../../printerdrake.pm_.c:3481 ../../printerdrake.pm_.c:3576
+#: ../../printer/printerdrake.pm_.c:3237 ../../printer/printerdrake.pm_.c:3321
 msgid "Know how to use this printer"
 msgstr "Để biết sử dụng máy in này"
 
-#: ../../printerdrake.pm_.c:3483 ../../printerdrake.pm_.c:3578
+#: ../../printer/printerdrake.pm_.c:3238 ../../printer/printerdrake.pm_.c:3323
 msgid "Remove printer"
 msgstr "Bỏ máy in"
 
-#: ../../printerdrake.pm_.c:3529
+#: ../../printer/printerdrake.pm_.c:3282
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Đang gỡ bỏ máy in cũ \"%s\"..."
 
-#: ../../printerdrake.pm_.c:3554
+#: ../../printer/printerdrake.pm_.c:3307
 msgid "Default printer"
 msgstr "Máy in mặc định"
 
-#: ../../printerdrake.pm_.c:3555
+#: ../../printer/printerdrake.pm_.c:3308
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Bây giờ, máy in \"%s\" được thiết lập làm mặc định."
 
-#: ../../printerdrake.pm_.c:3559 ../../printerdrake.pm_.c:3562
+#: ../../printer/printerdrake.pm_.c:3310
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Bổ sung máy in vào Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3560
+#: ../../printer/printerdrake.pm_.c:3312
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr "Máy in \"%s\" đã được bổ sung vào Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3563
+#: ../../printer/printerdrake.pm_.c:3313
 #, c-format
 msgid "Failed to add the printer \"%s\" to Star Office/OpenOffice.org/GIMP."
 msgstr "Bổ sung máy in \"%s\" vào Star Office/OpenOffice.org/GIMP thất bại."
 
-#: ../../printerdrake.pm_.c:3568 ../../printerdrake.pm_.c:3571
+#: ../../printer/printerdrake.pm_.c:3315
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Bỏ máy in ra khỏi Star Office/OpenOffice.org/GIMP"
 
-#: ../../printerdrake.pm_.c:3569
+#: ../../printer/printerdrake.pm_.c:3317
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
 msgstr "Máy in \"%s\" đã được bỏ ra khỏi Star Office/OpenOffice.org/GIMP."
 
-#: ../../printerdrake.pm_.c:3572
+#: ../../printer/printerdrake.pm_.c:3318
 #, c-format
 msgid ""
 "Failed to remove the printer \"%s\" from Star Office/OpenOffice.org/GIMP."
 msgstr "Bỏ máy in \"%s\" ra khỏi Star Office/OpenOffice.org/GIMP thất bại."
 
-#: ../../printerdrake.pm_.c:3580
+#: ../../printer/printerdrake.pm_.c:3325
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Bạn thực sự muốn bỏ máy in \"%s\"?"
 
-#: ../../printerdrake.pm_.c:3584
+#: ../../printer/printerdrake.pm_.c:3329
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Đang gỡ bỏ máy in \"%s\" ..."
 
-#: ../../proxy.pm_.c:29 ../../proxy.pm_.c:37 ../../proxy.pm_.c:58
-#: ../../proxy.pm_.c:78
-msgid "Proxy configuration"
-msgstr "Cấu hình Proxy"
-
-#: ../../proxy.pm_.c:30
-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 ""
-"Chào mừng tiện ích cấu hình proxy.\n"
-"\n"
-"Tại đây, bạn có thể thiết lập các proxy cho http và ftp\n"
-"có hay không đòi hỏi đăng nhập và mật khẩu\n"
-
-#: ../../proxy.pm_.c:38
-msgid ""
-"Please fill in the http proxy informations\n"
-"Leave it blank if you don't want an http proxy"
-msgstr ""
-"Hãy điền các thông tin về proxy cho http\n"
-"Hãy để trống nếu không thiết lập proxy http"
-
-#: ../../proxy.pm_.c:39 ../../proxy.pm_.c:60
-msgid "URL"
-msgstr "URL"
-
-#: ../../proxy.pm_.c:40 ../../proxy.pm_.c:61
-msgid "port"
-msgstr "cổng"
-
-#: ../../proxy.pm_.c:44
-msgid "Url should begin with 'http:'"
-msgstr "URL nên bắt đầu bằng 'http:'"
-
-#: ../../proxy.pm_.c:48 ../../proxy.pm_.c:69
-msgid "The port part should be numeric"
-msgstr " Bộ phận cổng nên là chữ số"
-
-#: ../../proxy.pm_.c:59
-msgid ""
-"Please fill in the ftp proxy informations\n"
-"Leave it blank if you don't want an ftp proxy"
-msgstr ""
-"Hãy điền các thông tin cho proxy ftp\n"
-"Hãy để trống nếu không thiết lập proxy ftp"
-
-#: ../../proxy.pm_.c:79
-msgid ""
-"Please enter proxy login and password, if any.\n"
-"Leave it blank if you don't want login/passwd"
-msgstr ""
-"Hãy nhập vào phần đăng nhập và mật khẩu, nếu có.\n"
-"Hãy để trống nếu không muốn đăng nhập/mật khẩu"
-
-#: ../../proxy.pm_.c:80
-msgid "login"
-msgstr "đăng nhập"
-
-#: ../../proxy.pm_.c:82
-msgid "password"
-msgstr "mật khẩu"
-
-#: ../../proxy.pm_.c:84
-msgid "re-type password"
-msgstr "gõ lại mật khẩu"
-
-#: ../../proxy.pm_.c:88
-msgid "The passwords don't match. Try again!"
-msgstr "Mật khẩu không đúng. Hãy gõ lại!"
-
 #: ../../raid.pm_.c:35
 #, c-format
 msgid "Can't add a partition to _formatted_ RAID md%d"
 msgstr "Không thể thêm một phân vùng cho _formatted_ RAID md%d"
 
-#: ../../raid.pm_.c:108
-#, c-format
-msgid "Can't write file %s"
-msgstr "Không thể ghi tập tin %s"
-
 #: ../../raid.pm_.c:137
 msgid "mkraid failed"
 msgstr "mkraid hỏng"
@@ -9788,7 +9515,7 @@ msgstr "mkraid hỏng (phải chăng do thiếu raidtools ?)"
 msgid "Not enough partitions for RAID level %d\n"
 msgstr "Không đủ các phân vùng cho mức độ RAID %d\n"
 
-#: ../../security/main.pm_.c:35
+#: ../../security/main.pm_.c:36
 msgid ""
 "Standard: This is the standard security recommended for a computer that will "
 "be used to connect\n"
@@ -9833,27 +9560,32 @@ msgstr ""
 "được gửi tới người dùng này (tên người dùng hay\n"
 "\t       email)"
 
-#: ../../security/main.pm_.c:65
+#: ../../security/main.pm_.c:66
 msgid "Security Level:"
 msgstr "Mức độ bảo mật:"
 
-#: ../../security/main.pm_.c:99
+#: ../../security/main.pm_.c:77
+#, c-format
+msgid " (default value: %s)"
+msgstr " (giá trị mặc định: %s)"
+
+#: ../../security/main.pm_.c:113
 msgid "Security Alerts:"
 msgstr "Cảnh Báo Bảo Mật:"
 
-#: ../../security/main.pm_.c:101
+#: ../../security/main.pm_.c:115
 msgid "Security Administrator:"
 msgstr "Người Quản Trị Bảo Mật:"
 
-#: ../../security/main.pm_.c:114
+#: ../../security/main.pm_.c:128
 msgid "Network Options"
 msgstr "Tùy Chọn Mạng"
 
-#: ../../security/main.pm_.c:114
+#: ../../security/main.pm_.c:128
 msgid "System Options"
 msgstr "Tùy Chọn Hệ Thống"
 
-#: ../../security/main.pm_.c:119 ../../security/main.pm_.c:148
+#: ../../security/main.pm_.c:133 ../../security/main.pm_.c:164
 msgid ""
 "The following options can be set to customize your\n"
 "system security. If you need explanations, click on Help.\n"
@@ -9861,36 +9593,27 @@ msgstr ""
 "Các tùy chọn sau đây có thể lập để tùy chỉnh bảo mật\n"
 "của hệ thống. Nếu cần sự giải thích, nhấn lên Trợ Giúp (Help).\n"
 
-#: ../../security/main.pm_.c:137
-#, c-format
-msgid " (default: %s)"
-msgstr " (mặc định: %s)"
-
-#: ../../security/main.pm_.c:161
-msgid "Periodic Checks 2"
-msgstr "Kiểm tra theo giai đoạn 2"
-
-#: ../../security/main.pm_.c:162
+#: ../../security/main.pm_.c:177
 msgid "Periodic Checks"
 msgstr "Kiểm tra theo giai đoạn"
 
-#: ../../security/main.pm_.c:176
+#: ../../security/main.pm_.c:191
 msgid "Please wait, setting security level..."
 msgstr "Hãy đợi, đang thiết lập mức bảo mật..."
 
-#: ../../security/main.pm_.c:182
+#: ../../security/main.pm_.c:197
 msgid "Please wait, setting security options..."
 msgstr "Hãy đợi, đang thiết lập tùy chọn bảo mật..."
 
-#: ../../services.pm_.c:14
+#: ../../services.pm_.c:19
 msgid "Launch the ALSA (Advanced Linux Sound Architecture) sound system"
 msgstr "Chạy hệ thống âm thanh ALSA (Advanced Linux Sound Architecture)"
 
-#: ../../services.pm_.c:15
+#: ../../services.pm_.c:20
 msgid "Anacron a periodic command scheduler."
 msgstr "Anacron một lịch trình lệnh định kỳ"
 
-#: ../../services.pm_.c:16
+#: ../../services.pm_.c:21
 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."
@@ -9898,7 +9621,7 @@ msgstr ""
 "apmd được dùng để theo dõi tình trạng pin và ghi nó qua  syslog.\n"
 "Nó cũng được dùng để tắt máy tính khi pin yếu."
 
-#: ../../services.pm_.c:18
+#: ../../services.pm_.c:23
 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."
@@ -9906,7 +9629,7 @@ msgstr ""
 "Chạy các lệnh trong lịch trình theo thời gian ấn định,\n"
 "và chạy các loạt lệnh (batch commands) khi tải trung bình đủ thấp."
 
-#: ../../services.pm_.c:20
+#: ../../services.pm_.c:25
 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 "
@@ -9918,7 +9641,7 @@ msgstr ""
 "UNIX cơ\n"
 "sở, bao gồm các tính năng bảo mật tốt hơn và các tùy chọn cấu hình mạnh hơn."
 
-#: ../../services.pm_.c:23
+#: ../../services.pm_.c:28
 msgid ""
 "GPM adds mouse support to text-based Linux applications such the\n"
 "Midnight Commander. It also allows mouse-based console cut-and-paste "
@@ -9929,7 +9652,7 @@ msgstr ""
 "Midnight Commander. Nó cũng cho phép tính năng cắt-và-dán bằng chuột trong,\n"
 "console và hỗ trợ cho các menu bật lên trong console."
 
-#: ../../services.pm_.c:26
+#: ../../services.pm_.c:31
 msgid ""
 "HardDrake runs a hardware probe, and optionally configures\n"
 "new/changed hardware."
@@ -9937,14 +9660,14 @@ msgstr ""
 "HardDrake sẽ chạy để khảo sát các phần cứng, và tùy ý cấu hình các\n"
 "phần cứng mới/thay đổi."
 
-#: ../../services.pm_.c:28
+#: ../../services.pm_.c:33
 msgid ""
 "Apache is a World Wide Web server. It is used to serve HTML files and CGI."
 msgstr ""
 "Apache là một chương trình máy chủ World Wide Web. Nó dùng để\n"
 "phục vụ các tập tin HTML và CGI."
 
-#: ../../services.pm_.c:29
+#: ../../services.pm_.c:34
 msgid ""
 "The internet superserver daemon (commonly called inetd) starts a\n"
 "variety of other internet services as needed. It is responsible for "
@@ -9958,7 +9681,7 @@ msgstr ""
 "dịch vụ, bao gồm telnet, ftp, rsh, và rlogin. Khi tắt inetd thì nó\n"
 "sẽ tắt mọi dịch vụ mà nó đảm nhiệm."
 
-#: ../../services.pm_.c:33
+#: ../../services.pm_.c:38
 msgid ""
 "Launch packet filtering for Linux kernel 2.2 series, to set\n"
 "up a firewall to protect your machine from network attacks."
@@ -9966,7 +9689,7 @@ msgstr ""
 "Bắt đầu lọc các gói cho chuỗi nhân 2.2, để cài đặt\n"
 "bức tường lửa để bảo vệ máy tính của bạn khỏi các cuộc tấn công từ network."
 
-#: ../../services.pm_.c:35
+#: ../../services.pm_.c:40
 msgid ""
 "This package loads the selected keyboard map as set in\n"
 "/etc/sysconfig/keyboard.  This can be selected using the kbdconfig utility.\n"
@@ -9976,7 +9699,7 @@ msgstr ""
 "trong /etc/sysconfig/keyboard. Dùng chọn lựa này bằng tiện ích kbdconfig.\n"
 "Bạn nên để nó hoạt động cho hầu hết các máy tính."
 
-#: ../../services.pm_.c:38
+#: ../../services.pm_.c:43
 msgid ""
 "Automatic regeneration of kernel header in /boot for\n"
 "/usr/include/linux/{autoconf,version}.h"
@@ -9984,11 +9707,11 @@ msgstr ""
 "Sự tự động tái-sinh thành của header nhân trên /boot cho\n"
 "/usr/include/linux/{autoconf,version}.h"
 
-#: ../../services.pm_.c:40
+#: ../../services.pm_.c:45
 msgid "Automatic detection and configuration of hardware at boot."
 msgstr "Tự động dò tìm và cấu hình phần cứng khi boot"
 
-#: ../../services.pm_.c:41
+#: ../../services.pm_.c:46
 msgid ""
 "Linuxconf will sometimes arrange to perform various tasks\n"
 "at boot-time to maintain the system configuration."
@@ -9996,7 +9719,7 @@ msgstr ""
 "Linuxconf thỉng thoảng sẽ sắp xếp lại để thực hiện nhiều tác vụ\n"
 "vào thời gian boot để duy trì cấu hình hệ thống."
 
-#: ../../services.pm_.c:43
+#: ../../services.pm_.c:48
 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)."
@@ -10004,7 +9727,7 @@ msgstr ""
 "lpd là một daemon in ấn giúp cho lpr hoạt động tốt. Về cơ\n"
 "bản, nó cũng là một server xử lý các hoạt động in ấn của máy in."
 
-#: ../../services.pm_.c:45
+#: ../../services.pm_.c:50
 msgid ""
 "Linux Virtual Server, used to build a high-performance and highly\n"
 "available server."
@@ -10012,7 +9735,7 @@ msgstr ""
 "Máy chủ ảo Linux , được dùng để xây dựng các máy chủ có độ thực\n"
 "thi cao và tính sẵn sàng cao."
 
-#: ../../services.pm_.c:47
+#: ../../services.pm_.c:52
 msgid ""
 "named (BIND) is a Domain Name Server (DNS) that is used to resolve host "
 "names to IP addresses."
@@ -10020,7 +9743,7 @@ msgstr ""
 "Tên BIND là một máy chủ phụ trách tên miền (DNS), nó xử lý việc chuyển tên "
 "các máy chủ thành các địa chỉ IP."
 
-#: ../../services.pm_.c:48
+#: ../../services.pm_.c:53
 msgid ""
 "Mounts and unmounts all Network File System (NFS), SMB (Lan\n"
 "Manager/Windows), and NCP (NetWare) mount points."
@@ -10028,7 +9751,7 @@ msgstr ""
 "Gắn kết và bỏ gắn kết mọi điểm gắn kết của hệ thống tập tin\n"
 "mạng (NFS), SMB (trình quản trị LAN/Windows), NCP (NetWare)."
 
-#: ../../services.pm_.c:50
+#: ../../services.pm_.c:55
 msgid ""
 "Activates/Deactivates all network interfaces configured to start\n"
 "at boot time."
@@ -10036,7 +9759,7 @@ msgstr ""
 "Kích hoạt/Bất hoạt mọi giao diện mạng đã thiết lập khi\n"
 "khởi động."
 
-#: ../../services.pm_.c:52
+#: ../../services.pm_.c:57
 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"
@@ -10046,7 +9769,7 @@ msgstr ""
 "Dịch vụ này cho phép máy chủ NFS hoạt động, nó được cấu hình trong\n"
 "tệp /etc/exports."
 
-#: ../../services.pm_.c:55
+#: ../../services.pm_.c:60
 msgid ""
 "NFS is a popular protocol for file sharing across TCP/IP\n"
 "networks. This service provides NFS file locking functionality."
@@ -10054,7 +9777,7 @@ msgstr ""
 "NFS là một giao thức phổ biến để chia sẻ tập tin qua mạng\n"
 "TCP/IP. Dịch vụ này cho phép khóa chức năng của tập tin NFS ."
 
-#: ../../services.pm_.c:57
+#: ../../services.pm_.c:62
 msgid ""
 "Automatically switch on numlock key locker under console\n"
 "and XFree at boot."
@@ -10062,11 +9785,11 @@ msgstr ""
 "Tự động bật khoá numlock dưới console\n"
 "và  XFree khi boot."
 
-#: ../../services.pm_.c:59
+#: ../../services.pm_.c:64
 msgid "Support the OKI 4w and compatible winprinters."
 msgstr "Hỗ trợ OKI 4w và các các máy in tương thích Windows."
 
-#: ../../services.pm_.c:60
+#: ../../services.pm_.c:65
 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 "
@@ -10077,7 +9800,7 @@ msgstr ""
 "modem của máy xách tay. Nó không hoạt động nếu chưa cấu hình.Vì\n"
 "vậy, cài đặt nó không ảnh hưởng gì về  mặt an toàn nếu không dùng nó."
 
-#: ../../services.pm_.c:63
+#: ../../services.pm_.c:68
 msgid ""
 "The portmapper manages RPC connections, which are used by\n"
 "protocols such as NFS and NIS. The portmap server must be running on "
@@ -10088,7 +9811,7 @@ msgstr ""
 "thức như là NFS và NIS. Máy chủ ánh xạ cổng phải chạy trên các máy tính\n"
 "có chức năng máy chủ dùng các giao thức theo cơ chế RPC."
 
-#: ../../services.pm_.c:66
+#: ../../services.pm_.c:71
 msgid ""
 "Postfix is a Mail Transport Agent, which is the program that moves mail from "
 "one machine to another."
@@ -10096,7 +9819,7 @@ msgstr ""
 "Postfix là chương trình vận chuyển thư, nó chuyển thư từ máy tính này sang "
 "máy tính khác."
 
-#: ../../services.pm_.c:67
+#: ../../services.pm_.c:72
 msgid ""
 "Saves and restores system entropy pool for higher quality random\n"
 "number generation."
@@ -10104,7 +9827,7 @@ msgstr ""
 "Lưu và khôi phục entropy pool của hệ thống để cho hoạt động\n"
 "sinh số ngẫu nhiên có chất lượng cao."
 
-#: ../../services.pm_.c:69
+#: ../../services.pm_.c:74
 msgid ""
 "Assign raw devices to block devices (such as hard drive\n"
 "partitions), for the use of applications such as Oracle"
@@ -10113,7 +9836,7 @@ msgstr ""
 "đĩa cứng)\n"
 ", để sử dụng các phần mềm như Oracle"
 
-#: ../../services.pm_.c:71
+#: ../../services.pm_.c:76
 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"
@@ -10123,7 +9846,7 @@ msgstr ""
 "bằng giao thức RIP. Khi RIP đang được dùng rỗng rãi ở các mạng nhỏ, sẽ cần\n"
 "thêm các giao thức định tuyến phức tạp cho các mạng phức tạp."
 
-#: ../../services.pm_.c:74
+#: ../../services.pm_.c:79
 msgid ""
 "The rstat protocol allows users on a network to retrieve\n"
 "performance metrics for any machine on that network."
@@ -10131,7 +9854,7 @@ msgstr ""
 "Giao thức RSTAT cho phép người dùng trên mạng gọi các\n"
 "thực thi metric cho bất kỳ máy nào trên mạng đó."
 
-#: ../../services.pm_.c:76
+#: ../../services.pm_.c:81
 msgid ""
 "The rusers protocol allows users on a network to identify who is\n"
 "logged in on other responding machines."
@@ -10139,7 +9862,7 @@ msgstr ""
 "Giao thức RUSERS cho phép người dùng trên mạng nhận ra ai\n"
 "đăng nhập vào tại các máy đang đáp ứng khác."
 
-#: ../../services.pm_.c:78
+#: ../../services.pm_.c:83
 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)."
@@ -10147,11 +9870,11 @@ msgstr ""
 "Giao thức RWHO cho phép người dùng từ xa có danh sách toàn bộ người\n"
 "dùng đăng nhập vào một máy đang chạy daemon rwho (tương tự finger)."
 
-#: ../../services.pm_.c:80
+#: ../../services.pm_.c:85
 msgid "Launch the sound system on your machine"
 msgstr "Chạy hệ thống âm thanh trên máy tính của bạn"
 
-#: ../../services.pm_.c:81
+#: ../../services.pm_.c:86
 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."
@@ -10159,64 +9882,64 @@ msgstr ""
 "Syslog là phương tiện thuận lợi mà nhiều daemons dùng để ghi các\n"
 "thông điệp vào các tập tin log hệ thống. Nên chạy syslog thường xuyên."
 
-#: ../../services.pm_.c:83
+#: ../../services.pm_.c:88
 msgid "Load the drivers for your usb devices."
 msgstr "Tải các drivers cho thiết bị usb của bạn."
 
-#: ../../services.pm_.c:84
+#: ../../services.pm_.c:89
 msgid "Starts the X Font Server (this is mandatory for XFree to run)."
 msgstr "Khởi động X Font Server (nhất thiết phải có để chạy XFree)."
 
-#: ../../services.pm_.c:110 ../../services.pm_.c:152
+#: ../../services.pm_.c:115 ../../services.pm_.c:157
 msgid "Choose which services should be automatically started at boot time"
 msgstr "Hãy chọn dịch vụ nào được phép khởi động tự động lúc khởi động máy"
 
-#: ../../services.pm_.c:122
+#: ../../services.pm_.c:127
 msgid "Printing"
 msgstr "In ấn"
 
-#: ../../services.pm_.c:123
+#: ../../services.pm_.c:128
 msgid "Internet"
 msgstr "Internet"
 
-#: ../../services.pm_.c:126
+#: ../../services.pm_.c:131
 msgid "File sharing"
 msgstr "Chia se File"
 
-#: ../../services.pm_.c:128 ../../standalone/drakbackup_.c:1746
+#: ../../services.pm_.c:133 ../../standalone/drakbackup_.c:1709
 msgid "System"
 msgstr "Hệ thống"
 
-#: ../../services.pm_.c:133
+#: ../../services.pm_.c:138
 msgid "Remote Administration"
 msgstr "Quản trị từ xa"
 
-#: ../../services.pm_.c:141
+#: ../../services.pm_.c:146
 msgid "Database Server"
 msgstr "Máy chủ Cơ sở Dữ liệu"
 
-#: ../../services.pm_.c:170
+#: ../../services.pm_.c:175
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "Các dịch vụ: %d được kích hoạt để đăng nhập %d"
 
-#: ../../services.pm_.c:186
+#: ../../services.pm_.c:191
 msgid "Services"
 msgstr "Dịch vụ"
 
-#: ../../services.pm_.c:198
+#: ../../services.pm_.c:203
 msgid "running"
 msgstr "đang chạy"
 
-#: ../../services.pm_.c:198
+#: ../../services.pm_.c:203
 msgid "stopped"
 msgstr "đã dừng"
 
-#: ../../services.pm_.c:212
+#: ../../services.pm_.c:217
 msgid "Services and deamons"
 msgstr "Các dịch vụ và deamon"
 
-#: ../../services.pm_.c:217
+#: ../../services.pm_.c:222
 msgid ""
 "No additional information\n"
 "about this service, sorry."
@@ -10224,15 +9947,15 @@ msgstr ""
 "Xin lỗi, không có thông tin\n"
 "thêm về dịch vụ này."
 
-#: ../../services.pm_.c:224
+#: ../../services.pm_.c:229
 msgid "On boot"
 msgstr "Đang khởi động"
 
-#: ../../services.pm_.c:236
+#: ../../services.pm_.c:241
 msgid "Start"
 msgstr "Bắt đầu"
 
-#: ../../services.pm_.c:236
+#: ../../services.pm_.c:241
 msgid "Stop"
 msgstr "Dừng"
 
@@ -10312,7 +10035,7 @@ msgstr ""
 "Mandrake Linux 9.0 cung cấp các trò chơi Nguồn Mở hay nhất - arcade, hành "
 "động, chiến lược, ..."
 
-#: ../../share/advertising/06-mcc.pl_.c:9 ../../standalone/drakbug_.c:69
+#: ../../share/advertising/06-mcc.pl_.c:9 ../../standalone/drakbug_.c:49
 msgid "Mandrake Control Center"
 msgstr "Trung tâm Điều khiển Mandrake"
 
@@ -10499,178 +10222,774 @@ msgstr ""
 "để tăng tính cạnh tranh, nếu bạn muốn hỗ trợ phát triển Mandrake Linux, hãy "
 "tham gia MandrakeClub!"
 
-#: ../../standalone.pm_.c:49
+#: ../../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 ""
+"Chương trình này là phần mềm miễn phí; bạn có thể phân phối lại hay\n"
+"thay đổi theo các điều khoản của GNU/GPL mà Quỹ Phần Mềm Tự Do\n"
+"công bố; với phiên bản 2, hay bất kỳ phiên bản mới nhất nào.\n"
+"\n"
+"Chương trình này được phân phối với hy vọng là nó có ích,\n"
+"nhưng Không Có Bất Kỳ Bảo Đảm Nào; thậm chí không có bảo đảm về\n"
+"Khả Năng Thương Mại hay Thích Hợp Với Mục Đích Đặc Biệt. Hãy xem\n"
+"GNU/GPL để biết thêm chi tiết.\n"
+"\n"
+"Bạn nên nhận lấy một bản sao của GNU/GPL đi kèm theo\n"
+"chương trình; nếu không có, xin viết thư tới: Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+
+#: ../../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"
+"Chương trình Sao Lưu và Khôi Phục\n"
+"\n"
+"--default             : lưu các thư mục mặc định.\n"
+"--debug               : hiển thị mọi thông báo gỡ lỗi.\n"
+"--show-conf           : danh sách tập tin hay thư mục để sao lưu.\n"
+"--config-info         : giải thích các tùy chọn tập tin cấu hình (cho chế độ "
+"không có X).\n"
+"--daemon              : dùng daemon cấu hình. \n"
+"--help                : hiện thông điệp này.\n"
+"--version             : hiện tên phiên bản.\n"
+
+#: ../../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 ""
+"[Tùy_Chọn] [Tên_Chương_Trình]\n"
+"\n"
+"Tùy Chọn:\n"
+"  --help            - in thông điệp trợ giúp này.\n"
+"  --report          - nên dùng chương trình công cụ của Mandrake\n"
+"  --incident        - Chương trình nên là loại công cụ của Mandrake"
+
+#: ../../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 ""
+"Nhập phông chữ và giám sát chương "
+"trình                                     \n"
+"--windows_import : nhập từ mọi phân vùng windows hiện có.\n"
+"--xls_fonts      : hiện mọi phông đã tồn tại từ xls\n"
+"--strong         : thẩm tra kỹ lưỡng phông chữ.\n"
+"--install        : chấp nhận bất kỳ tập tin phông và thư mục nào.\n"
+"--uninstall      : gỡ cài đặt bấy kỳ phông hay thư mục chứa phông nào.\n"
+"--replace        : thay thế mọi phông đã đang tồn tại\n"
+"--application    : 0 không ứng dụng.\n"
+"                 : 1 mọi ứng dụng hiện có được hỗ trợ.\n"
+"                 : tên_của_ứng dụng như thế cho staroffice \n"
+"                 : và gs cho ghostscript cho mỗi cái này."
+
+#: ../../standalone.pm_.c:68
+msgid ""
+"[OPTIONS]...\n"
+"\t      --debug         print debugging information"
+msgstr ""
+"[Tùy Chọn]...\n"
+"\t      --debug         hiển thị thông tin gỡ rối"
+
+#: ../../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 ""
+"[Tùy Chọn]...\n"
+"Chương Trình Cấu Hình Mandrake Terminal Server\n"
+"--enable         : bật chạy MTS\n"
+"--disable        : tắt MTS\n"
+"--start          : chạy MTS\n"
+"--stop           : dừng MTS\n"
+"--adduser        : thêm một người dùng đang có vào MTS (yêu cầu tên người "
+"dùng)\n"
+"--deluser        : xóa người dùng đang có khỏi MTS (yêu cầu tên người dùng)\n"
+"--addclient      : thêm máy khách vào MTS (yêu cầu địa chỉ MAC, IP, tên ảnh "
+"nbi)\n"
+"--delclient      : xóa máy khách khỏi MTS (yêu cầu địa chỉ MAC, IP, tên ảnh "
+"nbi)"
+
+#: ../../standalone.pm_.c:82
+msgid "[keyboard]"
+msgstr "[bàn phím]"
+
+#: ../../standalone.pm_.c:83
+msgid "[--file=myfyle] [--word=myword] [--explain=regexp] [--alert]"
+msgstr "[--file=myfyle] [--word=myword] [--explain=regexp] [--alert]"
+
+#: ../../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 ""
+"[Tùy Chọn]\n"
+"Kết Nối Mạng & Internet và giám sát ứng dụng\n"
+"\n"
+"--defaultintf interface : hiển thị giao tiếp này theo mặc định\n"
+"--connect : kết nối vào internet nếu chưa sẵn có\n"
+"--disconnect : ngắt kết nối internet nếu đã kết nối rồi\n"
+"--force : được dùng với (ngắt)kết nối : ép buộc (ngắt)kết nối.\n"
+"--status : trả về 1 nếu connected 0 otherwise, sau đó thoát ra.\n"
+"--quiet : không tương tác. Được dùng với (ngắt)kết nối."
+
+#: ../../standalone.pm_.c:93
+msgid " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+msgstr " [--skiptest] [--cups] [--lprng] [--lpd] [--pdq]"
+
+#: ../../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 ""
+"[Tùy Chọn]...\n"
+"  --no-confirmation      không hỏi câu khẳng định trước trong chế độ "
+"MandrakeUpdate\n"
+"  --no-verify-rpm        không kiểm tra chữ ký các gói\n"
+"  --changelog-first      hiển thị bản ghi thay đổi trước danh sách tập tin "
+"trong cửa sổ mô tả\n"
+"  --merge-all-rpmnew     đề nghị hợp nhất mọi tập tin được thấy .rpmnew/."
+"rpmsave"
+
+#: ../../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.pm_.c:100
+msgid ""
+" [everything]\n"
+"       XFdrake [--noauto] monitor\n"
+"       XFdrake resolution"
+msgstr ""
+" [everything]\n"
+"       XFdrake [--noauto] monitor\n"
+"       XFdrake resolution"
+
+#: ../../standalone.pm_.c:114
+#, c-format
+msgid ""
+"\n"
+"Usage: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
+msgstr ""
+"\n"
+"Cách dùng: %s  [--auto] [--beginner] [--expert] [-h|--help] [--noauto] [--"
+"testing] [-v|--version] "
+
+#: ../../standalone.pm_.c:168
 msgid "Installing packages..."
 msgstr "Đang cài đặt các gói tin ..."
 
-#: ../../standalone/XFdrake_.c:148
+#: ../../standalone/XFdrake_.c:138
 msgid "Please log out and then use Ctrl-Alt-BackSpace"
 msgstr "Hãy thoát ra rồi dùng Ctrl-Alt-BackSpace"
 
-#: ../../standalone/XFdrake_.c:152
+#: ../../standalone/XFdrake_.c:142
 #, c-format
 msgid "Please relog into %s to activate the changes"
 msgstr "Hãy đăng nhập lại vào %s để thay đổi có tác dụng"
 
-#: ../../standalone/drakTermServ_.c:188
+#: ../../standalone/drakTermServ_.c:239
 msgid "Mandrake Terminal Server Configuration"
 msgstr "Cấu Hình Máy Chủ Terminal của Mandrake"
 
-#: ../../standalone/drakTermServ_.c:203
+#: ../../standalone/drakTermServ_.c:253
 msgid "Enable Server"
 msgstr "Bật Máy chủ"
 
-#: ../../standalone/drakTermServ_.c:210
+#: ../../standalone/drakTermServ_.c:260
 msgid "Disable Server"
 msgstr "Tắt Máy chủ"
 
-#: ../../standalone/drakTermServ_.c:218
+#: ../../standalone/drakTermServ_.c:268
 msgid "Start Server"
 msgstr "Chạy Máy chủ"
 
-#: ../../standalone/drakTermServ_.c:225
+#: ../../standalone/drakTermServ_.c:275
 msgid "Stop Server"
 msgstr "Dừng Máy chủ"
 
-#: ../../standalone/drakTermServ_.c:233
+#: ../../standalone/drakTermServ_.c:283
 msgid "Etherboot Floppy/ISO"
 msgstr "Etherboot Floppy/ISO"
 
-#: ../../standalone/drakTermServ_.c:235
+#: ../../standalone/drakTermServ_.c:288
 msgid "Net Boot Images"
 msgstr "Ảnh khởi động qua mạng"
 
-#: ../../standalone/drakTermServ_.c:239
+#: ../../standalone/drakTermServ_.c:294
 msgid "Add/Del Users"
 msgstr "Thêm/Bỏ Người Dùng"
 
-#: ../../standalone/drakTermServ_.c:241
+#: ../../standalone/drakTermServ_.c:299
 msgid "Add/Del Clients"
 msgstr "Thêm/Bỏ Client"
 
-#: ../../standalone/drakTermServ_.c:436
+#: ../../standalone/drakTermServ_.c:328
+msgid ""
+"\n"
+" Copyright (C) 2002 by MandrakeSoft \n"
+"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
+"\n"
+msgstr ""
+"\n"
+" Bản quyền (C) 2002 của MandrakeSoft \n"
+"\tStew Benedict sbenedict\\@mandrakesoft.com\n"
+"\n"
+
+#: ../../standalone/drakTermServ_.c:332
+msgid ""
+"\n"
+"\n"
+" Thanks:\n"
+"\t- LTSP Project http://www.ltsp.org\n"
+"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+" Cảm ơn:\n"
+"\t- Dự án LTSP http://www.ltsp.org\n"
+"\t- Michael Brown <mbrown\\@fensystems.co.uk>\n"
+"\n"
+
+#: ../../standalone/drakTermServ_.c:365
+msgid ""
+"drakTermServ Overview\n"
+"\t\t\t   \n"
+"        - Create Etherboot Enabled Boot Images:\n"
+"        \t\tTo boot a kernel via etherboot, a special kernel/initrdrd image "
+"must be created.\n"
+"        \t\tmkinitrd-net does much of this work and drakTermServ is just a "
+"graphical interface\n"
+"        \t\tto help manage/customize these images.\n"
+"\n"
+"        - Maintain /etc/dhcpd.conf:\n"
+"        \t\tTo net boot clients, each client needs a dhcpd.conf entry, "
+"assigning an IP address\n"
+"        \t\tand net boot images to the machine. drakTermServ helps create/"
+"remove these entries.\n"
+"\t\t\t\n"
+"        \t\t(PCI cards may omit the image - etherboot will request the "
+"correct image. You should\n"
+"        \t\talso consider that when etherboot looks for the images, it "
+"expects names like\n"
+"        \t\tboot-3c59x.nbi, rather than boot-3c59x.2.4.19-16mdk.nbi).\n"
+"\t\t\t \n"
+"        \t\tA typical dhcpd.conf stanza to support a diskless client looks "
+"like:\n"
+"        \t\t\n"
+"\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\tfilename                      \"i386/boot/boot-3c509.2.4.18-6mdk."
+"nbi\";\n"
+"\t\t\t\t}\n"
+"\t\t\t\n"
+"\t\t\tWhile you can use a pool of IP addresses, rather than setup a specific "
+"entry for\n"
+"\t\t\ta client machine, using a fixed address scheme facilitates using the "
+"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\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\\$\\"
+"$IP=client_ip\\$\\$ is\n"
+"\t\t\twritten for thin clients. System config files xdm-config, kdmrc, and "
+"gdm.conf are modified\n"
+"\t\t\tif thin clients are used, to enable xdmcp. Since there are security "
+"issues in using xdmcp,\n"
+"\t\t\thosts.deny and hosts.allow are modified to limit access to the local "
+"subnet.\n"
+"\t\t\t\n"
+"\t\t\tNote: You must stop/start the server after adding or changing "
+"clients.\n"
+"\t\t\t\n"
+"        - Maintain /etc/exports:\n"
+"        \t\tClusternfs allows export of the root filesystem to diskless "
+"clients. drakTermServ\n"
+"        \t\tsets up the correct entry to allow anonymous access to the root "
+"filesystem from\n"
+"        \t\tdiskless clients.\n"
+"\n"
+"        \t\tA typical exports entry for clusternfs is:\n"
+"        \t\t\n"
+"        \t\t/                  (ro,all_squash)\n"
+"        \t\t/home              SUBNET/MASK(rw,root_squash)\n"
+"\t\t\t\n"
+"\t\t\tWith SUBNET/MASK being defined for your network.\n"
+"        \t\t\n"
+"        - Maintain /etc/shadow\\$\\$CLIENT\\$\\$:\n"
+"        \t\tFor users to be able to log into the system from a diskless "
+"client, their entry in\n"
+"        \t\t/etc/shadow needs to be duplicated in /etc/shadow\\$\\$CLIENTS\\$"
+"\\$. drakTermServ helps\n"
+"        \t\tin this respect by adding or removing system users from this "
+"file.\n"
+"\n"
+"        - Per client /etc/X11XF86Config-4\\$\\$IP-ADDRESS\\$\\$:\n"
+"        \t\tThrough clusternfs, each diskless client can have it's own "
+"unique configuration files\n"
+"        \t\ton the root filesystem of the server. In the future drakTermServ "
+"will help create these\n"
+"        \t\tfiles.\n"
+"\n"
+"        - Per client system configuration files:\n"
+"        \t\tThrough clusternfs, each diskless client can have it's own "
+"unique configuration files\n"
+"        \t\ton the root filesystem of the server. In the future, "
+"drakTermServ can help create files\n"
+"        \t\tsuch as /etc/modules.conf, /etc/sysconfig/mouse, /etc/sysconfig/"
+"keyboard on a per-client\n"
+"        \t\tbasis.\n"
+"\n"
+"        - /etc/xinetd.d/tftp:\n"
+"        \t\tdrakTermServ will configure this file to work in conjunction "
+"with the images created by\n"
+"        \t\tmkinitrd-net, and the entries in /etc/dhcpd.conf, to serve up "
+"the boot image to each\n"
+"        \t\tdiskless client.\n"
+"\n"
+"        \t\tA typical tftp configuration file looks like:\n"
+"        \t\t\n"
+"        \t\tservice tftp\n"
+"        \t\t(\n"
+"                        disable         = no\n"
+"                        socket_type  = dgram\n"
+"                        protocol        = udp\n"
+"                        wait             = yes\n"
+"                        user             = root\n"
+"                        server          = /usr/sbin/in.tftpd\n"
+"                        server_args  = -s /var/lib/tftpboot\n"
+"        \t\t}\n"
+"        \t\t\n"
+"        \t\tThe changes here from the default installation are changing the "
+"disable flag to\n"
+"        \t\t'no' and changing the directory path to /var/lib/tftpboot, where "
+"mkinitrd-net\n"
+"        \t\tputs it's images.\n"
+"\n"
+"        - Create etherboot floppies/CDs:\n"
+"        \t\tThe diskless client machines need either ROM images on the NIC, "
+"or a boot floppy\n"
+"        \t\tor CD to initate the boot sequence.  drakTermServ will help "
+"generate these images,\n"
+"        \t\tbased on the NIC in the client machine.\n"
+"        \t\t\n"
+"        \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"
+" \n"
+"\n"
+msgstr ""
+"Xem lại drakTermServ\n"
+"\t\t\t   \n"
+"        - Tạo Etherboot được phép chạy các ảnh khởi động:\n"
+"        \t\tĐể khởi động một kernel qua etherboot, cần tạo ảnh kernel/ "
+"initrdrd đặc biệt.\n"
+"        \t\tmkinitrd-net thực hiện việc này và drakTermServ là giao diện đồ "
+"họa\n"
+"        \t\tđể giúp quản lý/tùy chỉnh những ảnh này.\n"
+"\n"
+"        - Bảo trì /etc/dhcpd.conf:\n"
+"        \t\tcho các máy khách khởi động qua mạng, mỗi máy khách cần một mục "
+"nhập dhcpd.conf, cấp phát một địa chỉ IP\n"
+"        \t\tvà các ảnh khởi động mạng đến máy tính. drakTermServ giúp tạo/bỏ "
+"các mục nhập này.\n"
+"\t\t\t\n"
+"        \t\t(Các PCI card có thể bỏ quên ảnh - etherboot sẽ yêu cầu ảnh "
+"đúng. Bạn cũng\n"
+"        \t\tnên biết là khi etherboot tìm các ảnh, nó sẽ cần các tên kiểu "
+"như\n"
+"        \t\tboot-3c59x.nbi, hơn là boot-3c59x.2.4.19-16mdk.nbi).\n"
+"\t\t\t \n"
+"        \t\tMột dhcpd.conf stanza điển hình để hỗ trợ máy khách không ổ đĩa "
+"sẽ có kiểu:\n"
+"        \t\t\n"
+"\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\tfilename                      \"i386/boot/boot-3c509.2.4.18-6mdk."
+"nbi\";\n"
+"\t\t\t\t}\n"
+"\t\t\t\n"
+"\t\t\tKhi bạn có thể dùng pool của địa chỉ IP, hơn là lập một mục nhập riêng "
+"cho\n"
+"\t\t\tmột máy khách, dùng một fixed address scheme để tiện dùng tính năng "
+"này\n"
+"\t\t\tcủa các tập tin cấu hình máy khách cụ thể mà ClusterNFS cung cấp.\n"
+"\t\t\t\n"
+"\t\t\tLưu ý: Mục nhập \"/*type\" chỉ có drakTermServ sử dụng. Máy khách có "
+"thể là \"gầy\"*/\n"
+"\t\t\tor 'béo'.  Máy khách gầy chạy các phần mềm trên máy chủ qua xdmcp, "
+"trong khi máy khách béo chạy\n"
+"\t\t\tchủ yếu trên máy tính khách. Một inittab, /etc/inittab\\$\\"
+"$IP=client_ip\\$\\$ is\n"
+"\t\t\tđặc biệt được viết cho máy khách gầy. Các tập tin cấu hình hệ thống "
+"xdm-config, kdmrc, và gdm.conf được thay đổi\n"
+"\t\t\tnếu máy khách gầy được dùng, để bật chạy xdmcp. Vì có các vấn đề về "
+"bảo mật khi dùng xdmcp,\n"
+"\t\t\thosts.deny và hosts.allow được thay đổi để giới hạn truy cập vào "
+"subnet cục bộ.\n"
+"\t\t\t\n"
+"\t\t\tLưu ý: Bạn phải dừng/chạy máy chủ sau khi thêm hay thay đổi các máy "
+"khách.\n"
+"\t\t\t\n"
+"        - Bảo trì /etc/exports:\n"
+"        \t\tClusternfs cho phép xuất ra hệ thống tập tin root tới các máy "
+"khách không đĩa. drakTermServ\n"
+"        \t\tthiết lập mục nhập đúng để cho phép người dùng vô danh truy cập "
+"hệ thống tập tin root từ\n"
+"        \t\tmáy khách không đĩa.\n"
+"\n"
+"        \t\tMột mục xuất ra điển hình cho clusternfs là:\n"
+"        \t\t\n"
+"        \t\t/                  (ro,all_squash)\n"
+"        \t\t/home              SUBNET/MASK(rw,root_squash)\n"
+"\t\t\t\n"
+"\t\t\tVới  SUBNET/MASK đang được định nghĩa cho mạng của bạn.\n"
+"        \t\t\n"
+"        - Bảo trì /etc/shadow\\$\\$CLIENT\\$\\$:\n"
+"        \t\tĐể người dùng có thể đăng nhập hệ thống từ máy khách không đĩa, "
+"mục nhập của chúng trong\n"
+"        \t\t/etc/shadow cần được nhân đôi trong /etc/shadow\\$\\$CLIENTS\\$\\"
+"$. Trợ giúp drakTermServ\n"
+"        \t\tin this respect by adding or removing system users from this "
+"file.\n"
+"\n"
+"        - Per client /etc/X11XF86Config-4\\$\\$IP-ADDRESS\\$\\$:\n"
+"        \t\tThrough clusternfs, each diskless client can have it's own "
+"unique configuration files\n"
+"        \t\ton the root filesystem of the server. In the future drakTermServ "
+"will help create these\n"
+"        \t\tfiles.\n"
+"\n"
+"        - Per client system configuration files:\n"
+"        \t\tThrough clusternfs, each diskless client can have it's own "
+"unique configuration files\n"
+"        \t\ton the root filesystem of the server. In the future, "
+"drakTermServ can help create files\n"
+"        \t\tsuch as /etc/modules.conf, /etc/sysconfig/mouse, /etc/sysconfig/"
+"keyboard on a per-client\n"
+"        \t\tbasis.\n"
+"\n"
+"        - /etc/xinetd.d/tftp:\n"
+"        \t\tdrakTermServ will configure this file to work in conjunction "
+"with the images created by\n"
+"        \t\tmkinitrd-net, and the entries in /etc/dhcpd.conf, to serve up "
+"the boot image to each\n"
+"        \t\tdiskless client.\n"
+"\n"
+"        \t\tA typical tftp configuration file looks like:\n"
+"        \t\t\n"
+"        \t\tservice tftp\n"
+"        \t\t(\n"
+"                        disable         = no\n"
+"                        socket_type  = dgram\n"
+"                        protocol        = udp\n"
+"                        wait             = yes\n"
+"                        user             = root\n"
+"                        server          = /usr/sbin/in.tftpd\n"
+"                        server_args  = -s /var/lib/tftpboot\n"
+"        \t\t}\n"
+"        \t\t\n"
+"        \t\tThe changes here from the default installation are changing the "
+"disable flag to\n"
+"        \t\t'no' and changing the directory path to /var/lib/tftpboot, where "
+"mkinitrd-net\n"
+"        \t\tputs it's images.\n"
+"\n"
+"        - Create etherboot floppies/CDs:\n"
+"        \t\tThe diskless client machines need either ROM images on the NIC, "
+"or a boot floppy\n"
+"        \t\tor CD to initate the boot sequence.  drakTermServ will help "
+"generate these images,\n"
+"        \t\tbased on the NIC in the client machine.\n"
+"        \t\t\n"
+"        \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"
+" \n"
+"\n"
+
+#: ../../standalone/drakTermServ_.c:488
 msgid "Boot Floppy"
 msgstr "Đĩa mềm Khởi động"
 
-#: ../../standalone/drakTermServ_.c:438
+#: ../../standalone/drakTermServ_.c:490
 msgid "Boot ISO"
 msgstr "ISO khởi động"
 
-#: ../../standalone/drakTermServ_.c:507
+#: ../../standalone/drakTermServ_.c:559
 msgid "Build Whole Kernel -->"
 msgstr "Xây dựng toàn bộ Kernel -->"
 
-#: ../../standalone/drakTermServ_.c:509 ../../standalone/drakTermServ_.c:539
+#: ../../standalone/drakTermServ_.c:561 ../../standalone/drakTermServ_.c:591
 msgid "This will take a few minutes."
 msgstr "Việc này kéo dài ít phút."
 
-#: ../../standalone/drakTermServ_.c:521
+#: ../../standalone/drakTermServ_.c:573
 msgid "No kernel selected!"
 msgstr "Không có Kernel được chọn!"
 
-#: ../../standalone/drakTermServ_.c:524
+#: ../../standalone/drakTermServ_.c:576
 msgid "Build Single NIC -->"
 msgstr "Xây dựng NIC Đơn -->"
 
-#: ../../standalone/drakTermServ_.c:535
+#: ../../standalone/drakTermServ_.c:587
 msgid "No nic selected!"
 msgstr "Không có NIC được chọn!"
 
-#: ../../standalone/drakTermServ_.c:538
+#: ../../standalone/drakTermServ_.c:590
 msgid "Build All Kernels -->"
 msgstr "Xây dựng toàn bộ Kernel -->"
 
-#: ../../standalone/drakTermServ_.c:552
+#: ../../standalone/drakTermServ_.c:604
 msgid "<-- Delete"
 msgstr "<-- Xoá"
 
-#: ../../standalone/drakTermServ_.c:559
+#: ../../standalone/drakTermServ_.c:611
 msgid "Delete All NBIs"
 msgstr "Xoá mọi NBI"
 
-#: ../../standalone/drakTermServ_.c:621
+#: ../../standalone/drakTermServ_.c:668
+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."
+msgstr ""
+"!!! Các chỉ thị mật khẩu trong cơ sở dữ liệu hệ thống là khác với \n"
+" chỉ thị trong cơ sở dữ liệu của Terminal Server.\n"
+"Xóa/thêm lại người dùng vào Terminal Server để cho đăng nhập."
+
+#: ../../standalone/drakTermServ_.c:673
 msgid "Add User -->"
 msgstr "Thêm người dùng-->"
 
-#: ../../standalone/drakTermServ_.c:629
+#: ../../standalone/drakTermServ_.c:681
 msgid "<-- Del User"
 msgstr "<-- Xoá Người Dùng"
 
-#: ../../standalone/drakTermServ_.c:694
+#: ../../standalone/drakTermServ_.c:720
+#, c-format
+msgid "type: %s"
+msgstr "kiểu: %s"
+
+#: ../../standalone/drakTermServ_.c:753
 msgid "No net boot images created!"
 msgstr "Không có các ảnh khởi động qua mạng được tạo!"
 
-#: ../../standalone/drakTermServ_.c:710
+#: ../../standalone/drakTermServ_.c:773
+msgid "Thin Client"
+msgstr "Thin Client"
+
+#: ../../standalone/drakTermServ_.c:775
+msgid "Allow Thin Clients"
+msgstr "Cho phép Thin Client"
+
+#: ../../standalone/drakTermServ_.c:778
 msgid "Add Client -->"
 msgstr "Thêm Máy Khách-->"
 
-#: ../../standalone/drakTermServ_.c:742
-msgid "<-- Del Client"
-msgstr "<--Xoá Máy Khách"
+#: ../../standalone/drakTermServ_.c:821
+msgid "<-- Edit Client"
+msgstr "<-- Biên soạn Máy Khách"
 
-#: ../../standalone/drakTermServ_.c:748
+#: ../../standalone/drakTermServ_.c:837
+msgid "Delete Client"
+msgstr "Xoá Máy Khách"
+
+#: ../../standalone/drakTermServ_.c:843
 msgid "dhcpd Config..."
 msgstr "Cấu hình DHCPd..."
 
-#: ../../standalone/drakTermServ_.c:873
+#: ../../standalone/drakTermServ_.c:876
+msgid ""
+"Need to restart the Display Manager for full changes to take effect. \n"
+"(service dm restart - at the console)"
+msgstr ""
+"Cần khởi chạy lại Trình Quản Lý Hiển Thị để mọi thay đổi có tác dụng. \n"
+"(khởi chạy lại dịch vụ DM - tại console)"
+
+#: ../../standalone/drakTermServ_.c:894
+msgid "Subnet:"
+msgstr "Subnet:"
+
+#: ../../standalone/drakTermServ_.c:901
+msgid "Netmask:"
+msgstr "Netmask:"
+
+#: ../../standalone/drakTermServ_.c:908
+msgid "Routers:"
+msgstr "Routers:"
+
+#: ../../standalone/drakTermServ_.c:915
+msgid "Subnet Mask:"
+msgstr "Subnet Mask:"
+
+#: ../../standalone/drakTermServ_.c:922
+msgid "Broadcast Address:"
+msgstr "Địa Chỉ Truyền Thông (Address Broadcast):"
+
+#: ../../standalone/drakTermServ_.c:929
+msgid "Domain Name:"
+msgstr "Tên Miền:"
+
+#: ../../standalone/drakTermServ_.c:937
+msgid "Name Servers:"
+msgstr "Tên Máy Chủ:"
+
+#: ../../standalone/drakTermServ_.c:948
+msgid "IP Range Start:"
+msgstr "Bắt đầu chuỗi IP:"
+
+#: ../../standalone/drakTermServ_.c:949
+msgid "IP Range End:"
+msgstr "Kết thúc chuỗi IP:"
+
+#: ../../standalone/drakTermServ_.c:1001
 msgid "dhcpd Server Configuration"
 msgstr "Cấu hình Máy chủ dhcpd"
 
-#: ../../standalone/drakTermServ_.c:874
+#: ../../standalone/drakTermServ_.c:1002
 msgid ""
 "Most of these values were extracted\n"
-"from your running system. You can modify as needed."
+"from your running system.\n"
+"You can modify as needed."
 msgstr ""
-"Hầu hết các giá trị này đã được bật ra\n"
-"từ hệ thống đang chạy. Bạn có thể biến đổi nếu cần."
+"Hầu hết các giá trị này đã được lấy\n"
+"ra từ hệ thống bạn đang chạy.\n"
+"Bạn có thể biến đổi nếu cần."
+
+#: ../../standalone/drakTermServ_.c:1005
+msgid "Dynamic IP Address Pool:"
+msgstr "Pool Địa Chỉ IP Động:"
 
-#: ../../standalone/drakTermServ_.c:875
+#: ../../standalone/drakTermServ_.c:1018
 msgid "Write Config"
 msgstr "Ghi Cấu Hình"
 
-#: ../../standalone/drakTermServ_.c:965
+#: ../../standalone/drakTermServ_.c:1120
 msgid "Please insert floppy disk:"
 msgstr "Hãy nạp đĩa mềm :"
 
-#: ../../standalone/drakTermServ_.c:969
+#: ../../standalone/drakTermServ_.c:1124
 msgid "Couldn't access the floppy!"
 msgstr "Không thể truy cập đĩa mềm!"
 
-#: ../../standalone/drakTermServ_.c:971
+#: ../../standalone/drakTermServ_.c:1126
 msgid "Floppy can be removed now"
 msgstr "Bây giờ có thể bỏ đĩa mềm ra"
 
-#: ../../standalone/drakTermServ_.c:974
+#: ../../standalone/drakTermServ_.c:1129
 msgid "No floppy drive available!"
 msgstr "Hiện không có ổ đĩa mềm nào!"
 
-#: ../../standalone/drakTermServ_.c:983
+#: ../../standalone/drakTermServ_.c:1138
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Ảnh Etherboot ISO là %s"
 
-#: ../../standalone/drakTermServ_.c:985
+#: ../../standalone/drakTermServ_.c:1140
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Điều gì đó không đúng! - Đã cài đặt mkisofs chưa?"
 
-#: ../../standalone/drakTermServ_.c:1004
+#: ../../standalone/drakTermServ_.c:1159
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Cần tạo /etc/dhcpd.conf trước tiên!"
 
-#: ../../standalone/drakautoinst_.c:43
+#: ../../standalone/drakTermServ_.c:1451
+msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
+msgstr "/etc/hosts.allow và /etc/hosts.deny đã cấu hình rồi - không thay đổi"
+
+#: ../../standalone/drakautoinst_.c:40
 msgid "Error!"
 msgstr "Lỗi!"
 
-#: ../../standalone/drakautoinst_.c:44
+#: ../../standalone/drakautoinst_.c:41
 #, c-format
 msgid "I can't find needed image file `%s'."
 msgstr "Không thể tìm thấy tập tin ảnh cần dùng `%s'."
 
-#: ../../standalone/drakautoinst_.c:46
+#: ../../standalone/drakautoinst_.c:43
 msgid "Auto Install Configurator"
 msgstr "Cấu hình cài đặt tự động"
 
-#: ../../standalone/drakautoinst_.c:47
+#: ../../standalone/drakautoinst_.c:44
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
 "dangerous and must be used circumspectly.\n"
@@ -10696,11 +11015,19 @@ msgstr ""
 "\n"
 "Bạn có muốn tiếp tục?"
 
-#: ../../standalone/drakautoinst_.c:69
+#: ../../standalone/drakautoinst_.c:62 ../../standalone/drakautoinst_.c:71
+msgid "manual"
+msgstr "tài liệu"
+
+#: ../../standalone/drakautoinst_.c:62
+msgid "replay"
+msgstr "Diễn lại"
+
+#: ../../standalone/drakautoinst_.c:66
 msgid "Automatic Steps Configuration"
 msgstr "Cấu hình các bước tự động"
 
-#: ../../standalone/drakautoinst_.c:70
+#: ../../standalone/drakautoinst_.c:67
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
 "will be manual"
@@ -10708,11 +11035,11 @@ msgstr ""
 "Hãy thực hiện chọn cho từng bước: nó sẽ diễn lại giống như bạn đã cài đặt "
 "hay là sẽ được thao tác bằng tay"
 
-#: ../../standalone/drakautoinst_.c:81 ../../standalone/drakautoinst_.c:82
+#: ../../standalone/drakautoinst_.c:78 ../../standalone/drakautoinst_.c:79
 msgid "Creating auto install floppy"
 msgstr "Tạo đĩa mềm cài đặt tự động"
 
-#: ../../standalone/drakautoinst_.c:144
+#: ../../standalone/drakautoinst_.c:139
 msgid ""
 "\n"
 "Welcome.\n"
@@ -10724,12 +11051,12 @@ msgstr ""
 "\n"
 "Các thông số có sẵn cho việc cài đặt tự động nằm ở các mục ở bên trái"
 
-#: ../../standalone/drakautoinst_.c:239 ../../standalone/drakgw_.c:508
-#: ../../standalone/scannerdrake_.c:119
+#: ../../standalone/drakautoinst_.c:234 ../../standalone/drakgw_.c:504
+#: ../../standalone/scannerdrake_.c:117
 msgid "Congratulations!"
 msgstr "Chúc mừng!"
 
-#: ../../standalone/drakautoinst_.c:240
+#: ../../standalone/drakautoinst_.c:235
 msgid ""
 "The floppy has been successfully generated.\n"
 "You may now replay your installation."
@@ -10737,35 +11064,35 @@ msgstr ""
 "Đĩa mềm tự động cài đặt đã được tạo ra.\n"
 "Bạn có thể diễn lại quá trình cài đặt đã thực hiện."
 
-#: ../../standalone/drakautoinst_.c:278
+#: ../../standalone/drakautoinst_.c:273
 msgid "Auto Install"
 msgstr "Cài đặt Tự động"
 
-#: ../../standalone/drakautoinst_.c:348
+#: ../../standalone/drakautoinst_.c:343
 msgid "Add an item"
 msgstr "Thêm một mục"
 
-#: ../../standalone/drakautoinst_.c:355
+#: ../../standalone/drakautoinst_.c:350
 msgid "Remove the last item"
 msgstr "Bỏ mục gần đây nhất"
 
-#: ../../standalone/drakbackup_.c:617
+#: ../../standalone/drakbackup_.c:580
 msgid "Cron not available yet as non-root"
 msgstr "Vẫn chưa có sẵn cron nếu không phải root"
 
-#: ../../standalone/drakbackup_.c:723
+#: ../../standalone/drakbackup_.c:690
 msgid "WARNING"
 msgstr "Cảnh Báo"
 
-#: ../../standalone/drakbackup_.c:724
+#: ../../standalone/drakbackup_.c:691
 msgid "FATAL"
 msgstr "Trầm Trọng"
 
-#: ../../standalone/drakbackup_.c:725
+#: ../../standalone/drakbackup_.c:692
 msgid "INFO"
 msgstr "Thông Tin"
 
-#: ../../standalone/drakbackup_.c:737
+#: ../../standalone/drakbackup_.c:704
 msgid ""
 "\n"
 "                      DrakBackup Report \n"
@@ -10775,7 +11102,7 @@ msgstr ""
 "                      Báo cáo DrakBackup \n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:738
+#: ../../standalone/drakbackup_.c:705
 msgid ""
 "\n"
 "                      DrakBackup Daemon Report\n"
@@ -10787,7 +11114,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:742
+#: ../../standalone/drakbackup_.c:709
 msgid ""
 "\n"
 "                    DrakBackup Report Details\n"
@@ -10799,12 +11126,12 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:763 ../../standalone/drakbackup_.c:836
-#: ../../standalone/drakbackup_.c:891
+#: ../../standalone/drakbackup_.c:730 ../../standalone/drakbackup_.c:803
+#: ../../standalone/drakbackup_.c:859
 msgid "Total progess"
 msgstr "Toàn bộ tiến trình"
 
-#: ../../standalone/drakbackup_.c:818
+#: ../../standalone/drakbackup_.c:785
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -10817,41 +11144,41 @@ msgstr ""
 "Cảnh báo: Nếu đã hoàn thành tiến trình này bạn sẽ có thể \n"
 " cần xoá mục nhập ra khỏi authorized_keys trên máy chủ."
 
-#: ../../standalone/drakbackup_.c:827
+#: ../../standalone/drakbackup_.c:794
 msgid "This may take a moment to generate the keys."
 msgstr "Việc này mất chút thời gian để tạo các khoá (key)."
 
-#: ../../standalone/drakbackup_.c:834
+#: ../../standalone/drakbackup_.c:801
 #, c-format
 msgid "ERROR: Cannot spawn %s."
 msgstr "Lỗi: không thể  spawn %s."
 
-#: ../../standalone/drakbackup_.c:851
+#: ../../standalone/drakbackup_.c:818
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Không có dấu nhắc mật khẩu trên %s tại cổng %s"
 
-#: ../../standalone/drakbackup_.c:852
+#: ../../standalone/drakbackup_.c:819
 #, c-format
 msgid "Bad password on %s"
 msgstr "Mật khẩu tồi trên %s"
 
-#: ../../standalone/drakbackup_.c:853
+#: ../../standalone/drakbackup_.c:820
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "Quyền sử dụng bị từ chối khi truyền tải %s đến %s"
 
-#: ../../standalone/drakbackup_.c:854
+#: ../../standalone/drakbackup_.c:821
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "Không thể tìm %s trên %s"
 
-#: ../../standalone/drakbackup_.c:857
+#: ../../standalone/drakbackup_.c:824
 #, c-format
 msgid "%s not responding"
 msgstr "%s không đáp ứng"
 
-#: ../../standalone/drakbackup_.c:861
+#: ../../standalone/drakbackup_.c:828
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -10868,64 +11195,64 @@ msgstr ""
 "\n"
 "mà không bị nhắc nhở về mật khẩu."
 
-#: ../../standalone/drakbackup_.c:905
+#: ../../standalone/drakbackup_.c:873
 msgid "WebDAV remote site already in sync!"
 msgstr "Site từ xa WebDAV đã đồng bộ hoá rồi!"
 
-#: ../../standalone/drakbackup_.c:909
+#: ../../standalone/drakbackup_.c:877
 msgid "WebDAV transfer failed!"
 msgstr "Không truyền tải WebDAV được!"
 
-#: ../../standalone/drakbackup_.c:930
+#: ../../standalone/drakbackup_.c:898
 msgid "No CDR/DVDR in drive!"
 msgstr "Không có CDR/DVDR trong ổ đĩa!"
 
-#: ../../standalone/drakbackup_.c:934
+#: ../../standalone/drakbackup_.c:902
 msgid "Does not appear to be recordable media!"
 msgstr "Có vẻ như không phải phương tiện có thể ghi lại được!"
 
-#: ../../standalone/drakbackup_.c:938
+#: ../../standalone/drakbackup_.c:906
 msgid "Not erasable media!"
 msgstr "Không phải phương tiện xoá được!"
 
-#: ../../standalone/drakbackup_.c:977
+#: ../../standalone/drakbackup_.c:945
 msgid "This may take a moment to erase the media."
 msgstr "Việc này mất chút thời gian để xoá phương tiện."
 
-#: ../../standalone/drakbackup_.c:1062
+#: ../../standalone/drakbackup_.c:1033
 msgid "Permission problem accessing CD."
 msgstr "Có vấn đề về quyền truy cập CD."
 
-#: ../../standalone/drakbackup_.c:1089
+#: ../../standalone/drakbackup_.c:1060
 #, c-format
 msgid "No tape in %s!"
 msgstr "Không có băng từ trong %s!"
 
-#: ../../standalone/drakbackup_.c:1201 ../../standalone/drakbackup_.c:1250
+#: ../../standalone/drakbackup_.c:1174 ../../standalone/drakbackup_.c:1223
 msgid "Backup system files..."
 msgstr "Sao lưu các tập tin hệ thống..."
 
-#: ../../standalone/drakbackup_.c:1251 ../../standalone/drakbackup_.c:1318
+#: ../../standalone/drakbackup_.c:1224 ../../standalone/drakbackup_.c:1291
 msgid "Hard Disk Backup files..."
 msgstr "Các file Sao chép Dự phòng trên HDD ..."
 
-#: ../../standalone/drakbackup_.c:1263
+#: ../../standalone/drakbackup_.c:1236
 msgid "Backup User files..."
 msgstr "Sao lưu Tập tin Người dùng ..."
 
-#: ../../standalone/drakbackup_.c:1264
+#: ../../standalone/drakbackup_.c:1237
 msgid "Hard Disk Backup Progress..."
 msgstr "Tiến trình Sao lưu Đĩa cứng..."
 
-#: ../../standalone/drakbackup_.c:1317
+#: ../../standalone/drakbackup_.c:1290
 msgid "Backup Other files..."
 msgstr "Sao lưu các Tập tin khác ..."
 
-#: ../../standalone/drakbackup_.c:1323
+#: ../../standalone/drakbackup_.c:1296
 msgid "No changes to backup!"
 msgstr "Không có thay đổi nào để sao lưu !"
 
-#: ../../standalone/drakbackup_.c:1339 ../../standalone/drakbackup_.c:1362
+#: ../../standalone/drakbackup_.c:1312 ../../standalone/drakbackup_.c:1335
 #, c-format
 msgid ""
 "\n"
@@ -10936,7 +11263,7 @@ msgstr ""
 "Các hoạt động của Drakbackup thông qua %s:\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:1346
+#: ../../standalone/drakbackup_.c:1319
 #, c-format
 msgid ""
 "file list sent by FTP: %s\n"
@@ -10945,7 +11272,7 @@ msgstr ""
 "danh sách tập tin gửi qua FTP: %s\n"
 " "
 
-#: ../../standalone/drakbackup_.c:1349
+#: ../../standalone/drakbackup_.c:1322
 msgid ""
 "\n"
 " FTP connection problem: It was not possible to send your backup files by "
@@ -10955,7 +11282,7 @@ msgstr ""
 " Kết nối FTP có vấn đề: đã không thể gửi các tập tin sao lưu bằng kết nối "
 "FTP.\n"
 
-#: ../../standalone/drakbackup_.c:1367
+#: ../../standalone/drakbackup_.c:1340
 msgid ""
 "\n"
 "Drakbackup activities via CD:\n"
@@ -10965,7 +11292,7 @@ msgstr ""
 "Các hoạt động của Drakbackup thông qua CD:\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:1372
+#: ../../standalone/drakbackup_.c:1345
 msgid ""
 "\n"
 "Drakbackup activities via tape:\n"
@@ -10975,24 +11302,24 @@ msgstr ""
 "Các hoạt động của Drakbackup thông qua băng từ:\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:1381
+#: ../../standalone/drakbackup_.c:1354
 msgid " Error during mail sending. \n"
 msgstr " Lỗi khi đang gửi mail. \n"
 
-#: ../../standalone/drakbackup_.c:1406
+#: ../../standalone/drakbackup_.c:1380
 msgid "Can't create catalog!"
 msgstr "Không thể tạo catalog!"
 
-#: ../../standalone/drakbackup_.c:1519 ../../standalone/drakbackup_.c:1530
-#: ../../standalone/drakfont_.c:1004
+#: ../../standalone/drakbackup_.c:1490 ../../standalone/drakbackup_.c:1501
+#: ../../standalone/drakfont_.c:946
 msgid "File Selection"
 msgstr "Lựa chọn File"
 
-#: ../../standalone/drakbackup_.c:1558
+#: ../../standalone/drakbackup_.c:1529
 msgid "Select the files or directories and click on 'Add'"
 msgstr "Chọn các tập tin hay thư mục và nhấn 'Add'"
 
-#: ../../standalone/drakbackup_.c:1602
+#: ../../standalone/drakbackup_.c:1573
 msgid ""
 "\n"
 "Please check all options that you need.\n"
@@ -11000,26 +11327,26 @@ msgstr ""
 "\n"
 "Hãy kiểm tra mọi tùy chọn được cần đến.\n"
 
-#: ../../standalone/drakbackup_.c:1603
+#: ../../standalone/drakbackup_.c:1574
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 "Những tùy chọn này có thể sao lưu và khôi phục mọi tập tin trong thư mục /"
 "etc\n"
 
-#: ../../standalone/drakbackup_.c:1604
+#: ../../standalone/drakbackup_.c:1575
 msgid "Backup your System files. (/etc directory)"
 msgstr "Sao lưu các tập tin hệ thống của bạn. (thư mục /etc)"
 
-#: ../../standalone/drakbackup_.c:1605
+#: ../../standalone/drakbackup_.c:1576
 msgid "Use incremental backup  (do not replace old backups)"
 msgstr "Dùng sao lưu mới (không thay thế các sao lưu cũ)"
 
-#: ../../standalone/drakbackup_.c:1606
+#: ../../standalone/drakbackup_.c:1577
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Không bao gồm các tập tin đặc biệt (mật khẩu, nhóm, fstab)"
 
-#: ../../standalone/drakbackup_.c:1607
+#: ../../standalone/drakbackup_.c:1578
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
@@ -11027,43 +11354,43 @@ msgstr ""
 "Với tùy chọn này, có thể khôi phục bất kỳ phiên bản\n"
 " trong thư mục /etc ."
 
-#: ../../standalone/drakbackup_.c:1624
+#: ../../standalone/drakbackup_.c:1595
 msgid "Please check all users that you want to include in your backup."
 msgstr "Hãy chọn toàn bộ người dùng bạn muốn giữ trong sao lưu."
 
-#: ../../standalone/drakbackup_.c:1651
+#: ../../standalone/drakbackup_.c:1622
 msgid "Do not include the browser cache"
 msgstr "Không bao gồm cache của trình duyệt"
 
-#: ../../standalone/drakbackup_.c:1652 ../../standalone/drakbackup_.c:1676
+#: ../../standalone/drakbackup_.c:1623 ../../standalone/drakbackup_.c:1647
 msgid "Use Incremental Backups  (do not replace old backups)"
 msgstr "Dùng các sao lưu mới (không thay thế các sao lưu cũ)"
 
-#: ../../standalone/drakbackup_.c:1674 ../../standalone/drakfont_.c:1058
+#: ../../standalone/drakbackup_.c:1645 ../../standalone/drakfont_.c:1000
 msgid "Remove Selected"
 msgstr "Được chọn ở xa"
 
-#: ../../standalone/drakbackup_.c:1712
+#: ../../standalone/drakbackup_.c:1679
 msgid "Windows (FAT32)"
 msgstr "Windows (FAT32)"
 
-#: ../../standalone/drakbackup_.c:1751
+#: ../../standalone/drakbackup_.c:1714
 msgid "Users"
 msgstr "Người dùng"
 
-#: ../../standalone/drakbackup_.c:1777
+#: ../../standalone/drakbackup_.c:1740
 msgid "Use network connection to backup"
 msgstr "Dùng kết nối mạng để sao lưu"
 
-#: ../../standalone/drakbackup_.c:1779
+#: ../../standalone/drakbackup_.c:1742
 msgid "Net Method:"
 msgstr "Chế Độ Mạng:"
 
-#: ../../standalone/drakbackup_.c:1783
+#: ../../standalone/drakbackup_.c:1746
 msgid "Use Expect for SSH"
 msgstr "Dùng Expect cho SSH"
 
-#: ../../standalone/drakbackup_.c:1784
+#: ../../standalone/drakbackup_.c:1747
 msgid ""
 "Create/Transfer\n"
 "backup keys for SSH"
@@ -11071,7 +11398,7 @@ msgstr ""
 "Tạo/Tuyền tải\n"
 "các key sao lưu cho SSH"
 
-#: ../../standalone/drakbackup_.c:1785
+#: ../../standalone/drakbackup_.c:1748
 msgid ""
 "  Transfer  \n"
 "Now"
@@ -11079,7 +11406,7 @@ msgstr ""
 "  Truyền  \n"
 "Bây giờ"
 
-#: ../../standalone/drakbackup_.c:1786
+#: ../../standalone/drakbackup_.c:1749
 msgid ""
 "Other (not drakbackup)\n"
 "keys in place already"
@@ -11087,11 +11414,11 @@ msgstr ""
 "Các key khác ( không phải\n"
 "drakbackup) đã ở vị trí rồi"
 
-#: ../../standalone/drakbackup_.c:1790
+#: ../../standalone/drakbackup_.c:1753
 msgid "Please enter the host name or IP."
 msgstr "Hãy nhập tên chủ hay IP."
 
-#: ../../standalone/drakbackup_.c:1795
+#: ../../standalone/drakbackup_.c:1758
 msgid ""
 "Please enter the directory (or module) to\n"
 " put the backup on this host."
@@ -11099,27 +11426,27 @@ msgstr ""
 "Hãy nhập thư mục (hay module) để đặt\n"
 " sao lưu trên máy chủ này."
 
-#: ../../standalone/drakbackup_.c:1800
+#: ../../standalone/drakbackup_.c:1763
 msgid "Please enter your login"
 msgstr "Hãy đăng nhập"
 
-#: ../../standalone/drakbackup_.c:1805
+#: ../../standalone/drakbackup_.c:1768
 msgid "Please enter your password"
 msgstr "Hãy nhập mật khẩu"
 
-#: ../../standalone/drakbackup_.c:1811
+#: ../../standalone/drakbackup_.c:1774
 msgid "Remember this password"
 msgstr "Nhớ mật khẩu này"
 
-#: ../../standalone/drakbackup_.c:1822
+#: ../../standalone/drakbackup_.c:1785
 msgid "Need hostname, username and password!"
 msgstr "Cần tên chủ (hostname), tên người dùng và mật khẩu!"
 
-#: ../../standalone/drakbackup_.c:1917
+#: ../../standalone/drakbackup_.c:1879
 msgid "Use CD/DVDROM to backup"
 msgstr "Dùng CD/DVDROM để sao lưu"
 
-#: ../../standalone/drakbackup_.c:1920
+#: ../../standalone/drakbackup_.c:1882
 msgid ""
 "Please choose your CD/DVD device\n"
 "(Press Enter to propogate settings to other fields.\n"
@@ -11129,35 +11456,35 @@ msgstr ""
 "(Nhấn Enter để propogate các thiết lập vào các trường khác.\n"
 "Trường này không cần thiết, chỉ là công cụ để diền vào biểu mẫu.)"
 
-#: ../../standalone/drakbackup_.c:1925
+#: ../../standalone/drakbackup_.c:1887
 msgid "Please choose your CD/DVD media size (Mb)"
 msgstr "Hãy chọn kích thước phương tiện CD/DVD"
 
-#: ../../standalone/drakbackup_.c:1931
+#: ../../standalone/drakbackup_.c:1893
 msgid "Please check for multisession CD"
 msgstr "Hãy kiểm tra multisession CD"
 
-#: ../../standalone/drakbackup_.c:1937
+#: ../../standalone/drakbackup_.c:1899
 msgid "Please check if you are using CDRW media"
 msgstr "Hãy kiểm tra nếu đang dùng CD-Rewriter"
 
-#: ../../standalone/drakbackup_.c:1943
+#: ../../standalone/drakbackup_.c:1905
 msgid "Please check if you want to erase your RW media (1st Session)"
 msgstr "Hãy kiểm tra nếu muốn xoá phương tiện RW (phiên làm việc thứ nhất)"
 
-#: ../../standalone/drakbackup_.c:1944
+#: ../../standalone/drakbackup_.c:1906
 msgid " Erase Now "
 msgstr " Xoá bây giờ "
 
-#: ../../standalone/drakbackup_.c:1950
+#: ../../standalone/drakbackup_.c:1912
 msgid "Please check if you are using a DVDR device"
 msgstr "Hãy kiểm tra nếu đang dùng thiết bị DVD-R"
 
-#: ../../standalone/drakbackup_.c:1956
+#: ../../standalone/drakbackup_.c:1918
 msgid "Please check if you are using a DVDRAM device"
 msgstr "Hãy kiểm tra nếu đang dùng thiết bị DVD-RAM"
 
-#: ../../standalone/drakbackup_.c:1969
+#: ../../standalone/drakbackup_.c:1931
 msgid ""
 "Please enter your CD Writer device name\n"
 " ex: 0,1,0"
@@ -11165,32 +11492,32 @@ msgstr ""
 "Hãy nhập tên của ổ ghi CD\n"
 " vd: 0,1,0"
 
-#: ../../standalone/drakbackup_.c:2002
+#: ../../standalone/drakbackup_.c:1964
 msgid "No CD device defined!"
 msgstr "Không có thiết bị CD được chỉ định!"
 
-#: ../../standalone/drakbackup_.c:2050
+#: ../../standalone/drakbackup_.c:2012
 msgid "Use tape to backup"
 msgstr "Dùng băng từ để sao lưu"
 
-#: ../../standalone/drakbackup_.c:2053
+#: ../../standalone/drakbackup_.c:2015
 msgid "Please enter the device name to use for backup"
 msgstr "Hãy nhập tên thiết bị để dùng sao lưu"
 
-#: ../../standalone/drakbackup_.c:2059
+#: ../../standalone/drakbackup_.c:2021
 msgid "Please check if you want to use the non-rewinding device."
 msgstr "Hãy kiểm tra nếu muốn dùng thiết bị non-rewinding."
 
-#: ../../standalone/drakbackup_.c:2065
+#: ../../standalone/drakbackup_.c:2027
 msgid "Please check if you want to erase your tape before the backup."
 msgstr "Hãy kiểm tra nếu muốn xoá băng từ trước khi sao lưu."
 
-#: ../../standalone/drakbackup_.c:2071
+#: ../../standalone/drakbackup_.c:2033
 msgid "Please check if you want to eject your tape after the backup."
 msgstr "Hãy kiểm tra nếu muốn nhả băng từ ra sau khi sao lưu."
 
-#: ../../standalone/drakbackup_.c:2077 ../../standalone/drakbackup_.c:2151
-#: ../../standalone/drakbackup_.c:3118
+#: ../../standalone/drakbackup_.c:2039 ../../standalone/drakbackup_.c:2112
+#: ../../standalone/drakbackup_.c:3068
 msgid ""
 "Please enter the maximum size\n"
 " allowed for Drakbackup"
@@ -11198,55 +11525,55 @@ msgstr ""
 "Hãy nhập kích thước tối đa\n"
 " được phép cho Drakbackup"
 
-#: ../../standalone/drakbackup_.c:2142
+#: ../../standalone/drakbackup_.c:2103
 msgid "Please enter the directory to save to:"
 msgstr "Hãy nhập thư mục để lưu vào:"
 
-#: ../../standalone/drakbackup_.c:2157 ../../standalone/drakbackup_.c:3124
+#: ../../standalone/drakbackup_.c:2118 ../../standalone/drakbackup_.c:3074
 msgid "Use quota for backup files."
 msgstr "Dùng quota cho các file sao lưu."
 
-#: ../../standalone/drakbackup_.c:2223
+#: ../../standalone/drakbackup_.c:2180
 msgid "Network"
 msgstr "Mạng"
 
-#: ../../standalone/drakbackup_.c:2228
+#: ../../standalone/drakbackup_.c:2185
 msgid "CDROM / DVDROM"
 msgstr "CDROM / DVDROM"
 
-#: ../../standalone/drakbackup_.c:2233
+#: ../../standalone/drakbackup_.c:2190
 msgid "HardDrive / NFS"
 msgstr "Đĩa cứng / NFS"
 
-#: ../../standalone/drakbackup_.c:2238
+#: ../../standalone/drakbackup_.c:2195
 msgid "Tape"
 msgstr "Băng Từ"
 
-#: ../../standalone/drakbackup_.c:2252 ../../standalone/drakbackup_.c:2256
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2208 ../../standalone/drakbackup_.c:2212
+#: ../../standalone/drakbackup_.c:2216
 msgid "hourly"
 msgstr "hàng giờ"
 
-#: ../../standalone/drakbackup_.c:2253 ../../standalone/drakbackup_.c:2257
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2209 ../../standalone/drakbackup_.c:2213
+#: ../../standalone/drakbackup_.c:2216
 msgid "daily"
 msgstr "hàng ngày"
 
-#: ../../standalone/drakbackup_.c:2254 ../../standalone/drakbackup_.c:2258
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2210 ../../standalone/drakbackup_.c:2214
+#: ../../standalone/drakbackup_.c:2216
 msgid "weekly"
 msgstr "hàng tuần"
 
-#: ../../standalone/drakbackup_.c:2255 ../../standalone/drakbackup_.c:2259
-#: ../../standalone/drakbackup_.c:2260
+#: ../../standalone/drakbackup_.c:2211 ../../standalone/drakbackup_.c:2215
+#: ../../standalone/drakbackup_.c:2216
 msgid "monthly"
 msgstr "hàng tháng"
 
-#: ../../standalone/drakbackup_.c:2273
+#: ../../standalone/drakbackup_.c:2229
 msgid "Use daemon"
 msgstr "Dùng daemon"
 
-#: ../../standalone/drakbackup_.c:2278
+#: ../../standalone/drakbackup_.c:2234
 msgid ""
 "Please choose the time \n"
 "interval between each backup"
@@ -11254,7 +11581,7 @@ msgstr ""
 "Hãy chọn khoảng thời \n"
 "giữa các lần sao lưu"
 
-#: ../../standalone/drakbackup_.c:2284
+#: ../../standalone/drakbackup_.c:2240
 msgid ""
 "Please choose the\n"
 "media for backup."
@@ -11262,7 +11589,7 @@ msgstr ""
 "Hãy chọn phương\n"
 "tiện dùng để sao lưu."
 
-#: ../../standalone/drakbackup_.c:2291
+#: ../../standalone/drakbackup_.c:2247
 msgid ""
 "Please be sure that the cron daemon is included in your services. \n"
 "\n"
@@ -11272,72 +11599,72 @@ msgstr ""
 "\n"
 "Lưu ý là toàn bộ phương tiện mạng cũng dùng ổ cứng."
 
-#: ../../standalone/drakbackup_.c:2328
+#: ../../standalone/drakbackup_.c:2283
 msgid "Send mail report after each backup to:"
 msgstr "Gửi báo cáo mail sau mỗi lần sao lưu đến:"
 
-#: ../../standalone/drakbackup_.c:2334
+#: ../../standalone/drakbackup_.c:2289
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 "Xoá các tập tin dạng tar của ổ cứng sau khi sao lưu vào một phương tiện khác."
 
-#: ../../standalone/drakbackup_.c:2373
+#: ../../standalone/drakbackup_.c:2324
 msgid "What"
 msgstr "Cái gì"
 
-#: ../../standalone/drakbackup_.c:2378
+#: ../../standalone/drakbackup_.c:2329
 msgid "Where"
 msgstr "Vị trí"
 
-#: ../../standalone/drakbackup_.c:2383
+#: ../../standalone/drakbackup_.c:2334
 msgid "When"
 msgstr "Khi"
 
-#: ../../standalone/drakbackup_.c:2388
+#: ../../standalone/drakbackup_.c:2339
 msgid "More Options"
 msgstr "Thêm Tùy chọn"
 
-#: ../../standalone/drakbackup_.c:2407 ../../standalone/drakbackup_.c:4532
+#: ../../standalone/drakbackup_.c:2358 ../../standalone/drakbackup_.c:4444
 msgid "Drakbackup Configuration"
 msgstr "Cấu Hình Drakbackup"
 
-#: ../../standalone/drakbackup_.c:2425
+#: ../../standalone/drakbackup_.c:2376
 msgid "Please choose where you want to backup"
 msgstr "Hãy chọn vị trí bạn muốn sao lưu"
 
-#: ../../standalone/drakbackup_.c:2427
+#: ../../standalone/drakbackup_.c:2378
 msgid "on Hard Drive"
 msgstr "trên Đĩa Cứng"
 
-#: ../../standalone/drakbackup_.c:2437
+#: ../../standalone/drakbackup_.c:2388
 msgid "across Network"
 msgstr "qua Mạng"
 
-#: ../../standalone/drakbackup_.c:2447
+#: ../../standalone/drakbackup_.c:2398
 msgid "on CDROM"
 msgstr "trên CDROM"
 
-#: ../../standalone/drakbackup_.c:2455
+#: ../../standalone/drakbackup_.c:2406
 msgid "on Tape Device"
 msgstr "trên Thiết Bị Băng Từ"
 
-#: ../../standalone/drakbackup_.c:2498
+#: ../../standalone/drakbackup_.c:2449
 msgid "Please choose what you want to backup"
 msgstr "Hãy chọn cái mà bạn muốn sao lưu"
 
-#: ../../standalone/drakbackup_.c:2499
+#: ../../standalone/drakbackup_.c:2450
 msgid "Backup system"
 msgstr "Sao lưu hệ thống"
 
-#: ../../standalone/drakbackup_.c:2500
+#: ../../standalone/drakbackup_.c:2451
 msgid "Backup Users"
 msgstr "Sao lưu Người dùng"
 
-#: ../../standalone/drakbackup_.c:2503
+#: ../../standalone/drakbackup_.c:2454
 msgid "Select user manually"
 msgstr "Chọn người dùng bằng tay"
 
-#: ../../standalone/drakbackup_.c:2586
+#: ../../standalone/drakbackup_.c:2537
 msgid ""
 "\n"
 "Backup Sources: \n"
@@ -11345,7 +11672,7 @@ msgstr ""
 "\n"
 "Sao lưu Nguồn: \n"
 
-#: ../../standalone/drakbackup_.c:2587
+#: ../../standalone/drakbackup_.c:2538
 msgid ""
 "\n"
 "- System Files:\n"
@@ -11353,7 +11680,7 @@ msgstr ""
 "\n"
 "- Tập tin Hệ thống:\n"
 
-#: ../../standalone/drakbackup_.c:2589
+#: ../../standalone/drakbackup_.c:2540
 msgid ""
 "\n"
 "- User Files:\n"
@@ -11361,7 +11688,7 @@ msgstr ""
 "\n"
 "- Tập tin Người dùng:\n"
 
-#: ../../standalone/drakbackup_.c:2591
+#: ../../standalone/drakbackup_.c:2542
 msgid ""
 "\n"
 "- Other Files:\n"
@@ -11369,7 +11696,7 @@ msgstr ""
 "\n"
 "- Các Tập Tin Khác:\n"
 
-#: ../../standalone/drakbackup_.c:2593
+#: ../../standalone/drakbackup_.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -11378,7 +11705,7 @@ msgstr ""
 "\n"
 "- Lưu trên Đĩa cứng với đường dẫn: %s\n"
 
-#: ../../standalone/drakbackup_.c:2596
+#: ../../standalone/drakbackup_.c:2547
 msgid ""
 "\n"
 "- Delete hard drive tar files after backup.\n"
@@ -11386,7 +11713,7 @@ msgstr ""
 "\n"
 "- Xoá các tập tin dạng tar ở ổ cứng sau khi sao lưu.\n"
 
-#: ../../standalone/drakbackup_.c:2602
+#: ../../standalone/drakbackup_.c:2553
 msgid ""
 "\n"
 "- Burn to CD"
@@ -11394,20 +11721,20 @@ msgstr ""
 "\n"
 "G-hi vào CD"
 
-#: ../../standalone/drakbackup_.c:2603
+#: ../../standalone/drakbackup_.c:2554
 msgid "RW"
 msgstr "Ghi Lại"
 
-#: ../../standalone/drakbackup_.c:2604
+#: ../../standalone/drakbackup_.c:2555
 #, c-format
 msgid " on device: %s"
 msgstr " trên thiết bị: %s"
 
-#: ../../standalone/drakbackup_.c:2605
+#: ../../standalone/drakbackup_.c:2556
 msgid " (multi-session)"
 msgstr " (multi-session)"
 
-#: ../../standalone/drakbackup_.c:2606
+#: ../../standalone/drakbackup_.c:2557
 #, c-format
 msgid ""
 "\n"
@@ -11416,12 +11743,12 @@ msgstr ""
 "\n"
 "- Lưu vào băng từ trên thiết bị: %s"
 
-#: ../../standalone/drakbackup_.c:2607
+#: ../../standalone/drakbackup_.c:2558
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tErase=%s"
 
-#: ../../standalone/drakbackup_.c:2610
+#: ../../standalone/drakbackup_.c:2561
 #, c-format
 msgid ""
 "\n"
@@ -11430,7 +11757,7 @@ msgstr ""
 "\n"
 "- Lưu qua %s trên máy chủ: %s\n"
 
-#: ../../standalone/drakbackup_.c:2611
+#: ../../standalone/drakbackup_.c:2562
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -11439,7 +11766,7 @@ msgstr ""
 "\t\t tên người dùng: %s\n"
 "\t\t với đường dẫn: %s \n"
 
-#: ../../standalone/drakbackup_.c:2612
+#: ../../standalone/drakbackup_.c:2563
 msgid ""
 "\n"
 "- Options:\n"
@@ -11447,19 +11774,19 @@ msgstr ""
 "\n"
 "- Tùy chọn:\n"
 
-#: ../../standalone/drakbackup_.c:2613
+#: ../../standalone/drakbackup_.c:2564
 msgid "\tDo not include System Files\n"
 msgstr "\tKhông bao gồm các Tập tin Hệ thống\n"
 
-#: ../../standalone/drakbackup_.c:2616
+#: ../../standalone/drakbackup_.c:2567
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tCác sao lưu sử dụng tar và bzip2\n"
 
-#: ../../standalone/drakbackup_.c:2618
+#: ../../standalone/drakbackup_.c:2569
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tCác sao lưu sử dụng tar và gzip\n"
 
-#: ../../standalone/drakbackup_.c:2621
+#: ../../standalone/drakbackup_.c:2572
 #, c-format
 msgid ""
 "\n"
@@ -11468,39 +11795,39 @@ msgstr ""
 "\n"
 "- Daemon (%s) gồm có :\n"
 
-#: ../../standalone/drakbackup_.c:2622
+#: ../../standalone/drakbackup_.c:2573
 msgid "\t-Hard drive.\n"
 msgstr "\t-Đĩa Cứng.\n"
 
-#: ../../standalone/drakbackup_.c:2623
+#: ../../standalone/drakbackup_.c:2574
 msgid "\t-CDROM.\n"
 msgstr "\t-CDROM.\n"
 
-#: ../../standalone/drakbackup_.c:2624
+#: ../../standalone/drakbackup_.c:2575
 msgid "\t-Tape \n"
 msgstr "\t-Băng từ \n"
 
-#: ../../standalone/drakbackup_.c:2625
+#: ../../standalone/drakbackup_.c:2576
 msgid "\t-Network by FTP.\n"
 msgstr "\t-Mạng bằng FTP.\n"
 
-#: ../../standalone/drakbackup_.c:2626
+#: ../../standalone/drakbackup_.c:2577
 msgid "\t-Network by SSH.\n"
 msgstr "\t-Mạng bằng SSH.\n"
 
-#: ../../standalone/drakbackup_.c:2627
+#: ../../standalone/drakbackup_.c:2578
 msgid "\t-Network by rsync.\n"
 msgstr "\t-Mạng bằng rsync.\n"
 
-#: ../../standalone/drakbackup_.c:2628
+#: ../../standalone/drakbackup_.c:2579
 msgid "\t-Network by webdav.\n"
 msgstr "\t-Mạng bằng webdav.\n"
 
-#: ../../standalone/drakbackup_.c:2630
+#: ../../standalone/drakbackup_.c:2581
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Chưa được cấu hình, hãy nhấn Đồ thuật hay Nâng cao.\n"
 
-#: ../../standalone/drakbackup_.c:2636
+#: ../../standalone/drakbackup_.c:2587
 msgid ""
 "List of data to restore:\n"
 "\n"
@@ -11508,7 +11835,7 @@ msgstr ""
 "Danh sách dữ liệu để khôi phục:\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:2803
+#: ../../standalone/drakbackup_.c:2754
 msgid ""
 "List of data corrupted:\n"
 "\n"
@@ -11516,102 +11843,102 @@ msgstr ""
 "Danh sách dữ liệu hỏng:\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:2805
+#: ../../standalone/drakbackup_.c:2756
 msgid "Please uncheck or remove it on next time."
 msgstr "Hãy bỏ chọn hay gỡ bỏ vào lần sau."
 
-#: ../../standalone/drakbackup_.c:2815
+#: ../../standalone/drakbackup_.c:2766
 msgid "Backup files are corrupted"
 msgstr "Sao lưu các tập tin bị hỏng"
 
-#: ../../standalone/drakbackup_.c:2836
+#: ../../standalone/drakbackup_.c:2787
 msgid "          All of your selected data have been          "
 msgstr "   Toàn bộ dữ liệu được chọn của bạn đã được   "
 
-#: ../../standalone/drakbackup_.c:2837
+#: ../../standalone/drakbackup_.c:2788
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr "          Đã sao lưu thành công lên %s       "
 
-#: ../../standalone/drakbackup_.c:2955
+#: ../../standalone/drakbackup_.c:2906
 msgid "         Restore Configuration       "
 msgstr "         Khôi phục Cấu hình       "
 
-#: ../../standalone/drakbackup_.c:2973
+#: ../../standalone/drakbackup_.c:2924
 msgid "OK to restore the other files."
 msgstr "OK để khôi phục các tập tin khác."
 
-#: ../../standalone/drakbackup_.c:2990
+#: ../../standalone/drakbackup_.c:2941
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr ""
 "Danh sách người dùng để khôi phục (chỉ có thời gian gần đây nhất của mỗi "
 "người dùng là quan trọng)"
 
-#: ../../standalone/drakbackup_.c:3068
+#: ../../standalone/drakbackup_.c:3019
 msgid "Backup the system files before:"
 msgstr "Sao lưu các tập tin hệ thống trước:"
 
-#: ../../standalone/drakbackup_.c:3070
+#: ../../standalone/drakbackup_.c:3021
 msgid "please choose the date to restore"
 msgstr "Hãy chọn ngày để phục hồi"
 
-#: ../../standalone/drakbackup_.c:3107
+#: ../../standalone/drakbackup_.c:3057
 msgid "Use Hard Disk to backup"
 msgstr "Dùng đĩa cứng để sao lưu"
 
-#: ../../standalone/drakbackup_.c:3110
+#: ../../standalone/drakbackup_.c:3060
 msgid "Please enter the directory to save:"
 msgstr "Hãy nhập thư mục để lưu:"
 
-#: ../../standalone/drakbackup_.c:3153
+#: ../../standalone/drakbackup_.c:3103
 msgid "FTP Connection"
 msgstr "Kết nối FTP"
 
-#: ../../standalone/drakbackup_.c:3160
+#: ../../standalone/drakbackup_.c:3110
 msgid "Secure Connection"
 msgstr "Kết nối Bảo mật"
 
-#: ../../standalone/drakbackup_.c:3186
+#: ../../standalone/drakbackup_.c:3134
 msgid "Restore from Hard Disk."
 msgstr "Khôi phục từ đĩa cứng"
 
-#: ../../standalone/drakbackup_.c:3188
+#: ../../standalone/drakbackup_.c:3136
 msgid "Please enter the directory where backups are stored"
 msgstr "Hãy nhập thư mục, nơi sẽ để các sao lưu"
 
-#: ../../standalone/drakbackup_.c:3256
+#: ../../standalone/drakbackup_.c:3204
 msgid "Select another media to restore from"
 msgstr "Chọn phương tiện khác để khôi phục từ đó"
 
-#: ../../standalone/drakbackup_.c:3258
+#: ../../standalone/drakbackup_.c:3206
 msgid "Other Media"
 msgstr "Phương tiện Khác"
 
-#: ../../standalone/drakbackup_.c:3263
+#: ../../standalone/drakbackup_.c:3211
 msgid "Restore system"
 msgstr "Khôi phục Hệ thống"
 
-#: ../../standalone/drakbackup_.c:3264
+#: ../../standalone/drakbackup_.c:3212
 msgid "Restore Users"
 msgstr "Khôi phục Người dùng"
 
-#: ../../standalone/drakbackup_.c:3265
+#: ../../standalone/drakbackup_.c:3213
 msgid "Restore Other"
 msgstr "Khôi phục cái khác"
 
-#: ../../standalone/drakbackup_.c:3267
+#: ../../standalone/drakbackup_.c:3215
 msgid "select path to restore (instead of /)"
 msgstr "chọn đường dẫn để khôi phục (thay cho /)"
 
-#: ../../standalone/drakbackup_.c:3271
+#: ../../standalone/drakbackup_.c:3219
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "Thực hiện sao lưu mới trước khi khôi phục (chỉ cho các sao lưu mới)"
 
-#: ../../standalone/drakbackup_.c:3273
+#: ../../standalone/drakbackup_.c:3221
 msgid "Remove user directories before restore."
 msgstr "Gỡ bỏ các thư mục người dùng trước khi khôi phục."
 
-#: ../../standalone/drakbackup_.c:3386
+#: ../../standalone/drakbackup_.c:3334
 msgid ""
 "Restore Selected\n"
 "Catalog Entry"
@@ -11619,7 +11946,7 @@ msgstr ""
 "Khôi phục Mục Nhập\n"
 "Catalog Được Chọn"
 
-#: ../../standalone/drakbackup_.c:3396
+#: ../../standalone/drakbackup_.c:3344
 msgid ""
 "Restore Selected\n"
 "Files"
@@ -11627,7 +11954,7 @@ msgstr ""
 "Khôi Phục Các Tập Tin\n"
 "Được Chọn"
 
-#: ../../standalone/drakbackup_.c:3413
+#: ../../standalone/drakbackup_.c:3361
 msgid ""
 "Change\n"
 "Restore Path"
@@ -11635,12 +11962,12 @@ msgstr ""
 "Thay Đổi\n"
 "Đường Dẫn Khôi Phục"
 
-#: ../../standalone/drakbackup_.c:3479
+#: ../../standalone/drakbackup_.c:3427
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "Không tìm thấy các tập tin sao lưu tại %s."
 
-#: ../../standalone/drakbackup_.c:3492
+#: ../../standalone/drakbackup_.c:3440
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -11649,16 +11976,16 @@ msgstr ""
 "Hãy nạp CD có nhãn %s\n"
 " vào ổ CD dưới điểm gắn kết /mnt/cdrom"
 
-#: ../../standalone/drakbackup_.c:3492
+#: ../../standalone/drakbackup_.c:3440
 msgid "Restore From CD"
 msgstr "Khôi Phục Từ CD"
 
-#: ../../standalone/drakbackup_.c:3494
+#: ../../standalone/drakbackup_.c:3442
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "Không đúng nhãn CD. Đĩa có nhãn là %s."
 
-#: ../../standalone/drakbackup_.c:3504
+#: ../../standalone/drakbackup_.c:3452
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -11667,102 +11994,102 @@ msgstr ""
 "Hãy nạp băng từ có nhãn là %s\n"
 " vào thiết bị băng từ %s"
 
-#: ../../standalone/drakbackup_.c:3504
+#: ../../standalone/drakbackup_.c:3452
 msgid "Restore From Tape"
 msgstr "Khôi Phục Từ Băng Từ"
 
-#: ../../standalone/drakbackup_.c:3506
+#: ../../standalone/drakbackup_.c:3454
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Không đúng nhãn của băng từ. Băng từ có nhãn là %s."
 
-#: ../../standalone/drakbackup_.c:3526
+#: ../../standalone/drakbackup_.c:3474
 msgid "Restore Via Network"
 msgstr "Khôi Phục Qua Mạng"
 
-#: ../../standalone/drakbackup_.c:3526
+#: ../../standalone/drakbackup_.c:3474
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Khôi Phục Qua Giao Thức Mạng: %s"
 
-#: ../../standalone/drakbackup_.c:3527
+#: ../../standalone/drakbackup_.c:3475
 msgid "Host Name"
 msgstr "Tên Chủ"
 
-#: ../../standalone/drakbackup_.c:3528
+#: ../../standalone/drakbackup_.c:3476
 msgid "Host Path or Module"
 msgstr "Đường Dẫn Host Hay Module"
 
-#: ../../standalone/drakbackup_.c:3535
+#: ../../standalone/drakbackup_.c:3483
 msgid "Password required"
 msgstr "Yêu Cầu Mật Khẩu"
 
-#: ../../standalone/drakbackup_.c:3541
+#: ../../standalone/drakbackup_.c:3489
 msgid "Username required"
 msgstr "Yêu Cầu Tên Người Dùng"
 
-#: ../../standalone/drakbackup_.c:3544
+#: ../../standalone/drakbackup_.c:3492
 msgid "Hostname required"
 msgstr "Yêu Cầu Tên Chủ"
 
-#: ../../standalone/drakbackup_.c:3549
+#: ../../standalone/drakbackup_.c:3497
 msgid "Path or Module required"
 msgstr "Yêu Cầu Đường Dẫn hay Module"
 
-#: ../../standalone/drakbackup_.c:3562
+#: ../../standalone/drakbackup_.c:3510
 msgid "Files Restored..."
 msgstr "Khôi Phục Các tập Tin..."
 
-#: ../../standalone/drakbackup_.c:3565
+#: ../../standalone/drakbackup_.c:3513
 msgid "Restore Failed..."
 msgstr "Không Khôi Phục Được..."
 
-#: ../../standalone/drakbackup_.c:3803
+#: ../../standalone/drakbackup_.c:3751
 msgid "Restore all backups"
 msgstr "Khôi phục mọi sao lưu"
 
-#: ../../standalone/drakbackup_.c:3812
+#: ../../standalone/drakbackup_.c:3760
 msgid "Custom Restore"
 msgstr "Khôi phục Tùy chỉnh"
 
-#: ../../standalone/drakbackup_.c:3858
+#: ../../standalone/drakbackup_.c:3804
 msgid "CD in place - continue."
 msgstr "CD ở vị trí - tiếp tục."
 
-#: ../../standalone/drakbackup_.c:3864
+#: ../../standalone/drakbackup_.c:3810
 msgid "Browse to new restore repository."
 msgstr "Duyệt đến nơi chứa khôi phụcmới."
 
-#: ../../standalone/drakbackup_.c:3867
+#: ../../standalone/drakbackup_.c:3813
 msgid "Restore From Catalog"
 msgstr "Khôi Phục Từ Catalog"
 
-#: ../../standalone/drakbackup_.c:3895
+#: ../../standalone/drakbackup_.c:3841
 msgid "Restore Progress"
 msgstr "Khôi Phục Tiến Trình"
 
-#: ../../standalone/drakbackup_.c:3937 ../../standalone/drakbackup_.c:3970
-#: ../../standalone/drakbackup_.c:3996 ../../standalone/drakbackup_.c:4023
-#: ../../standalone/drakbackup_.c:4050 ../../standalone/drakbackup_.c:4110
-#: ../../standalone/drakbackup_.c:4137 ../../standalone/drakbackup_.c:4167
-#: ../../standalone/drakbackup_.c:4193
+#: ../../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 "Về trước"
 
-#: ../../standalone/drakbackup_.c:3941 ../../standalone/drakbackup_.c:4027
-#: ../../standalone/logdrake_.c:224
+#: ../../standalone/drakbackup_.c:3887 ../../standalone/drakbackup_.c:3973
+#: ../../standalone/logdrake_.c:203
 msgid "Save"
 msgstr "Lưu"
 
-#: ../../standalone/drakbackup_.c:4000
+#: ../../standalone/drakbackup_.c:3946
 msgid "Build Backup"
 msgstr "Tạo Sao lưu"
 
-#: ../../standalone/drakbackup_.c:4054 ../../standalone/drakbackup_.c:4634
+#: ../../standalone/drakbackup_.c:4000 ../../standalone/drakbackup_.c:4544
 msgid "Restore"
 msgstr "Khôi phục"
 
-#: ../../standalone/drakbackup_.c:4233
+#: ../../standalone/drakbackup_.c:4189
 msgid ""
 "Error during sendmail.\n"
 "  Your report mail was not sent.\n"
@@ -11772,15 +12099,7 @@ msgstr ""
 "  thư báo cáo không được gửi.\n"
 "  Hãy cấu hình sendmail"
 
-#: ../../standalone/drakbackup_.c:4257
-msgid ""
-"The following packages need to be installed:\n"
-" @list_of_rpm_to_install"
-msgstr ""
-"Các gói sau đây cần được cài đặt:\n"
-" @list_of_rpm_to_install"
-
-#: ../../standalone/drakbackup_.c:4280
+#: ../../standalone/drakbackup_.c:4195
 msgid ""
 "Error during sending file via FTP.\n"
 " Please correct your FTP configuration."
@@ -11788,19 +12107,27 @@ msgstr ""
 "Lỗi khi gửi tập tin qua FTP.\n"
 " Hãy kiểm tra cấu hình FTP."
 
-#: ../../standalone/drakbackup_.c:4303
+#: ../../standalone/drakbackup_.c:4209
+msgid ""
+"The following packages need to be installed:\n"
+" @list_of_rpm_to_install"
+msgstr ""
+"Các gói sau đây cần được cài đặt:\n"
+" @list_of_rpm_to_install"
+
+#: ../../standalone/drakbackup_.c:4232
 msgid "Please select data to restore..."
 msgstr "Hãy chọn dữ liệu cần khôi phục..."
 
-#: ../../standalone/drakbackup_.c:4324
+#: ../../standalone/drakbackup_.c:4267
 msgid "Please select media for backup..."
 msgstr "Hãy chọn phương tiện để khôi phục ..."
 
-#: ../../standalone/drakbackup_.c:4346
+#: ../../standalone/drakbackup_.c:4275
 msgid "Please select data to backup..."
 msgstr "Hãy chọn dữ liệu để sao lưu..."
 
-#: ../../standalone/drakbackup_.c:4368
+#: ../../standalone/drakbackup_.c:4293 ../../standalone/drakbackup_.c:4304
 msgid ""
 "No configuration file found \n"
 "please click Wizard or Advanced."
@@ -11808,59 +12135,59 @@ msgstr ""
 "Không thấy tập tin cấu hình \n"
 "Hãy nhấn Đồ thuật hay Nâng cao."
 
-#: ../../standalone/drakbackup_.c:4389
+#: ../../standalone/drakbackup_.c:4308
 msgid "Under Devel ... please wait."
 msgstr "Đang phát triển... hãy đợi."
 
-#: ../../standalone/drakbackup_.c:4470
+#: ../../standalone/drakbackup_.c:4382
 msgid "Backup system files"
 msgstr "Sao lưu các file hệ thống"
 
-#: ../../standalone/drakbackup_.c:4472
+#: ../../standalone/drakbackup_.c:4384
 msgid "Backup user files"
 msgstr "Sao lưu các tập tin người dùng"
 
-#: ../../standalone/drakbackup_.c:4474
+#: ../../standalone/drakbackup_.c:4386
 msgid "Backup other files"
 msgstr "Sao lưu các tập tin khác"
 
-#: ../../standalone/drakbackup_.c:4476 ../../standalone/drakbackup_.c:4509
+#: ../../standalone/drakbackup_.c:4388 ../../standalone/drakbackup_.c:4421
 msgid "Total Progress"
 msgstr "Tổng Tiến trình"
 
-#: ../../standalone/drakbackup_.c:4500
+#: ../../standalone/drakbackup_.c:4412
 msgid "files sending by FTP"
 msgstr "các tập tin gửi qua FTP"
 
-#: ../../standalone/drakbackup_.c:4504
+#: ../../standalone/drakbackup_.c:4416
 msgid "Sending files..."
 msgstr "Đang gửi các file..."
 
-#: ../../standalone/drakbackup_.c:4590
+#: ../../standalone/drakbackup_.c:4500
 msgid "Backup Now from configuration file"
 msgstr "Bây giờ Sao lưu từ file Cấu Hình"
 
-#: ../../standalone/drakbackup_.c:4595
+#: ../../standalone/drakbackup_.c:4505
 msgid "View Backup Configuration."
 msgstr "Xem Cấu Hình Sao lưu."
 
-#: ../../standalone/drakbackup_.c:4616
+#: ../../standalone/drakbackup_.c:4526
 msgid "Wizard Configuration"
 msgstr "Đồ thuật Cấu hình"
 
-#: ../../standalone/drakbackup_.c:4621
+#: ../../standalone/drakbackup_.c:4531
 msgid "Advanced Configuration"
 msgstr "Cấu hình Nâng cao"
 
-#: ../../standalone/drakbackup_.c:4626
+#: ../../standalone/drakbackup_.c:4536
 msgid "Backup Now"
 msgstr "Sao lưu Bây giờ"
 
-#: ../../standalone/drakbackup_.c:4660
+#: ../../standalone/drakbackup_.c:4576
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: ../../standalone/drakbackup_.c:4711
+#: ../../standalone/drakbackup_.c:4624
 msgid ""
 "options description:\n"
 "\n"
@@ -11920,7 +12247,7 @@ msgstr ""
 "      \n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4741
+#: ../../standalone/drakbackup_.c:4654
 msgid ""
 "\n"
 " Some errors during sendmail are caused by \n"
@@ -11934,7 +12261,7 @@ msgstr ""
 " myhostname hay mydomain trong /etc/postfix/main.cf\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4749
+#: ../../standalone/drakbackup_.c:4662
 msgid ""
 "options description:\n"
 "\n"
@@ -12012,7 +12339,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4788
+#: ../../standalone/drakbackup_.c:4701
 msgid ""
 "restore description:\n"
 " \n"
@@ -12064,50 +12391,21 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4814 ../../standalone/drakbackup_.c:4891
+#: ../../standalone/drakbackup_.c:4727
 msgid ""
-" Copyright (C) 2001 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita.fr>"
+" Copyright (C) 2001-2002 MandrakeSoft by DUPONT Sebastien <dupont_s\\@epita."
+"fr>"
 msgstr ""
-" Bản quyền (C) 2001 của MandrakeSoft viết bởi DUPONT Sebastien <dupont_s"
+" Bản quyền (C) 2001-2002 của MandrakeSoft viết bởi DUPONT Sebastien <dupont_s"
 "\\@epita.fr>"
 
-#: ../../standalone/drakbackup_.c:4816 ../../standalone/drakbackup_.c:4893
+#: ../../standalone/drakbackup_.c:4729
 msgid ""
 " updates 2002 MandrakeSoft by Stew Benedict <sbenedict\\@mandrakesoft.com>"
 msgstr ""
 " cập nhật 2002 MandrakeSoft bởi Stew Benedict <sbenedict\\@mandrakesoft.com>"
 
-#: ../../standalone/drakbackup_.c:4818 ../../standalone/drakbackup_.c:4895
-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."
-msgstr ""
-" Chương trình này là phần mềm miễn phí; bạn có thể phân phối lại hay\n"
-" thay đổi dưới các điều khoản của GNU/GPL như Quỹ Phần\n"
-" Mềm Tự do đã công bố; với phiên bản 2, hay bất kỳ phiên bản\n"
-" mới nhất nào.\n"
-"\n"
-" Chương trình này được phân phối với hy vọng là nó có ích,\n"
-" nhưng Không Có Bất Kỳ Bảo Đảm Nào; thậm chí không có bảo đảm về\n"
-" Khả Năng Thương Mại hay Thích Hợp Với Mục Đích Đặc Biệt Nào.  Hãy xem\n"
-" GNU/GPL để biết thêm chi tiết.\n"
-"\n"
-" Bạn nên nhận lấy một bản sao của GNU/GPL đi kèm theo\n"
-" chương trình; nếu không có, xin viết thư tới: Free Software\n"
-" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
-
-#: ../../standalone/drakbackup_.c:4832
+#: ../../standalone/drakbackup_.c:4732
 msgid ""
 "Description:\n"
 "\n"
@@ -12136,7 +12434,6 @@ msgid ""
 "  Configuration file:\n"
 "\t/etc/drakconf/drakbackup/drakbakup.conf\n"
 "\n"
-"\n"
 "Restore Step:\n"
 "  \n"
 "  During the restore step, DrakBackup will remove \n"
@@ -12153,9 +12450,9 @@ msgstr ""
 "\t- Các tập tin hệ thống, \n"
 "\t- Các tập tin người dùng, \n"
 "\t- Các tập tin khác.\n"
-"\thoặc toàn bộ hệ thống...  và thứ khác (như phân vùng của Windows)\n"
+"\thoặc toàn bộ hệ thống...  và thứ khác (như phân vùng Windows)\n"
 "\n"
-"  Drakbackup cho phép thực hiện sao lưu trên:\n"
+"  Drakbackup cho phép thực hiện sao lưu hệ thống trên:\n"
 "\t- Đĩa cứng.\n"
 "\t- NFS.\n"
 "\t- CDROM (CDRW), DVDROM (tự khởi động, cứu giải, tự cài đặt).\n"
@@ -12165,7 +12462,7 @@ msgstr ""
 "\t- Băng từ.\n"
 "\n"
 "  Drakbackup cho phép khôi phục hệ thống tới một\n"
-"  thư mục của người dùng.\n"
+"  thư mục được chọn của người dùng.\n"
 "\n"
 "  Theo mặc định, mọi sao lưu sẽ được khôi phục lên\n"
 "  thư mục /var/lib/drakbackup\n"
@@ -12173,7 +12470,6 @@ msgstr ""
 "  Tập tin cấu hình:\n"
 "\t/etc/drakconf/drakbackup/drakbakup.conf\n"
 "\n"
-"\n"
 "Bước khôi phục:\n"
 "  \n"
 "  Trong bước khôi phục, DrakBackup sẽ gỡ \n"
@@ -12183,7 +12479,7 @@ msgstr ""
 "\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4870
+#: ../../standalone/drakbackup_.c:4769
 msgid ""
 "options description:\n"
 "\n"
@@ -12201,7 +12497,7 @@ msgstr ""
 "trước khi gửi nó tới máy chủ.\n"
 "\n"
 
-#: ../../standalone/drakbackup_.c:4879
+#: ../../standalone/drakbackup_.c:4778
 msgid ""
 "\n"
 "Restore Backup Problems:\n"
@@ -12223,195 +12519,86 @@ msgstr ""
 "Quan trọng là phải cẩn thận và không thay đổi các \n"
 "tập tin sao lưu bằng tay.\n"
 
-#: ../../standalone/drakbackup_.c:4909
-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 ""
-"Mô tả:\n"
-"\n"
-"  Drakbackup dùng để sao lưu hệ thống.\n"
-"  Trong lúc cấu hình, bạn có thể chọn: \n"
-"\t- Các tập tin hệ thống, \n"
-"\t- Các tập tin người dùng, \n"
-"\t- Các tập tin khác.\n"
-"\thoặc là toàn bộ hệ thống... và thứ khác (phân vùng của Windows)\n"
-"\n"
-"  Drakbackup cho phép thực hiện sao lưu trên:\n"
-"\t- Đĩa cứng.\n"
-"\t- NFS.\n"
-"\t- CDROM (CDRW), DVDROM (tự khởi động, cứu giải, tự cài đặt).\n"
-"\t- FTP.\n"
-"\t- Rsync.\n"
-"\t- Webdav.\n"
-"\t- Băng từ.\n"
-"\n"
-"  Drakbackup cho phép khôi phục hệ thống tới một\n"
-"  thư mục người dùng đã chọn.\n"
-"\n"
-"  Theo mặc định, mọi sao lưu sẽ được cất trong thư mục\n"
-"  /var/lib/drakbackup \n"
-"\n"
-"  Tập tin cấu hình:\n"
-"\t/etc/drakconf/drakbackup/drakbakup.conf\n"
-"\n"
-"Bước khôi phục:\n"
-"  \n"
-"  Trong bước khôi phục, Drakbackup sẽ gỡ bỏ\n"
-"  thư mục ban đầu và tiến hành xác minh là mọi\n"
-"  tập tin sao lưu không bị hỏng. Khuyến cáo là bạn nên\n"
-"  thực hiện sao lưu trước khi tiến hành khôi phục.\n"
-" \n"
-"\n"
-
-#: ../../standalone/drakboot_.c:57
+#: ../../standalone/drakboot_.c:50
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr "Không cài đặt được %s. Xảy ra lỗi như sau:"
 
-#: ../../standalone/drakbug_.c:40
-#, c-format
-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 ""
-"Phiên bản drakbug %s\n"
-"Bản quyền (C) 2002 MandrakeSoft.\n"
-"Đây là phần mềm tự do và có thể được phân phối lại dưới các điều khoản của "
-"GNU GPL.\n"
-"\n"
-"Cách dùng: drakbug [OPTIONS] [PROGRAM_NAME]\n"
-"\n"
-"OPTIONS:\n"
-
-#: ../../standalone/drakbug_.c:47
-msgid "  --help            - print this help message.\n"
-msgstr "  --help            - để in ra thông điệp trợ giúp này.\n"
-
-#: ../../standalone/drakbug_.c:48
-msgid "  --report          - program should be one of mandrake tools\n"
-msgstr ""
-"  --report          - chương trình nên là một trong số các công cụ của "
-"mandrake\n"
-
-#: ../../standalone/drakbug_.c:49
-msgid "  --incident        - program should be one of mandrake tools\n"
-msgstr "  --incident        - chương trình nên là công cụ của Mandrake\n"
-
-#: ../../standalone/drakbug_.c:64
+#: ../../standalone/drakbug_.c:45
 msgid "Mandrake Bug Report Tool"
 msgstr "Công Cụ Báo Cáo Lỗi Mandrake"
 
-#: ../../standalone/drakbug_.c:70
+#: ../../standalone/drakbug_.c:50
 msgid "First Time Wizard"
 msgstr "Đồ Thuật Chạy Lần Đầu Tiên"
 
-#: ../../standalone/drakbug_.c:71
+#: ../../standalone/drakbug_.c:51
 msgid "Synchronization tool"
 msgstr "Công Cụ Đồng Bộ Hoá"
 
-#: ../../standalone/drakbug_.c:72 ../../standalone/drakbug_.c:86
-#: ../../standalone/drakbug_.c:156 ../../standalone/drakbug_.c:158
-#: ../../standalone/drakbug_.c:162
+#: ../../standalone/drakbug_.c:52 ../../standalone/drakbug_.c:66
+#: ../../standalone/drakbug_.c:133 ../../standalone/drakbug_.c:135
+#: ../../standalone/drakbug_.c:139
 msgid "Standalone Tools"
 msgstr "Các Công Cụ Chuẩn"
 
-#: ../../standalone/drakbug_.c:73
+#: ../../standalone/drakbug_.c:53
 msgid "HardDrake"
 msgstr "HardDrake"
 
-#: ../../standalone/drakbug_.c:74
+#: ../../standalone/drakbug_.c:54
 msgid "Mandrake Online"
 msgstr "Mandrake Online"
 
-#: ../../standalone/drakbug_.c:75
+#: ../../standalone/drakbug_.c:55
 msgid "Menudrake"
 msgstr "Menudrake"
 
-#: ../../standalone/drakbug_.c:76
+#: ../../standalone/drakbug_.c:56
 msgid "Msec"
 msgstr "Msec"
 
-#: ../../standalone/drakbug_.c:77
+#: ../../standalone/drakbug_.c:57
 msgid "Remote Control"
 msgstr "Điều Khiển Từ Xa"
 
-#: ../../standalone/drakbug_.c:78
+#: ../../standalone/drakbug_.c:58
 msgid "Software Manager"
 msgstr "Chương Trình Quản Lý Phần Mềm"
 
-#: ../../standalone/drakbug_.c:79
+#: ../../standalone/drakbug_.c:59
 msgid "Urpmi"
 msgstr "Urpmi"
 
-#: ../../standalone/drakbug_.c:80
+#: ../../standalone/drakbug_.c:60
 msgid "Windows Migration tool"
 msgstr "Công Cụ Di Cư Từ Windows"
 
-#: ../../standalone/drakbug_.c:81
+#: ../../standalone/drakbug_.c:61
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../../standalone/drakbug_.c:82
+#: ../../standalone/drakbug_.c:62
 msgid "Configuration Wizards"
 msgstr "Đồ Thuật Cấu Hình"
 
-#: ../../standalone/drakbug_.c:97
+#: ../../standalone/drakbug_.c:75
 msgid "Application:"
 msgstr "Ứng Dụng:"
 
-#: ../../standalone/drakbug_.c:98
+#: ../../standalone/drakbug_.c:76
 msgid "Package: "
 msgstr "Gói tin:"
 
-#: ../../standalone/drakbug_.c:99
+#: ../../standalone/drakbug_.c:77
 msgid "Kernel:"
 msgstr "Kernel:"
 
-#: ../../standalone/drakbug_.c:100
+#: ../../standalone/drakbug_.c:78
 msgid "Release: "
 msgstr "Phát Hành:"
 
-#: ../../standalone/drakbug_.c:115
+#: ../../standalone/drakbug_.c:93
 msgid ""
 "\n"
 "\n"
@@ -12430,44 +12617,48 @@ msgstr ""
 "được truyền đến máy chủ đó\n"
 "\n"
 
-#: ../../standalone/drakbug_.c:134
+#: ../../standalone/drakbug_.c:112
 msgid "Report"
 msgstr "Báo cáo"
 
-#: ../../standalone/drakbug_.c:171
+#: ../../standalone/drakbug_.c:148
 msgid "Not installed"
 msgstr "Không được cài đặt"
 
-#: ../../standalone/drakbug_.c:189
+#: ../../standalone/drakbug_.c:160
+msgid "Package not installed"
+msgstr "Gói tin không được cài đặt"
+
+#: ../../standalone/drakbug_.c:173
 msgid "connecting to Bugzilla wizard ..."
 msgstr "đang kết nối với đồ thuật Bugzilla..."
 
-#: ../../standalone/drakbug_.c:196
+#: ../../standalone/drakbug_.c:180
 msgid "No browser available! Please install one"
 msgstr "Hiện không có trình duyệt nào! Hãy cài đặt một trình duyệt."
 
-#: ../../standalone/drakconnect_.c:79
+#: ../../standalone/drakconnect_.c:75
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Cấu hình mạng (các bộ điều hợp %d)"
 
-#: ../../standalone/drakconnect_.c:86 ../../standalone/drakconnect_.c:594
+#: ../../standalone/drakconnect_.c:83 ../../standalone/drakconnect_.c:591
 msgid "Profile: "
 msgstr "Lý lịch: "
 
-#: ../../standalone/drakconnect_.c:94
+#: ../../standalone/drakconnect_.c:91
 msgid "Del profile..."
 msgstr "Xoá lý lịch..."
 
-#: ../../standalone/drakconnect_.c:100
+#: ../../standalone/drakconnect_.c:97
 msgid "Profile to delete:"
 msgstr "Lý lịch để xóa:"
 
-#: ../../standalone/drakconnect_.c:128
+#: ../../standalone/drakconnect_.c:125
 msgid "New profile..."
 msgstr "Lý lịch mới..."
 
-#: ../../standalone/drakconnect_.c:134
+#: ../../standalone/drakconnect_.c:131
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one) :"
@@ -12475,98 +12666,100 @@ msgstr ""
 "Tên lý lịch để tạo ra (lý lịch mới được tạo ra giống như một bản sao của lý "
 "lịch hiện thời) :"
 
-#: ../../standalone/drakconnect_.c:160
+#: ../../standalone/drakconnect_.c:157
 msgid "Hostname: "
 msgstr "Tên máy chủ:"
 
-#: ../../standalone/drakconnect_.c:167
+#: ../../standalone/drakconnect_.c:164
 msgid "Internet access"
 msgstr "Truy cập Internet"
 
-#: ../../standalone/drakconnect_.c:180
+#: ../../standalone/drakconnect_.c:177
 msgid "Type:"
 msgstr "Kiểu:"
 
-#: ../../standalone/drakconnect_.c:183 ../../standalone/drakconnect_.c:375
+#: ../../standalone/drakconnect_.c:180 ../../standalone/drakconnect_.c:372
 msgid "Gateway:"
 msgstr "Cổng kết nối:"
 
-#: ../../standalone/drakconnect_.c:183 ../../standalone/drakconnect_.c:375
+#: ../../standalone/drakconnect_.c:180 ../../standalone/drakconnect_.c:372
 msgid "Interface:"
 msgstr "Giao diện :"
 
-#: ../../standalone/drakconnect_.c:194
+#: ../../standalone/drakconnect_.c:191
 msgid "Status:"
 msgstr "Tình trạng:"
 
-#: ../../standalone/drakconnect_.c:201
+#: ../../standalone/drakconnect_.c:198 ../../standalone/net_monitor_.c:145
 msgid "Wait please"
 msgstr "Hãy đợi"
 
-#: ../../standalone/drakconnect_.c:219
+#: ../../standalone/drakconnect_.c:216
 msgid "Configure Internet Access..."
 msgstr "Cấu hình truy cập Internet..."
 
-#: ../../standalone/drakconnect_.c:226 ../../standalone/drakconnect_.c:448
+#: ../../standalone/drakconnect_.c:223 ../../standalone/drakconnect_.c:445
 msgid "LAN configuration"
 msgstr "Cấu hình LAN"
 
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
 msgid "Driver"
 msgstr "Driver"
 
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
 msgid "Interface"
 msgstr "Giao diện"
 
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
 msgid "Protocol"
 msgstr "Giao thức"
 
-#: ../../standalone/drakconnect_.c:231
+#: ../../standalone/drakconnect_.c:228
 msgid "State"
 msgstr "Tình trạng"
 
-#: ../../standalone/drakconnect_.c:243
+#: ../../standalone/drakconnect_.c:240
 msgid "Configure Local Area Network..."
 msgstr "Cấu hình mạng cục bộ..."
 
-#: ../../standalone/drakconnect_.c:255
+#: ../../standalone/drakconnect_.c:252
 msgid "Click here to launch the wizard ->"
 msgstr "Nhấn vào đây để chạy đồ thuật ->"
 
-#: ../../standalone/drakconnect_.c:256
+#: ../../standalone/drakconnect_.c:253
 msgid "Wizard..."
 msgstr "Đồ thuật..."
 
-#: ../../standalone/drakconnect_.c:282
+#: ../../standalone/drakconnect_.c:279
 msgid "Apply"
 msgstr "áp dụng"
 
-#: ../../standalone/drakconnect_.c:383 ../../standalone/drakconnect_.c:406
+#: ../../standalone/drakconnect_.c:380 ../../standalone/drakconnect_.c:403
+#: ../../standalone/net_monitor_.c:457
 msgid "Connected"
 msgstr "Đã kết nối"
 
-#: ../../standalone/drakconnect_.c:383 ../../standalone/drakconnect_.c:406
+#: ../../standalone/drakconnect_.c:380 ../../standalone/drakconnect_.c:403
+#: ../../standalone/net_monitor_.c:457
 msgid "Not connected"
 msgstr "Chưa kết nối"
 
-#: ../../standalone/drakconnect_.c:384 ../../standalone/drakconnect_.c:407
+#: ../../standalone/drakconnect_.c:381 ../../standalone/drakconnect_.c:404
 msgid "Connect..."
 msgstr "Kết nối..."
 
-#: ../../standalone/drakconnect_.c:384 ../../standalone/drakconnect_.c:407
+#: ../../standalone/drakconnect_.c:381 ../../standalone/drakconnect_.c:404
 msgid "Disconnect..."
 msgstr "Ngắt kết nối..."
 
-#: ../../standalone/drakconnect_.c:403
+#: ../../standalone/drakconnect_.c:400
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
 "network"
 msgstr ""
 "Cảnh báo, phát hiện thấy một kết nối Internet khác, có thể là đang dùng mạng"
 
-#: ../../standalone/drakconnect_.c:430
+#: ../../standalone/drakconnect_.c:427
 msgid ""
 "You don't have any configured interface.\n"
 "Configure them first by clicking on 'Configure'"
@@ -12574,36 +12767,36 @@ msgstr ""
 "Bạn không có giao diện nào đã được định cấu hình.\n"
 "Cấu hình chúng bằng cách nhấn vào 'Configure'"
 
-#: ../../standalone/drakconnect_.c:452
+#: ../../standalone/drakconnect_.c:449
 msgid "LAN Configuration"
 msgstr "Cấu hình LAN"
 
-#: ../../standalone/drakconnect_.c:463
+#: ../../standalone/drakconnect_.c:460
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Adapter %s: %s"
 
-#: ../../standalone/drakconnect_.c:469
+#: ../../standalone/drakconnect_.c:466
 msgid "Boot Protocol"
 msgstr "Giao thức khởi động"
 
-#: ../../standalone/drakconnect_.c:470
+#: ../../standalone/drakconnect_.c:467
 msgid "Started on boot"
 msgstr "Được chạy lúc khởi động "
 
-#: ../../standalone/drakconnect_.c:471
+#: ../../standalone/drakconnect_.c:468
 msgid "DHCP client"
 msgstr "DHCP client"
 
-#: ../../standalone/drakconnect_.c:496 ../../standalone/drakconnect_.c:499
+#: ../../standalone/drakconnect_.c:493 ../../standalone/drakconnect_.c:496
 msgid "activate now"
 msgstr "Kích hoạt bây giờ"
 
-#: ../../standalone/drakconnect_.c:496 ../../standalone/drakconnect_.c:499
+#: ../../standalone/drakconnect_.c:493 ../../standalone/drakconnect_.c:496
 msgid "deactivate now"
 msgstr "Bất hoạt bây giờ"
 
-#: ../../standalone/drakconnect_.c:502
+#: ../../standalone/drakconnect_.c:499
 msgid ""
 "This interface has not been configured yet.\n"
 "Launch the configuration wizard in the main window"
@@ -12611,7 +12804,7 @@ msgstr ""
 "Giao diện này vẫn còn chưa được cấu hình.\n"
 "Hãy chạy đồ thuật cấu hình trong cửa sổ chính"
 
-#: ../../standalone/drakconnect_.c:559
+#: ../../standalone/drakconnect_.c:556
 msgid ""
 "You don't have any internet connection.\n"
 "Create one first by clicking on 'Configure'"
@@ -12619,121 +12812,117 @@ msgstr ""
 "Bạn chưa có một kết nối internet nào.\n"
 "Hãy tạo trước một kết nối bằng cách nhấn vào 'Configure'"
 
-#: ../../standalone/drakconnect_.c:583
+#: ../../standalone/drakconnect_.c:580
 msgid "Internet connection configuration"
 msgstr "Cấu hình kết nối Internet"
 
-#: ../../standalone/drakconnect_.c:587
+#: ../../standalone/drakconnect_.c:584
 msgid "Internet Connection Configuration"
 msgstr "Cấu Hình Kết Nối Internet"
 
-#: ../../standalone/drakconnect_.c:596
+#: ../../standalone/drakconnect_.c:593 ../../standalone/net_monitor_.c:94
 msgid "Connection type: "
 msgstr "Kiểu kết nối:"
 
-#: ../../standalone/drakconnect_.c:602
+#: ../../standalone/drakconnect_.c:599
 msgid "Parameters"
 msgstr "Các thông số"
 
-#: ../../standalone/drakconnect_.c:620
+#: ../../standalone/drakconnect_.c:618
 msgid "Gateway"
 msgstr "Cổng kết nối"
 
-#: ../../standalone/drakconnect_.c:629
+#: ../../standalone/drakconnect_.c:627
 msgid "Ethernet Card"
 msgstr "Card Ethernet"
 
-#: ../../standalone/drakconnect_.c:630
+#: ../../standalone/drakconnect_.c:628
 msgid "DHCP Client"
 msgstr "DHCP Client"
 
-#: ../../standalone/drakfloppy_.c:64
-msgid "usage: drakfloppy\n"
-msgstr "cách dùng: drakfloppy\n"
-
-#: ../../standalone/drakfloppy_.c:68
+#: ../../standalone/drakfloppy_.c:39
 msgid "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 msgstr "-misc-Fixed-Medium-r-*-*-*-140-*-*-*-*-*-*,*"
 
-#: ../../standalone/drakfloppy_.c:69
+#: ../../standalone/drakfloppy_.c:40
 msgid "Module name"
 msgstr "Tên module"
 
-#: ../../standalone/drakfloppy_.c:69
+#: ../../standalone/drakfloppy_.c:40
 msgid "Size"
 msgstr "Cỡ"
 
-#: ../../standalone/drakfloppy_.c:74
+#: ../../standalone/drakfloppy_.c:45
 msgid "drakfloppy"
 msgstr "drakfloppy"
 
-#: ../../standalone/drakfloppy_.c:91
+#: ../../standalone/drakfloppy_.c:63
 msgid "boot disk creation"
 msgstr "Tạo đĩa khởi động"
 
-#: ../../standalone/drakfloppy_.c:99 ../../standalone/drakfloppy_.c:112
+#: ../../standalone/drakfloppy_.c:71 ../../standalone/drakfloppy_.c:84
 msgid "default"
 msgstr "mặc định"
 
-#: ../../standalone/drakfloppy_.c:115
+#: ../../standalone/drakfloppy_.c:87
 #, c-format
 msgid "DrakFloppy Error: %s"
 msgstr "Lỗi DrakFloppy: %s"
 
-#: ../../standalone/drakfloppy_.c:126
+#: ../../standalone/drakfloppy_.c:98
 msgid "kernel version"
 msgstr "phiên bản của kernel"
 
-#: ../../standalone/drakfloppy_.c:132
+#: ../../standalone/drakfloppy_.c:104
 msgid "General"
 msgstr "Tổng quát"
 
-#: ../../standalone/drakfloppy_.c:137
+#: ../../standalone/drakfloppy_.c:109
 msgid "Expert Area"
 msgstr "Khu vực cho chuyên gia"
 
-#: ../../standalone/drakfloppy_.c:140
+#: ../../standalone/drakfloppy_.c:112
 msgid "mkinitrd optional arguments"
 msgstr "Đối số tuỳ chọn cho mkinitrd"
 
-#: ../../standalone/drakfloppy_.c:141
+#: ../../standalone/drakfloppy_.c:113
 msgid "Add a module"
 msgstr "Thêm 1 module"
 
-#: ../../standalone/drakfloppy_.c:161
+#: ../../standalone/drakfloppy_.c:133
 msgid "force"
 msgstr "cưỡng chế"
 
-#: ../../standalone/drakfloppy_.c:162
+#: ../../standalone/drakfloppy_.c:134
 msgid "if needed"
 msgstr "Nếu cần thiết"
 
-#: ../../standalone/drakfloppy_.c:163
+#: ../../standalone/drakfloppy_.c:135
 msgid "omit scsi modules"
 msgstr "bỏ  các mo-đun scsi"
 
-#: ../../standalone/drakfloppy_.c:164
+#: ../../standalone/drakfloppy_.c:136
 msgid "omit raid modules"
 msgstr "bỏ  các mo-đun raid"
 
-#: ../../standalone/drakfloppy_.c:200
+#: ../../standalone/drakfloppy_.c:172
 msgid "Remove a module"
 msgstr "Gỡ bỏ 1 module"
 
-#: ../../standalone/drakfloppy_.c:222
+#: ../../standalone/drakfloppy_.c:194
 msgid "Output"
 msgstr "Xuất ra"
 
-#: ../../standalone/drakfloppy_.c:234
+#: ../../standalone/drakfloppy_.c:206
 msgid "Build the disk"
 msgstr "Tạo đĩa"
 
-#: ../../standalone/drakfloppy_.c:377
+#: ../../standalone/drakfloppy_.c:336
 #, c-format
 msgid "Be sure a media is present for the device %s"
 msgstr "Hãy đảm bảo rằng media được thể hiện cho thiết bị %s"
 
-#: ../../standalone/drakfloppy_.c:382
+#: ../../standalone/drakfloppy_.c:341
 #, c-format
 msgid ""
 "There is no medium or it is write-protected for device %s.\n"
@@ -12742,12 +12931,12 @@ msgstr ""
 "Không có phương tiện hoặc thiết bị đang ở chế độ chống ghi %s.\n"
 "Hãy nạp vào."
 
-#: ../../standalone/drakfloppy_.c:384
+#: ../../standalone/drakfloppy_.c:344
 #, c-format
 msgid "Unable to fork: %s"
 msgstr "Không thể fork: %s"
 
-#: ../../standalone/drakfloppy_.c:388
+#: ../../standalone/drakfloppy_.c:349
 #, c-format
 msgid ""
 "Unable to close properly mkbootdisk: \n"
@@ -12758,99 +12947,99 @@ msgstr ""
 "%s \n"
 "%s"
 
-#: ../../standalone/drakfont_.c:231
+#: ../../standalone/drakfont_.c:213
 msgid "Search installed fonts"
 msgstr "Tìm các phông chữ đã cài đặt"
 
-#: ../../standalone/drakfont_.c:233
+#: ../../standalone/drakfont_.c:215
 msgid "Unselect fonts installed"
 msgstr "Bỏ chọn các phông chữ đã cài đặt"
 
-#: ../../standalone/drakfont_.c:257
+#: ../../standalone/drakfont_.c:239
 msgid "parse all fonts"
 msgstr "phân tích toàn bộ các phông chữ"
 
-#: ../../standalone/drakfont_.c:260
+#: ../../standalone/drakfont_.c:242
 msgid "no fonts found"
 msgstr "không tìm thấy phông chữ nào"
 
-#: ../../standalone/drakfont_.c:269 ../../standalone/drakfont_.c:323
-#: ../../standalone/drakfont_.c:379 ../../standalone/drakfont_.c:468
-#: ../../standalone/drakfont_.c:479 ../../standalone/drakfont_.c:506
-#: ../../standalone/drakfont_.c:520 ../../standalone/drakfont_.c:537
+#: ../../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 "hoàn thành"
 
-#: ../../standalone/drakfont_.c:275
+#: ../../standalone/drakfont_.c:257
 msgid "could not find any font in your mounted partitions"
 msgstr "không tìm thấy phông chữ có trong các phân vùng đã gắn kết"
 
-#: ../../standalone/drakfont_.c:321
+#: ../../standalone/drakfont_.c:303
 msgid "Reselect correct fonts"
 msgstr "Chọn lại các phông chữ đúng"
 
-#: ../../standalone/drakfont_.c:325
+#: ../../standalone/drakfont_.c:307
 msgid "could not find any font.\n"
 msgstr "không tìm thấy bất kỳ phông chữ nào.\n"
 
-#: ../../standalone/drakfont_.c:349
+#: ../../standalone/drakfont_.c:331
 msgid "Search fonts in installed list"
 msgstr "Tìm phông chữ trong danh sách đã cài đặt"
 
-#: ../../standalone/drakfont_.c:377
+#: ../../standalone/drakfont_.c:359
 msgid "Fonts copy"
 msgstr "Sao chép phông chữ"
 
-#: ../../standalone/drakfont_.c:381
+#: ../../standalone/drakfont_.c:363
 msgid "True Type fonts installation"
 msgstr "Cài đặt phông True Type"
 
-#: ../../standalone/drakfont_.c:389
+#: ../../standalone/drakfont_.c:371
 msgid "please wait during ttmkfdir..."
 msgstr "hãy đợi khi đang thực hiện ttmkfdir..."
 
-#: ../../standalone/drakfont_.c:394
+#: ../../standalone/drakfont_.c:377
 msgid "True Type install done"
 msgstr "Hoàn thành cài đặt phông True Type"
 
-#: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:429
+#: ../../standalone/drakfont_.c:386 ../../standalone/drakfont_.c:413
 msgid "Fonts conversion"
 msgstr "Sự chuyển đổi các phông chữ"
 
-#: ../../standalone/drakfont_.c:409 ../../standalone/drakfont_.c:433
-#: ../../standalone/drakfont_.c:464
+#: ../../standalone/drakfont_.c:392 ../../standalone/drakfont_.c:417
+#: ../../standalone/drakfont_.c:450
 msgid "type1inst building"
 msgstr "tạo cài đặt Type1"
 
-#: ../../standalone/drakfont_.c:419 ../../standalone/drakfont_.c:442
+#: ../../standalone/drakfont_.c:403 ../../standalone/drakfont_.c:427
 msgid "Ghostscript referencing"
 msgstr "chuyển giao cho Ghostscript"
 
-#: ../../standalone/drakfont_.c:452
+#: ../../standalone/drakfont_.c:437
 msgid "ttf fonts conversion"
 msgstr "sự chuyển đổi các phông ttf"
 
-#: ../../standalone/drakfont_.c:459
+#: ../../standalone/drakfont_.c:444
 msgid "pfm fonts conversion"
 msgstr "sự chuyển đổi các phông pfm"
 
-#: ../../standalone/drakfont_.c:470
+#: ../../standalone/drakfont_.c:456
 msgid "Suppress temporary Files"
 msgstr "Triệt các tập tin tạm thời"
 
-#: ../../standalone/drakfont_.c:473
+#: ../../standalone/drakfont_.c:459
 msgid "Restart XFS"
 msgstr "Khởi chạy lại XFS"
 
-#: ../../standalone/drakfont_.c:518 ../../standalone/drakfont_.c:532
+#: ../../standalone/drakfont_.c:512 ../../standalone/drakfont_.c:526
 msgid "Suppress Fonts Files"
 msgstr "Triệt các tập tin phông chữ"
 
-#: ../../standalone/drakfont_.c:534
+#: ../../standalone/drakfont_.c:528
 msgid "xfs restart"
 msgstr "khởi động lại xfs"
 
-#: ../../standalone/drakfont_.c:542 ../../standalone/drakfont_.c:951
+#: ../../standalone/drakfont_.c:536 ../../standalone/drakfont_.c:902
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
 "install them on your system.\n"
@@ -12864,111 +13053,277 @@ msgstr ""
 "-Có thể cài đặt phông theo cách thông thường. Trong một số hiếm trường hợp, "
 "phông giả sẽ làm treo X Server."
 
-#: ../../standalone/drakfont_.c:630
+#: ../../standalone/drakfont_.c:621
 msgid "Fonts Importation"
 msgstr "Nhập phông chữ"
 
-#: ../../standalone/drakfont_.c:660
+#: ../../standalone/drakfont_.c:650
 msgid "Get Windows Fonts"
 msgstr "Lấy phông từ Windows"
 
-#: ../../standalone/drakfont_.c:668
+#: ../../standalone/drakfont_.c:658
 msgid "Uninstall Fonts"
 msgstr "Bỏ cài đặt phông chữ"
 
-#: ../../standalone/drakfont_.c:679
+#: ../../standalone/drakfont_.c:669
 msgid "Advanced Options"
 msgstr "Tùy chọn Nâng cao"
 
-#: ../../standalone/drakfont_.c:687
+#: ../../standalone/drakfont_.c:677
 msgid "Font List"
 msgstr "Danh sách phông"
 
-#: ../../standalone/drakfont_.c:909
+#: ../../standalone/drakfont_.c:737
+msgid ""
+"\n"
+" Copyright (C) 2001-2002 by MandrakeSoft \n"
+"\tDUPONT Sebastien sdupont\\@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"
+" 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"
+"\n"
+" Thanks:\n"
+"    -  pfm2afm:   \n"
+"\t by Ken Borgendale:\n"
+"\t    Convert a Windows .pfm  file to a .afm (Adobe Font Metrics)\n"
+"    -  type1inst:\n"
+"\t by James Macnicol: \n"
+"\t    type1inst generates files fonts.dir fonts.scale & Fontmap.\n"
+"    -  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"
+" Bản quyền (C) 2001-2002 của MandrakeSoft \n"
+"\tDUPONT Sebastien sdupont\\@mandrakesoft.com\n"
+"\n"
+" Chương trình này là phần mềm miễn phí; bạn có thể phân phối lại hay\n"
+" thay đổi theo các điều khoản của GNU/GPL mà Quỹ Phần Mềm Tự Do\n"
+" công bố; với phiên bản 2, hay bất kỳ phiên bản mới nhất nào.\n"
+"\n"
+" Chương trình này được phân phối với hy vọng là nó có ích,\n"
+" nhưng Không Có Bất Kỳ Bảo Đảm Nào; thậm chí không có bảo đảm về\n"
+" Khả Năng Thương Mại hay Thích Hợp Với Mục Đích Đặc Biệt. Hãy xem\n"
+" GNU/GPL để biết thêm chi tiết.\n"
+"\n"
+"Bạn nên nhận lấy một bản sao của GNU/GPL đi kèm theo\n"
+"chương trình; nếu không có, xin viết thư tới: Free Software\n"
+"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n"
+"\n"
+" Lời cảm ơn tới:\n"
+"    -  pfm2afm:   \n"
+"\t viết bởi Ken Borgendale:\n"
+"\t    Chuyển đổi tập tin *.pfm của Windows thành *.afm (Adobe Font Metrics)\n"
+"    -  type1inst:\n"
+"\t viết bởi James Macnicol: \n"
+"\t    type1inst tạo ra các tập tin fonts.dir fonts.scale & Fontmap.\n"
+"    -  ttf2pt1:   \n"
+"\t  viết bởi Andrew Weeks, Frank Siegert, Thomas Henlich, Sergey Babkin  \n"
+"             Chuyển đổi các tập tin ttf font thành afm và pfb font\n"
+"\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 ""
+"Xem lại tương lai của drakfont\n"
+"        - Nhập phông chữ:\n"
+"                pfb ( Adobe Type 1 binary )\n"
+"                pfa ( Adobe Type 1 ASCII )\n"
+"                ttf ( True-Type  )\n"
+"                pcf.gz\n"
+"                Speedo\n"
+"                và Bitmap (PCF, BDF, and SNF)\n"
+"        - Tính năng\n"
+"                - Cài đặt phông chữ từ bất kỳ thư mục nào\n"
+"                - Lấy phông từ bất kỳ phân vùng nào của Windows\n"
+"                - Nhập phông chữ trên bất kỳ phân vùng nào.\n"
+"                - Gỡ bỏ bất kỳ phông chữ nào (kể cả khi không cài đặt bằng "
+"drakfont)\n"
+"        - Hỗ trợ\n"
+"              - Xfs\n"
+"              - ghostscript & máy in\n"
+"              - Staroffice & máy in\n"
+"              - abiword\n"
+"\t      - netscape\n"
+"              - Koffice, Gnumeric, ... đang nghiên cứu\n"
+"              - mọi phông chữ được máy in hỗ trợ\n"
+"              - anti-aliases bởi RENDER trong Xfree86 .... \n"
+"\t\t\t\tđược KDE hỗ trợ.\n"
+"\t\t\t\tsẽ được gnome 1.2 hỗ trợ.\n"
+"Giao diện trực quan:\n"
+"        Giao diện cửa sổ:\n"
+"          - Widget cho thoại chọn phông chữ\n"
+"          - Các nút lệnh dưới thoại chọn phông chữ (như actual frontend).\n"
+"        Các nút lệnh:\n"
+"          - nhập từ phân vùng windows.\n"
+"                nhập từ mọi phân vùng fat32 và tìm kiếm winnt/windows/font\n"
+"                và nhập tất cả (xóa phông giống nhau) nhưng không nhập nếu "
+"đã có rồi.\n"
+"          - nhập từ thư mục\n"
+"                tìm kiếm nếu nó tồn tại trước cho từng phông và không xóa "
+"gốc.\n"
+"                (thay thế hết, không, không phải)\n"
+"                Các tùy chọn cho chuyên gia:\n"
+"                        hỏi thư mục nào và tìm kiếm nếu nó tồn tại trước\n"
+"                        nếu nó tồn tại thì hỏi: (thay thế hết, không, không "
+"phải)\n"
+"          - gỡ bỏ theo danh sách cho từng loại phông\n"
+"        Chuyển đổi phụ thêm cho chuyên gia\n"
+"          - hỗ trợ tùy chọn:   ghostscript, Staroffice, v.v...\n"
+"                nút kiểm. (chọn tất theo mặc định)\n"
+"          - Hỗ Trợ Phông Ứng Dụng Máy In...\n"
+"\n"
+"\n"
+
+#: ../../standalone/drakfont_.c:862
 msgid "Choose the applications that will support the fonts:"
 msgstr "Hãy chọn các ứng dụng sẽ hỗ trợ cho các phông chữ :"
 
-#: ../../standalone/drakfont_.c:918
+#: ../../standalone/drakfont_.c:870
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: ../../standalone/drakfont_.c:925
+#: ../../standalone/drakfont_.c:877
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: ../../standalone/drakfont_.c:932
+#: ../../standalone/drakfont_.c:884
 msgid "Abiword"
 msgstr "Abiword"
 
-#: ../../standalone/drakfont_.c:939
+#: ../../standalone/drakfont_.c:891
 msgid "Generic Printers"
 msgstr "Máy in Chung"
 
-#: ../../standalone/drakfont_.c:1016
+#: ../../standalone/drakfont_.c:958
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Chọn tập tin hay thư mục chứa phông rồi nhấn 'Thêm'"
 
-#: ../../standalone/drakfont_.c:1063
+#: ../../standalone/drakfont_.c:1005
 msgid "Install List"
 msgstr "Danh sách Cài đặt"
 
-#: ../../standalone/drakfont_.c:1106
+#: ../../standalone/drakfont_.c:1048
 msgid "click here if you are sure."
 msgstr "nhấn vào đây nếu thấy đúng."
 
-#: ../../standalone/drakfont_.c:1113
+#: ../../standalone/drakfont_.c:1055
 msgid "here if no."
 msgstr "ở đây nếu không."
 
-#: ../../standalone/drakfont_.c:1174
+#: ../../standalone/drakfont_.c:1112
 msgid "Unselected All"
 msgstr "Mọi thứ không được chọn"
 
-#: ../../standalone/drakfont_.c:1178
+#: ../../standalone/drakfont_.c:1116
 msgid "Selected All"
 msgstr "Mọi thứ được chọn"
 
-#: ../../standalone/drakfont_.c:1182
+#: ../../standalone/drakfont_.c:1120
 msgid "Remove List"
 msgstr "Gỡbỏ Danh sách"
 
-#: ../../standalone/drakfont_.c:1204 ../../standalone/drakfont_.c:1237
+#: ../../standalone/drakfont_.c:1142 ../../standalone/drakfont_.c:1175
 msgid "Initials tests"
 msgstr "Các test sơ khởi"
 
-#: ../../standalone/drakfont_.c:1207
+#: ../../standalone/drakfont_.c:1145
 msgid "Copy fonts on your system"
 msgstr "Sao chép các phông chữ vào hệ thống"
 
-#: ../../standalone/drakfont_.c:1211
+#: ../../standalone/drakfont_.c:1149
 msgid "Install & convert Fonts"
 msgstr "Cài đặt & Chuyển đổi phông"
 
-#: ../../standalone/drakfont_.c:1215
+#: ../../standalone/drakfont_.c:1153
 msgid "Post Install"
 msgstr "Sau Cài đặt"
 
-#: ../../standalone/drakfont_.c:1240
+#: ../../standalone/drakfont_.c:1178
 msgid "Remove fonts on your system"
 msgstr "Gỡ bỏ phông chữ trong hệ thống"
 
-#: ../../standalone/drakfont_.c:1244
+#: ../../standalone/drakfont_.c:1182
 msgid "Post Uninstall"
 msgstr "Sau Gỡ cài đặt"
 
-#: ../../standalone/drakgw_.c:43 ../../standalone/drakgw_.c:184
+#: ../../standalone/drakgw_.c:42 ../../standalone/drakgw_.c:182
 msgid "Internet Connection Sharing"
 msgstr "Chia Sẻ Kết Nối Internet"
 
-#: ../../standalone/drakgw_.c:115
+#: ../../standalone/drakgw_.c:114
 msgid "Sorry, we support only 2.4 kernels."
 msgstr "Xin lỗi, chỉ hỗ trợ Kernel 2.4."
 
-#: ../../standalone/drakgw_.c:126
+#: ../../standalone/drakgw_.c:125
 msgid "Internet Connection Sharing currently enabled"
 msgstr "Hiện tại chia sẻ kết nối Internet đang hoạt động"
 
-#: ../../standalone/drakgw_.c:127
+#: ../../standalone/drakgw_.c:126
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently enabled.\n"
@@ -12980,19 +13335,19 @@ msgstr ""
 "\n"
 "Bạn muốn làm gì?"
 
-#: ../../standalone/drakgw_.c:131
+#: ../../standalone/drakgw_.c:130
 msgid "disable"
 msgstr "Tắt"
 
-#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:130 ../../standalone/drakgw_.c:154
 msgid "dismiss"
 msgstr "gạt bỏ"
 
-#: ../../standalone/drakgw_.c:131 ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:130 ../../standalone/drakgw_.c:154
 msgid "reconfigure"
 msgstr "cấu hình lại"
 
-#: ../../standalone/drakgw_.c:134
+#: ../../standalone/drakgw_.c:133
 msgid "Disabling servers..."
 msgstr "đang tắt các server..."
 
@@ -13000,11 +13355,11 @@ msgstr "đang tắt các server..."
 msgid "Internet connection sharing is now disabled."
 msgstr "Bây giờ chia sẻ kết nối internet đã tắt."
 
-#: ../../standalone/drakgw_.c:151
+#: ../../standalone/drakgw_.c:149
 msgid "Internet Connection Sharing currently disabled"
 msgstr "Hiện thời chia sẻ kết nối internet không được bật"
 
-#: ../../standalone/drakgw_.c:152
+#: ../../standalone/drakgw_.c:150
 msgid ""
 "The setup of Internet connection sharing has already been done.\n"
 "It's currently disabled.\n"
@@ -13016,19 +13371,19 @@ msgstr ""
 "\n"
 "Bạn muốn làm gì?"
 
-#: ../../standalone/drakgw_.c:156
+#: ../../standalone/drakgw_.c:154
 msgid "enable"
 msgstr "cho hoạt động"
 
-#: ../../standalone/drakgw_.c:163
+#: ../../standalone/drakgw_.c:161
 msgid "Enabling servers..."
 msgstr "đang cho các server hoạt động..."
 
-#: ../../standalone/drakgw_.c:168
+#: ../../standalone/drakgw_.c:166
 msgid "Internet connection sharing is now enabled."
 msgstr "Bây giờ chia sẻ kết nối internet có thể hoạt động."
 
-#: ../../standalone/drakgw_.c:185
+#: ../../standalone/drakgw_.c:183
 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 "
@@ -13050,21 +13405,21 @@ msgstr ""
 "Lưu ý: bạn cần một bộ điều hợp mạng dành cho việc thiết lập mạng cục bộ "
 "(LAN)."
 
-#: ../../standalone/drakgw_.c:213
+#: ../../standalone/drakgw_.c:211
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Giao diện %s (đang dùng module %s)"
 
-#: ../../standalone/drakgw_.c:214
+#: ../../standalone/drakgw_.c:212
 #, c-format
 msgid "Interface %s"
 msgstr "Giao diện %s"
 
-#: ../../standalone/drakgw_.c:222
+#: ../../standalone/drakgw_.c:220
 msgid "No network adapter on your system!"
 msgstr "Không có adapter mạng trong hệ thống của bạn!"
 
-#: ../../standalone/drakgw_.c:223
+#: ../../standalone/drakgw_.c:221
 msgid ""
 "No ethernet network adapter has been detected on your system. Please run the "
 "hardware configuration tool."
@@ -13072,11 +13427,11 @@ msgstr ""
 "Không có adapter mạng ethernet được tìm thấy trong hệ thống. Hãy chạy công "
 "cụ cấu hình phần cứng."
 
-#: ../../standalone/drakgw_.c:229
+#: ../../standalone/drakgw_.c:227
 msgid "Network interface"
 msgstr "Giao diện mạng"
 
-#: ../../standalone/drakgw_.c:230
+#: ../../standalone/drakgw_.c:228
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -13091,17 +13446,17 @@ msgstr ""
 "\n"
 "Chuẩn bị thiết lập mạng cục bộ của bạn với adapter đó."
 
-#: ../../standalone/drakgw_.c:239
+#: ../../standalone/drakgw_.c:235
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Hãy chọn adapter mạng nào sẽ được kết nối vào mạng cục bộ của bạn. "
 
-#: ../../standalone/drakgw_.c:265
+#: ../../standalone/drakgw_.c:261
 msgid "Network interface already configured"
 msgstr "Giao diện mạng đã được cấu hình"
 
-#: ../../standalone/drakgw_.c:266
+#: ../../standalone/drakgw_.c:262
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -13116,15 +13471,23 @@ msgstr ""
 "\n"
 "Có thể thực hiện bằng tay nếu bạn biết rõ cách làm."
 
-#: ../../standalone/drakgw_.c:271
+#: ../../standalone/drakgw_.c:267
 msgid "Automatic reconfiguration"
 msgstr "Tự động cấu hình lại"
 
-#: ../../standalone/drakgw_.c:272
+#: ../../standalone/drakgw_.c:267
+msgid "No (experts only)"
+msgstr "Không (chỉ cho chuyên gia)"
+
+#: ../../standalone/drakgw_.c:268
 msgid "Show current interface configuration"
 msgstr "Hiển thị cấu hình giao diện hiện thời"
 
-#: ../../standalone/drakgw_.c:274
+#: ../../standalone/drakgw_.c:269
+msgid "Current interface configuration"
+msgstr "Cấu hình giao diện hiện thời"
+
+#: ../../standalone/drakgw_.c:270
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -13141,7 +13504,7 @@ msgstr ""
 "Quy kết IP: %s\n"
 "Driver: %s"
 
-#: ../../standalone/drakgw_.c:287
+#: ../../standalone/drakgw_.c:283
 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 "
@@ -13150,28 +13513,28 @@ msgid ""
 "\n"
 "The default DNS entry is the Caching Nameserver configured on the firewall. "
 "You can replace that with your ISP DNS IP, for example.\n"
-"\n"
+"\t\t      \n"
 "Else, I can reconfigure your interface and (re)configure a DHCP server for "
 "you.\n"
 "\n"
 msgstr ""
-"Có thể giữ cấu hình hiện thời và cho rằng server DHCP đã được thiết lập, "
-"trong trường hợpđó, hãy xác minh là Mạng Hạng C được đọc chính xác để dùng "
-"cho mạng cục bộ. Sẽ không cấu hình lại và cũng không đụng đến cấu hình "
-"server DHCP.\n"
+"Có thể giữ cấu hình hiện thời và cho rằng máy chủ DHCP đã được thiết lập "
+"rồi. Trong trường hợp đó, hãy xác minh là mạng làm việc bạn đang dùng cho "
+"mạng cục bộ được đọc chính xác. Chương trình sẽ không cấu hình lại và cũng "
+"không đụng đến cấu hình máy chủ DHCP.\n"
 "\n"
-"Mục nhập DNS mặc định là việc cach máy chủ tên đã cấu hình trên tường lửa. "
-"Bạn có thể thay thế nó bằng IP của DNS do ISP của bạn cấp (ví  dụ).\n"
-"\n"
-"Nếu không thì có thể cấu hình lại giao diện và cấu hình một server DHCP để "
-"dùng.\n"
+"Mục nhập DNS mặc định là việc Cach Máy Chủ Tên đã cấu hình trên tường lửa. "
+"Ví dụ bạn có thể thay thế nó bằng IP của DNS do ISP của bạn cấp.\n"
+"\t\t      \n"
+"Nếu không thì chương trình có thể cấu hình lại giao diện của bạn và cấu hình "
+"lại một máy chủ DHCP cho bạn.\n"
 "\n"
 
-#: ../../standalone/drakgw_.c:294
+#: ../../standalone/drakgw_.c:290
 msgid "Local Network adress"
 msgstr "Địa Chỉ Mạng Cục Bộ"
 
-#: ../../standalone/drakgw_.c:298
+#: ../../standalone/drakgw_.c:294
 msgid ""
 "DHCP Server Configuration.\n"
 "\n"
@@ -13185,62 +13548,62 @@ msgstr ""
 "Nếu không biết ý nghĩa của tùy chọn nào đó, hãy để nguyên nó như vậy.\n"
 "\n"
 
-#: ../../standalone/drakgw_.c:304
+#: ../../standalone/drakgw_.c:300
 msgid "(This) DHCP Server IP"
 msgstr "IP của server DHCP (này)"
 
-#: ../../standalone/drakgw_.c:305
+#: ../../standalone/drakgw_.c:301
 msgid "The DNS Server IP"
 msgstr "IP của máy chủ DHCP"
 
-#: ../../standalone/drakgw_.c:306
+#: ../../standalone/drakgw_.c:302
 msgid "The internal domain name"
 msgstr "Tên miền nội bộ"
 
-#: ../../standalone/drakgw_.c:307
+#: ../../standalone/drakgw_.c:303
 msgid "The DHCP start range"
 msgstr "Chuỗi bắt đầu của DHCP"
 
-#: ../../standalone/drakgw_.c:308
+#: ../../standalone/drakgw_.c:304
 msgid "The DHCP end range"
 msgstr "Chuỗi kết thúc của DHCP"
 
-#: ../../standalone/drakgw_.c:309
+#: ../../standalone/drakgw_.c:305
 msgid "The default lease (in seconds)"
 msgstr "Kênh thuê mặc định (theo giây)"
 
-#: ../../standalone/drakgw_.c:310
+#: ../../standalone/drakgw_.c:306
 msgid "The maximum lease (in seconds)"
 msgstr "Kênh thuê tối đa (theo giây)"
 
-#: ../../standalone/drakgw_.c:311
+#: ../../standalone/drakgw_.c:307
 msgid "Re-configure interface and DHCP server"
 msgstr "Cấu hình lại giao diện và máy chủ DHCP"
 
-#: ../../standalone/drakgw_.c:318
+#: ../../standalone/drakgw_.c:314
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "Mạng Cục Bộ đã không kết thúc với `.0', hết bảo lãnh."
 
-#: ../../standalone/drakgw_.c:329
+#: ../../standalone/drakgw_.c:325
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr ""
 "Khả năng xung đột địa chỉ LAN được tìm ra trong cấu hình hiện thời của %s!\n"
 
-#: ../../standalone/drakgw_.c:339
+#: ../../standalone/drakgw_.c:335
 msgid "Configuring..."
 msgstr "Đang cấu hình..."
 
-#: ../../standalone/drakgw_.c:340
+#: ../../standalone/drakgw_.c:336
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Đang cấu hình các script, cài đặt phần mềm, khởi chạy các server..."
 
-#: ../../standalone/drakgw_.c:376
+#: ../../standalone/drakgw_.c:372
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Các trục trặc cài đặt gói %s"
 
-#: ../../standalone/drakgw_.c:509
+#: ../../standalone/drakgw_.c:505
 msgid ""
 "Everything has been configured.\n"
 "You may now share Internet connection with other computers on your Local "
@@ -13250,23 +13613,23 @@ msgstr ""
 "Bây giờ bạn có thể chia sẻ kết nối Internet với các máy tính khác trong mạng "
 "cục bộ của bạn, sử dụng cấu hình mạng tự động (DHCP)."
 
-#: ../../standalone/drakgw_.c:528
+#: ../../standalone/drakgw_.c:523
 msgid "The setup has already been done, but it's currently disabled."
 msgstr "Đã hoàn thành xong cài đặt, nhưng hiện tại nó không được hoạt động."
 
-#: ../../standalone/drakgw_.c:529
+#: ../../standalone/drakgw_.c:524
 msgid "The setup has already been done, and it's currently enabled."
 msgstr "Đã hoàn thành xong cài đặt, và hiện thời nó được hoạt động."
 
-#: ../../standalone/drakgw_.c:530
+#: ../../standalone/drakgw_.c:525
 msgid "No Internet Connection Sharing has ever been configured."
 msgstr "Chưa có một chia sẻ kết nối Internet nào được cấu hình."
 
-#: ../../standalone/drakgw_.c:535
+#: ../../standalone/drakgw_.c:531
 msgid "Internet connection sharing configuration"
 msgstr "Cấu hình chia sẻ kết nối Internet"
 
-#: ../../standalone/drakgw_.c:542
+#: ../../standalone/drakgw_.c:539
 #, c-format
 msgid ""
 "Welcome to the Internet Connection Sharing utility!\n"
@@ -13281,47 +13644,47 @@ msgstr ""
 "\n"
 "Nhấn  lên Cấu hình để chạy đồ thuật thiết lập."
 
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
 msgid "group"
 msgstr "nhóm"
 
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
 msgid "path"
 msgstr "đường dẫn"
 
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
 msgid "permissions"
 msgstr "việc chấp nhận"
 
-#: ../../standalone/drakperm_.c:42
+#: ../../standalone/drakperm_.c:36
 msgid "user"
 msgstr "người dùng"
 
-#: ../../standalone/drakperm_.c:49
+#: ../../standalone/drakperm_.c:43
 msgid "Up"
 msgstr "Lên"
 
-#: ../../standalone/drakperm_.c:50
+#: ../../standalone/drakperm_.c:44
 msgid "delete"
 msgstr "xóa"
 
-#: ../../standalone/drakperm_.c:51
+#: ../../standalone/drakperm_.c:45
 msgid "edit"
 msgstr "biên soạn"
 
-#: ../../standalone/drakperm_.c:52
+#: ../../standalone/drakperm_.c:46
 msgid "Down"
 msgstr "Xuống"
 
-#: ../../standalone/drakperm_.c:53
+#: ../../standalone/drakperm_.c:47
 msgid "add a rule"
 msgstr "thêm quy tắc"
 
-#: ../../standalone/drakperm_.c:54
+#: ../../standalone/drakperm_.c:48
 msgid "select perm file to see/edit"
 msgstr "chọn tập tin perm để xem/biên soạn"
 
-#: ../../standalone/drakperm_.c:57
+#: ../../standalone/drakperm_.c:51
 msgid ""
 "Drakperm is used to see files to use in order to fix permissions, owners, "
 "and groups via msec.\n"
@@ -13332,59 +13695,59 @@ msgstr ""
 "Bạn cũng có thể biên soạn quy tắc riêng, nó sẽ ghi đè lên các quy tắc mặc "
 "định."
 
-#: ../../standalone/drakperm_.c:62
+#: ../../standalone/drakperm_.c:56
 msgid "Add a new rule at the end"
 msgstr "Thêm quy tắc mới lúc kết thúc"
 
-#: ../../standalone/drakperm_.c:63
+#: ../../standalone/drakperm_.c:57
 msgid "Edit curent rule"
 msgstr "Biên soạn quy tắc hiện thời"
 
-#: ../../standalone/drakperm_.c:64
+#: ../../standalone/drakperm_.c:58
 msgid "Up selected rule one level"
 msgstr "Nâng quy tắc được chọn lên một mức"
 
-#: ../../standalone/drakperm_.c:65
+#: ../../standalone/drakperm_.c:59
 msgid "Down selected rule one level"
 msgstr "Hạ quy tắc được chọn xuống một mức"
 
-#: ../../standalone/drakperm_.c:66
+#: ../../standalone/drakperm_.c:60
 msgid "Delete selected rule"
 msgstr "Xóa quy tắc được chọn"
 
-#: ../../standalone/drakperm_.c:237
+#: ../../standalone/drakperm_.c:224
 msgid "browse"
 msgstr "duyệt"
 
-#: ../../standalone/drakperm_.c:244
+#: ../../standalone/drakperm_.c:231
 msgid "Current user"
 msgstr "Người dùng hiện thời"
 
-#: ../../standalone/drakperm_.c:249
+#: ../../standalone/drakperm_.c:236
 msgid "Permissions"
 msgstr "Sự chấp thuận"
 
-#: ../../standalone/drakperm_.c:250
+#: ../../standalone/drakperm_.c:237
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: ../../standalone/drakperm_.c:251
+#: ../../standalone/drakperm_.c:238
 msgid "Property"
 msgstr "Đặc tính"
 
-#: ../../standalone/drakperm_.c:253
+#: ../../standalone/drakperm_.c:240
 msgid "sticky-bit"
 msgstr "sticky-bit"
 
-#: ../../standalone/drakperm_.c:254
+#: ../../standalone/drakperm_.c:241
 msgid "Set-UID"
 msgstr "Set-UID"
 
-#: ../../standalone/drakperm_.c:255
+#: ../../standalone/drakperm_.c:242
 msgid "Set-GID"
 msgstr "Set-GID"
 
-#: ../../standalone/drakperm_.c:310
+#: ../../standalone/drakperm_.c:296
 msgid ""
 "Used for directory:\n"
 " only owner of directory or file in this directory can delete it"
@@ -13392,35 +13755,35 @@ msgstr ""
 "Được dùng cho thư mục:\n"
 " chỉ có chủ sở hữu của thư mục hay tập tin trong thư mục này có thể xóa nó"
 
-#: ../../standalone/drakperm_.c:311
+#: ../../standalone/drakperm_.c:297
 msgid "Use owner id for execution"
 msgstr "Dùng ID chủ sở hữu để thực thi"
 
-#: ../../standalone/drakperm_.c:312
+#: ../../standalone/drakperm_.c:298
 msgid "Use group id for execution"
 msgstr "Dùng ID của nhóm để thực thi"
 
-#: ../../standalone/drakperm_.c:313
+#: ../../standalone/drakperm_.c:299
 msgid "when checked, owner and group won't be changed"
 msgstr "khi được kiểm dấu, chủ sở hữu và nhóm sẽ không bị thay đổi"
 
-#: ../../standalone/drakperm_.c:318
+#: ../../standalone/drakperm_.c:304
 msgid "Path selection"
 msgstr "Chọn đường dẫn"
 
-#: ../../standalone/drakperm_.c:364
+#: ../../standalone/drakperm_.c:350
 msgid "user :"
 msgstr "người dùng:"
 
-#: ../../standalone/drakperm_.c:366
+#: ../../standalone/drakperm_.c:352
 msgid "group :"
 msgstr "Nhóm :"
 
-#: ../../standalone/draksound_.c:47
+#: ../../standalone/draksound_.c:46
 msgid "No Sound Card detected!"
 msgstr "Không phát hiện được card âm thanh nào!"
 
-#: ../../standalone/draksound_.c:48
+#: ../../standalone/draksound_.c:47
 msgid ""
 "No Sound Card has been detected on your machine. Please verify that a Linux-"
 "supported Sound Card is correctly plugged in.\n"
@@ -13440,7 +13803,7 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: ../../standalone/draksound_.c:55
+#: ../../standalone/draksound_.c:54
 msgid ""
 "\n"
 "\n"
@@ -13454,7 +13817,7 @@ msgstr ""
 "Lưu ý: nếu có card âm thanh loại ISA PnP, bạn sẽ phải dùng chương trình "
 "sndconfig.  Chỉ việc gõ \"sndconfig\" trong một console."
 
-#: ../../standalone/draksplash_.c:34
+#: ../../standalone/draksplash_.c:21
 msgid ""
 "package 'ImageMagick' is required for correct working.\n"
 "Click \"Ok\" to install 'ImageMagick' or \"Cancel\" to quit"
@@ -13462,31 +13825,31 @@ msgstr ""
 "yêu cầu gói 'ImageMagick' để có thể hoạt động đúng.\n"
 "Nhấn \"Ok\" để cài đặt 'ImageMagick' hay \"Bỏ qua\" để thoát ra"
 
-#: ../../standalone/draksplash_.c:78
+#: ../../standalone/draksplash_.c:67
 msgid "first step creation"
 msgstr "Bước Tạo Đầu Tiên"
 
-#: ../../standalone/draksplash_.c:79
+#: ../../standalone/draksplash_.c:70
 msgid "final resolution"
 msgstr "Độ phân giải cuối cùng"
 
-#: ../../standalone/draksplash_.c:80 ../../standalone/draksplash_.c:172
+#: ../../standalone/draksplash_.c:71 ../../standalone/draksplash_.c:163
 msgid "choose image file"
 msgstr "Chọn tập tin ảnh"
 
-#: ../../standalone/draksplash_.c:81
+#: ../../standalone/draksplash_.c:72
 msgid "Theme name"
 msgstr "Tên của theme"
 
-#: ../../standalone/draksplash_.c:85
+#: ../../standalone/draksplash_.c:77
 msgid "Browse"
 msgstr "Duyệt"
 
-#: ../../standalone/draksplash_.c:99 ../../standalone/draksplash_.c:162
+#: ../../standalone/draksplash_.c:87 ../../standalone/draksplash_.c:153
 msgid "Configure bootsplash picture"
 msgstr "Cấu hình ảnh Bootsplash"
 
-#: ../../standalone/draksplash_.c:100
+#: ../../standalone/draksplash_.c:90
 msgid ""
 "x coordinate of text box\n"
 "in number of character"
@@ -13494,7 +13857,7 @@ msgstr ""
 "x coordinate của hộp văn bản (text box)\n"
 "trong số hiệu của ký tự"
 
-#: ../../standalone/draksplash_.c:101
+#: ../../standalone/draksplash_.c:91
 msgid ""
 "y coordinate of text box\n"
 "in number of character"
@@ -13502,15 +13865,15 @@ msgstr ""
 "y coordinate của hộp văn bản (text box)\n"
 "trong số hiệu của ký tự"
 
-#: ../../standalone/draksplash_.c:102
+#: ../../standalone/draksplash_.c:92
 msgid "text width"
 msgstr "độ rộng văn bản"
 
-#: ../../standalone/draksplash_.c:103
+#: ../../standalone/draksplash_.c:93
 msgid "text box height"
 msgstr "chiều cao hộp văn bản"
 
-#: ../../standalone/draksplash_.c:104
+#: ../../standalone/draksplash_.c:94
 msgid ""
 "the progress bar x coordinate\n"
 "of its upper left corner"
@@ -13518,7 +13881,7 @@ msgstr ""
 "thanh tiến trình x coordinate\n"
 "của góc trên trái của nó"
 
-#: ../../standalone/draksplash_.c:105
+#: ../../standalone/draksplash_.c:95
 msgid ""
 "the progress bar y coordinate\n"
 "of its upper left corner"
@@ -13526,66 +13889,66 @@ msgstr ""
 "thanh tiến trình y coordinate\n"
 "của góc trên trái của nó"
 
-#: ../../standalone/draksplash_.c:106
+#: ../../standalone/draksplash_.c:96
 msgid "the width of the progress bar"
 msgstr "bề rộng của thanh tiến trình"
 
-#: ../../standalone/draksplash_.c:107
+#: ../../standalone/draksplash_.c:97
 msgid "the heigth of the progress bar"
 msgstr "chiều cao của thanh tiến trình"
 
-#: ../../standalone/draksplash_.c:108
+#: ../../standalone/draksplash_.c:98
 msgid "the color of the progress bar"
 msgstr "màu sắc của thanh tiến trình"
 
-#: ../../standalone/draksplash_.c:121
+#: ../../standalone/draksplash_.c:113
 msgid "Preview"
 msgstr "xem trước"
 
-#: ../../standalone/draksplash_.c:123
+#: ../../standalone/draksplash_.c:115
 msgid "Save theme"
 msgstr "lưu theme"
 
-#: ../../standalone/draksplash_.c:124
+#: ../../standalone/draksplash_.c:116
 msgid "Choose color"
 msgstr "chọn màu"
 
-#: ../../standalone/draksplash_.c:127
+#: ../../standalone/draksplash_.c:119
 msgid "Display logo on Console"
 msgstr "Hiển thị Logo trên Console"
 
-#: ../../standalone/draksplash_.c:128
+#: ../../standalone/draksplash_.c:120
 msgid "Make kernel message quiet by default"
 msgstr "Để thông điệp của Kernel ở trạng thái im lặng theo mặc định"
 
-#: ../../standalone/draksplash_.c:165 ../../standalone/draksplash_.c:329
+#: ../../standalone/draksplash_.c:156 ../../standalone/draksplash_.c:321
 #, c-format
 msgid "This theme haven't yet any bootsplash in %s !"
 msgstr "Theme này vẫn chưa có bấy kỳ bootsplash nào trong %s !"
 
-#: ../../standalone/draksplash_.c:212
+#: ../../standalone/draksplash_.c:205
 msgid "saving Bootsplash theme..."
 msgstr "đang lưu theme của Bootsplash..."
 
-#: ../../standalone/draksplash_.c:435
+#: ../../standalone/draksplash_.c:428
 msgid "ProgressBar color selection"
 msgstr "Chọn màu sắc của Thanh Tiến Trình"
 
-#: ../../standalone/draksplash_.c:456
+#: ../../standalone/draksplash_.c:449
 msgid "You must choose an image file first!"
 msgstr "Đầu tiên, phải chọn một tập tin ảnh!"
 
-#: ../../standalone/draksplash_.c:465
+#: ../../standalone/draksplash_.c:458
 msgid "Generating preview ..."
 msgstr "Đang tạo Xem Trước..."
 
 #. -PO  First %s is theme name, second %s (in parenthesis) is resolution
-#: ../../standalone/draksplash_.c:511
+#: ../../standalone/draksplash_.c:506
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "Xem Trước Bootsplash (%2$s) của %1$s"
 
-#: ../../standalone/drakxtv_.c:49
+#: ../../standalone/drakxtv_.c:46
 msgid ""
 "XawTV isn't installed!\n"
 "\n"
@@ -13610,71 +13973,71 @@ msgstr ""
 "\n"
 "Có thể cài đặt nó bằng cách gõ \"urpmi xawtv\" trong console của root."
 
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
 msgid "Canada (cable)"
 msgstr "Canada (cable)"
 
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
 msgid "USA (broadcast)"
 msgstr "USA (broadcast)"
 
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
 msgid "USA (cable)"
 msgstr "USA (cable)"
 
-#: ../../standalone/drakxtv_.c:66
+#: ../../standalone/drakxtv_.c:63
 msgid "USA (cable-hrc)"
 msgstr "USA (cable-hrc)"
 
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
 msgid "China (broadcast)"
 msgstr "China (broadcast)"
 
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
 msgid "Japan (broadcast)"
 msgstr "Japan (broadcast)"
 
-#: ../../standalone/drakxtv_.c:67
+#: ../../standalone/drakxtv_.c:64
 msgid "Japan (cable)"
 msgstr "Japan (cable)"
 
-#: ../../standalone/drakxtv_.c:68
+#: ../../standalone/drakxtv_.c:65
 msgid "East Europe"
 msgstr "Đông Âu"
 
-#: ../../standalone/drakxtv_.c:68
+#: ../../standalone/drakxtv_.c:65
 msgid "France [SECAM]"
 msgstr "Pháp [SECAM]"
 
-#: ../../standalone/drakxtv_.c:68
+#: ../../standalone/drakxtv_.c:65
 msgid "Ireland"
 msgstr "Ireland"
 
-#: ../../standalone/drakxtv_.c:68
+#: ../../standalone/drakxtv_.c:65
 msgid "West Europe"
 msgstr "Tây Âu"
 
-#: ../../standalone/drakxtv_.c:69
+#: ../../standalone/drakxtv_.c:66
 msgid "Australia"
 msgstr "Australia"
 
-#: ../../standalone/drakxtv_.c:69
+#: ../../standalone/drakxtv_.c:66
 msgid "Newzealand"
 msgstr "Newzealand"
 
-#: ../../standalone/drakxtv_.c:70
+#: ../../standalone/drakxtv_.c:67
 msgid "South Africa"
 msgstr "Nam Phi"
 
-#: ../../standalone/drakxtv_.c:71
+#: ../../standalone/drakxtv_.c:68
 msgid "Argentina"
 msgstr "Argentina"
 
-#: ../../standalone/drakxtv_.c:72
+#: ../../standalone/drakxtv_.c:69
 msgid "Australian Optus cable TV"
 msgstr "Australian Optus cable TV"
 
-#: ../../standalone/drakxtv_.c:107
+#: ../../standalone/drakxtv_.c:102
 msgid ""
 "Please,\n"
 "type in your tv norm and country"
@@ -13682,43 +14045,43 @@ msgstr ""
 "Làm ơn,\n"
 "hãy gõ trong tiêu chuẩn TV và quốc gia của bạn"
 
-#: ../../standalone/drakxtv_.c:109
+#: ../../standalone/drakxtv_.c:104
 msgid "TV norm:"
 msgstr "Tiêu chuẩn TV :"
 
-#: ../../standalone/drakxtv_.c:110
+#: ../../standalone/drakxtv_.c:105
 msgid "Area:"
 msgstr "Vùng :"
 
-#: ../../standalone/drakxtv_.c:114
+#: ../../standalone/drakxtv_.c:109
 msgid "Scanning for TV channels in progress ..."
 msgstr "Đang tiến hành quét tìm các kênh TV..."
 
-#: ../../standalone/drakxtv_.c:122
+#: ../../standalone/drakxtv_.c:116
 msgid "Scanning for TV channels"
 msgstr "Quét tìm các kênh TV"
 
-#: ../../standalone/drakxtv_.c:125
+#: ../../standalone/drakxtv_.c:120
 msgid "There was an error while scanning for TV channels"
 msgstr "Đã xảy ra lỗi khi đang dò tìm các kênh TV"
 
-#: ../../standalone/drakxtv_.c:126
+#: ../../standalone/drakxtv_.c:121
 msgid "XawTV isn't installed!"
 msgstr "XawTV chưa được cài đặt!"
 
-#: ../../standalone/drakxtv_.c:129
+#: ../../standalone/drakxtv_.c:124
 msgid "Have a nice day!"
 msgstr "Chúc một ngày tốt lành!"
 
-#: ../../standalone/drakxtv_.c:130
+#: ../../standalone/drakxtv_.c:125
 msgid "Now, you can run xawtv (under X Window!) !\n"
 msgstr "Bây giờ, bạn có thể chạy xawtv (trong X Window!) !\n"
 
-#: ../../standalone/drakxtv_.c:153
+#: ../../standalone/drakxtv_.c:147
 msgid "No TV Card detected!"
 msgstr "Không phát hiện được card TV nào!"
 
-#: ../../standalone/drakxtv_.c:154
+#: ../../standalone/drakxtv_.c:148
 msgid ""
 "No TV Card has been detected on your machine. Please verify that a Linux-"
 "supported Video/TV Card is correctly plugged in.\n"
@@ -13738,31 +14101,431 @@ msgstr ""
 "\n"
 "http://www.linux-mandrake.com/en/hardware.php3"
 
-#: ../../standalone/harddrake2_.c:8
+#: ../../standalone/harddrake2_.c:17
+msgid "Alternative drivers"
+msgstr "Các driver thay thế"
+
+#: ../../standalone/harddrake2_.c:18
+msgid "the list of alternative drivers for this sound card"
+msgstr "Danh sách các driver thay thế cho card âm thanh này"
+
+#: ../../standalone/harddrake2_.c:20
+msgid "Bus"
+msgstr "Bus"
+
+#: ../../standalone/harddrake2_.c:21
+msgid ""
+"this is the physical bus on which the device is plugged (eg: PCI, USB, ...)"
+msgstr ""
+"Đây là bus vật lý mà các thiết bị được cắm (nối) vào (VD: PCI, USB,...)"
+
+#: ../../standalone/harddrake2_.c:22
+msgid "Channel"
+msgstr "Kênh"
+
+#: ../../standalone/harddrake2_.c:22
+msgid "EIDE/SCSI channel"
+msgstr "Kênh EIDE/SCSI"
+
+#: ../../standalone/harddrake2_.c:23
+msgid "Bogomips"
+msgstr "Bogomips"
+
+#: ../../standalone/harddrake2_.c:23
+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."
+msgstr ""
+"GNU/Linux kernel cần chạy một calculation loop khi khởi động để sơ\n"
+"\t khởi một timer counter.  Kết quả của nó được cất là bogomips là cách để "
+"\"benchmark\" CPU."
+
+#: ../../standalone/harddrake2_.c:26
+msgid "Bus identification"
+msgstr "Xác nhận Bus"
+
+#: ../../standalone/harddrake2_.c:27
+msgid ""
+"- PCI and USB devices: this list the vendor, device, subvendor and subdevice "
+"PCI/USB ids"
+msgstr ""
+"- Thiết bị PCI và USB: liệt kê nhà sản xuất, thiết bị, chi nhánh sản xuất và "
+"ID PCI/USB của linh kiện"
+
+#: ../../standalone/harddrake2_.c:29
+msgid "Location on the bus"
+msgstr "Vị trí trên Bus"
+
+#: ../../standalone/harddrake2_.c:30
+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"
+msgstr ""
+"- Thiết bị PCI: cung cấp khe cắm PCI, thiết bị và chức năng cho card này\n"
+"- Thiết bị EIDE: là thiết bị phụ (slave) hay chính (master)\n"
+"- Thiết bị SCSI: bus SCSI và các ID của thiết bị SCSI"
+
+#: ../../standalone/harddrake2_.c:33
+msgid "Cache size"
+msgstr "Kích thước cache"
+
+#: ../../standalone/harddrake2_.c:33
+msgid "Size of the (second level) cpu cache"
+msgstr "Kích thước của cache CPU (L2)"
+
+#: ../../standalone/harddrake2_.c:34
+msgid "Coma bug:"
+msgstr "Lỗi Coma:"
+
+#: ../../standalone/harddrake2_.c:34
+msgid "Does this cpu has Cyrix 6x86 Coma bug ?"
+msgstr "CPU này có Cyrix 6x86 Coma bug không ?"
+
+#: ../../standalone/harddrake2_.c:35
+msgid "Cpuid family"
+msgstr "Họ CPUID"
+
+#: ../../standalone/harddrake2_.c:35
+msgid "Family of the cpu (eg: 6 for i686 class)"
+msgstr "Họ CPU (vd: 6 cho loại i686)"
+
+#: ../../standalone/harddrake2_.c:36
+msgid "Cpuid level"
+msgstr "Mức CPUID"
+
+#: ../../standalone/harddrake2_.c:36
+msgid "Information level that can be obtained through the cpuid instruction"
+msgstr "Mức thông tin có thể lấy qua hướng dẫn của cpuid"
+
+#: ../../standalone/harddrake2_.c:37
+msgid "Frequency (MHz)"
+msgstr "Tần số (MHz)"
+
+#: ../../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 ""
+"Tần số CPU tính theo MHz (MHz là đánh giá ban đầu có thể được hấp thụ thô "
+"thành số các hướng dẫn mà CPU có thể thực thi trong một giây)"
+
+#: ../../standalone/harddrake2_.c:38
+msgid "This field describes the device"
+msgstr "Trường này mô tả thiết bị"
+
+#: ../../standalone/harddrake2_.c:39
+msgid "Old device file"
+msgstr "Tập tin thiết bị cũ"
+
+#: ../../standalone/harddrake2_.c:40
+msgid "old static device name used in dev package"
+msgstr "Tên thiết bị tĩnh cũ được dùng trong gói tin dev"
+
+#: ../../standalone/harddrake2_.c:41
+msgid "New devfs device"
+msgstr "Thiết bị DEVFS mới"
+
+#: ../../standalone/harddrake2_.c:42
+msgid "new dinamic device name generated by incore kernel devfs"
+msgstr "tên thiết bị động mới được tạo bởi DEVFS của lõi kernel"
+
+#: ../../standalone/harddrake2_.c:43
+msgid "Module"
+msgstr "Module"
+
+#: ../../standalone/harddrake2_.c:43
+msgid "the module of the GNU/Linux kernel that handle that device"
+msgstr "Module của GNU/Linux kernel quản lý thiết bị đó"
+
+#: ../../standalone/harddrake2_.c:44
+msgid "CPU flags reported by the kernel"
+msgstr "CPU flags do kernel báo cáo"
+
+#: ../../standalone/harddrake2_.c:44
+msgid "Flags"
+msgstr "Flags"
+
+#: ../../standalone/harddrake2_.c:45
+msgid "Fdiv bug"
+msgstr "Lỗi Fdiv"
+
+#: ../../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 ""
+"Các chip Intel Pentium cũ hơn có một lỗi trong tiến trình dấu phẩy động "
+"không đạt được sự chính xác đi cùng khi thực hiện một Floating point "
+"DIVision (FDIV)"
+
+#: ../../standalone/harddrake2_.c:49
+msgid "Is FPU present"
+msgstr "FPU có mặt không"
+
+#: ../../standalone/harddrake2_.c:49
+msgid "yes means the processor has an arithmetic coprocessor"
+msgstr "có nghĩa là bộ vi xử lý có một bộ đồng bộ vi xử lý số học"
+
+#: ../../standalone/harddrake2_.c:50
+msgid "Does FPU have an irq vector"
+msgstr "FPU có một irq vector phải không"
+
+#: ../../standalone/harddrake2_.c:50
+msgid "yes means the arithmetic coprocessor has an exception vector attached"
+msgstr "có nghĩa là bộ đồng xử lý số học có kèm một exception vector"
+
+#: ../../standalone/harddrake2_.c:51
+msgid "Early pentium were buggy and freezed when decoding the F00F bytecode"
+msgstr "Pentium cũ bị lỗi và ì ra khi giải mã F00F bytecode"
+
+#: ../../standalone/harddrake2_.c:51
+msgid "F00f bug"
+msgstr "Lỗi F00f"
+
+#: ../../standalone/harddrake2_.c:52
+msgid "Halt bug"
+msgstr "Ngừng lỗi"
+
+#: ../../standalone/harddrake2_.c:53
+msgid ""
+"Some of the early i486DX-100 chips cannot reliably return to operating mode "
+"after the \"halt\" instruction is used"
+msgstr ""
+"Một số i486DX-100 chip cũ không thể thật sự trở về chế độ hoạt động sau khi "
+"dùng hướng dẫn \"ngừng\""
+
+#: ../../standalone/harddrake2_.c:55
+msgid "Floppy format"
+msgstr "Format đĩa mềm"
+
+#: ../../standalone/harddrake2_.c:55
+msgid "Format of floppies the drive accept"
+msgstr "Định dạng của đĩa mềm được chấp nhận"
+
+#: ../../standalone/harddrake2_.c:56
+msgid "Level"
+msgstr "Mức độ"
+
+#: ../../standalone/harddrake2_.c:56
+msgid "Sub generation of the cpu"
+msgstr "Thế hệ nhánh con của CPU"
+
+#: ../../standalone/harddrake2_.c:57
+msgid "Media class"
+msgstr "Loại Phương tiện"
+
+#: ../../standalone/harddrake2_.c:57
+msgid "class of hardware device"
+msgstr "loại của thiết bị phần cứng"
+
+#: ../../standalone/harddrake2_.c:58 ../../standalone/harddrake2_.c:59
+msgid "Model"
+msgstr "Model"
+
+#: ../../standalone/harddrake2_.c:58
+msgid "hard disk model"
+msgstr "Model đĩa cứng "
+
+#: ../../standalone/harddrake2_.c:59
+msgid "Generation of the cpu (eg: 8 for PentiumIII, ...)"
+msgstr "Thế hệ CPU (vd: 8 cho PentiumIII, ...)"
+
+#: ../../standalone/harddrake2_.c:60
+msgid "Model name"
+msgstr "Tên model"
+
+#: ../../standalone/harddrake2_.c:60
+msgid "Official vendor name of the cpu"
+msgstr "Tên nhà sản xuất chính thức CPU"
+
+#: ../../standalone/harddrake2_.c:61
+msgid "Number of buttons"
+msgstr "Số lượng nút"
+
+#: ../../standalone/harddrake2_.c:62
+msgid "Name"
+msgstr "Tên"
+
+#: ../../standalone/harddrake2_.c:63
+msgid "network printer port"
+msgstr "Cổng máy in mạng"
+
+#: ../../standalone/harddrake2_.c:64
+msgid "Processor ID"
+msgstr "ID bộ vi xử lý"
+
+#: ../../standalone/harddrake2_.c:64
+msgid "the number of the processor"
+msgstr "số bộ vi xử lý"
+
+#: ../../standalone/harddrake2_.c:65
+msgid "Model stepping"
+msgstr "Xếp bậc model"
+
+#: ../../standalone/harddrake2_.c:65
+msgid "Stepping of the cpu (sub model (generation) number)"
+msgstr "Bậc của CPU (số model (thế hệ) con)"
+
+#: ../../standalone/harddrake2_.c:66
+msgid "The type of bus on which the mouse is connected"
+msgstr "Loại bus mà bạn gắn chuột vào"
+
+#: ../../standalone/harddrake2_.c:67
+msgid "the vendor name of the device"
+msgstr "tên nhà sản xuất thiết bị"
+
+#: ../../standalone/harddrake2_.c:68
+msgid "the vendor name of the processor"
+msgstr "tên nhà sản xuất bộ vi xử lý"
+
+#: ../../standalone/harddrake2_.c:82
+msgid "/_Quit"
+msgstr "/T_hoát"
+
+#: ../../standalone/harddrake2_.c:83
+msgid "/Autodetect _printers"
+msgstr "/Tự động dò Máy _in"
+
+#: ../../standalone/harddrake2_.c:83 ../../standalone/harddrake2_.c:85
+#: ../../standalone/logdrake_.c:81
+msgid "/_Options"
+msgstr "/Tuỳ _chọn"
+
+#: ../../standalone/harddrake2_.c:85
+msgid "/Autodetect _modems"
+msgstr "/Tự động dò mo_dem"
+
+#: ../../standalone/harddrake2_.c:87 ../../standalone/harddrake2_.c:89
+#: ../../standalone/harddrake2_.c:100 ../../standalone/harddrake2_.c:102
+#: ../../standalone/logdrake_.c:83
+msgid "/_Help"
+msgstr "/Trợ _giúp"
+
+#: ../../standalone/harddrake2_.c:89
+msgid "/_Help..."
+msgstr "/Trợ _giúp..."
+
+#: ../../standalone/harddrake2_.c:92
+msgid "Harddrake help"
+msgstr "Trợ Giúp Mandrake"
+
+#: ../../standalone/harddrake2_.c:93
+msgid ""
+"Description of the fields:\n"
 "\n"
-"Usage: harddrake [-h|--help] [--test]\n"
 msgstr ""
+"Mô tả về các trường:\n"
 "\n"
-"Cách dùng: harddrake [-h|--help] [--test]\n"
 
-#: ../../standalone/keyboarddrake_.c:16
-msgid "usage: keyboarddrake [--expert] [keyboard]\n"
-msgstr "cách dùng: keyboarddrake [--expert] [keyboard]\n"
+#: ../../standalone/harddrake2_.c:96
+msgid ""
+"Once you've selected a device, you'll be able to see explanations on fields "
+"displayed on the right frame (\"Information\")"
+msgstr ""
+"Ngay khi bạn chọn một thiết bị, bạn sẽ thấy lời giải thích trong các trường "
+"hiển thị trên khung bên phải (\"Thông tin\")"
+
+#: ../../standalone/harddrake2_.c:96
+msgid "Select a device !"
+msgstr "Chọn thiết bị !"
+
+#: ../../standalone/harddrake2_.c:100
+msgid "/_Report Bug"
+msgstr "/_Báo cáo lỗi"
+
+#: ../../standalone/harddrake2_.c:102
+msgid "/_About..."
+msgstr "/Giới thiệ_u..."
+
+#: ../../standalone/harddrake2_.c:104
+msgid "About Harddrake"
+msgstr "Nói về Harddrake"
 
-#: ../../standalone/keyboarddrake_.c:32
+#: ../../standalone/harddrake2_.c:105
+msgid ""
+"This is HardDrake, a Mandrake hardware configuration tool.\n"
+"Version:"
+msgstr ""
+"Đây là HardDrake, công cụ cấu hình phần cứng của Mandrake.\n"
+"Phiên bản:"
+
+#: ../../standalone/harddrake2_.c:106
+msgid "Author:"
+msgstr "Tác giả:"
+
+#: ../../standalone/harddrake2_.c:113
+msgid "Detection in progress"
+msgstr "Đang dò tìm"
+
+#: ../../standalone/harddrake2_.c:119
+msgid "Harddrake2 version "
+msgstr "Phiên bản Harddrake2"
+
+#: ../../standalone/harddrake2_.c:126
+msgid "Detected hardware"
+msgstr "Phần cứng được phát hiện"
+
+#: ../../standalone/harddrake2_.c:129
+msgid "Information"
+msgstr "Thông tin"
+
+#: ../../standalone/harddrake2_.c:131
+msgid "Configure module"
+msgstr "Cấu hình module"
+
+#: ../../standalone/harddrake2_.c:137
+msgid "Run config tool"
+msgstr "Chạy công cụ cấu hình"
+
+#: ../../standalone/harddrake2_.c:143
+#, c-format
+msgid "Running \"%s\" ..."
+msgstr "Đang chạy \"%s\" ..."
+
+#: ../../standalone/harddrake2_.c:159
+msgid ""
+"Click on a device in the left tree in order to get its information displayed "
+"here."
+msgstr ""
+"Nhấn chuột lên thiết bị ở cây bên trái để xem thông tin hiển thị tại đây."
+
+#: ../../standalone/harddrake2_.c:231
+msgid "primary"
+msgstr "chính"
+
+#: ../../standalone/harddrake2_.c:231
+msgid "secondary"
+msgstr "phụ"
+
+#: ../../standalone/harddrake2_.c:260
+msgid "/Autodetect modems"
+msgstr "/Tự động dò modem"
+
+#: ../../standalone/harddrake2_.c:260
+msgid "/Autodetect printers"
+msgstr "/Tự động dò máy in"
+
+#: ../../standalone/harddrake2_.c:261
+msgid "/Options"
+msgstr "/Tùy chọn"
+
+#: ../../standalone/keyboarddrake_.c:26
 msgid "Please, choose your keyboard layout."
 msgstr "Hãy chọn tổ chức bàn phím"
 
-#: ../../standalone/keyboarddrake_.c:41
+#: ../../standalone/keyboarddrake_.c:35
 msgid "Do you want the BackSpace to return Delete in console?"
 msgstr "Bạn có muốn phím BackSpace trở thành phím Delete trong console không?"
 
-#: ../../standalone/livedrake_.c:24
+#: ../../standalone/livedrake_.c:18
 msgid "Change Cd-Rom"
 msgstr "Thay đĩa CD"
 
-#: ../../standalone/livedrake_.c:25
+#: ../../standalone/livedrake_.c:19
 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."
@@ -13770,136 +14533,124 @@ msgstr ""
 "Hãy nạp đĩa CD cài đặt vào ổ đĩa rồi nhấn OK khi nạp xong.\n"
 "Nếu bạn không có đĩa, nhấn Bỏ qua để thôi không nâng cấp thực."
 
-#: ../../standalone/livedrake_.c:35
+#: ../../standalone/livedrake_.c:29
 msgid "Unable to start live upgrade !!!\n"
 msgstr "Không thể chạy nâng cấp thực!!!\n"
 
-#: ../../standalone/localedrake_.c:33
+#: ../../standalone/localedrake_.c:34
 msgid "The change is done, but to be effective you must logout"
 msgstr "Thay đổi đã xong, nhưng để có hiệu lực bạn phải thoát ra"
 
-#: ../../standalone/logdrake_.c:86 ../../ugtk.pm_.c:285
+#: ../../standalone/logdrake_.c:56 ../../ugtk.pm_.c:284 ../../ugtk2.pm_.c:350
 msgid "logdrake"
 msgstr "logdrake"
 
-#: ../../standalone/logdrake_.c:96
+#: ../../standalone/logdrake_.c:68
 msgid "Show only for the selected day"
 msgstr "Chỉ hiển thị với ngày được chọn"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:75
 msgid "/File/_New"
-msgstr "/Tệp/Mớ_i"
+msgstr "/Tệp/M_ới"
 
-#: ../../standalone/logdrake_.c:103
+#: ../../standalone/logdrake_.c:75
 msgid "<control>N"
 msgstr "<control>N"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:76
 msgid "/File/_Open"
-msgstr "/Tệp/_Mở"
+msgstr "/Tệp/M_ở"
 
-#: ../../standalone/logdrake_.c:104
+#: ../../standalone/logdrake_.c:76
 msgid "<control>O"
 msgstr "<control>O"
 
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:77
 msgid "/File/_Save"
-msgstr "/Tệp/Lư_u"
+msgstr "/Tệp/_Lưu"
 
-#: ../../standalone/logdrake_.c:105
+#: ../../standalone/logdrake_.c:77
 msgid "<control>S"
 msgstr "<control>S"
 
-#: ../../standalone/logdrake_.c:106
+#: ../../standalone/logdrake_.c:78
 msgid "/File/Save _As"
-msgstr "/Tệp/Lưu_là"
+msgstr "/Tệp/Lưu l_à"
 
-#: ../../standalone/logdrake_.c:107
+#: ../../standalone/logdrake_.c:79
 msgid "/File/-"
 msgstr "/Tệp/-"
 
-#: ../../standalone/logdrake_.c:109
-msgid "/_Options"
-msgstr "/Tuỳ _chọn"
-
-#: ../../standalone/logdrake_.c:110
+#: ../../standalone/logdrake_.c:82
 msgid "/Options/Test"
 msgstr "/Tuỳ chọn/Thử"
 
-#: ../../standalone/logdrake_.c:112
+#: ../../standalone/logdrake_.c:84
 msgid "/Help/_About..."
-msgstr "/Trợ giúp/_Về..."
-
-#: ../../standalone/logdrake_.c:119
-msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
-msgstr "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
+msgstr "/Trợ giúp/Giới thiệ_u..."
 
-#: ../../standalone/logdrake_.c:120
-msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-msgstr "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-
-#: ../../standalone/logdrake_.c:174
+#: ../../standalone/logdrake_.c:145
 msgid "User"
 msgstr "Người dùng"
 
-#: ../../standalone/logdrake_.c:175
+#: ../../standalone/logdrake_.c:146
 msgid "Messages"
 msgstr "Thông điệp"
 
-#: ../../standalone/logdrake_.c:176
+#: ../../standalone/logdrake_.c:147
 msgid "Syslog"
 msgstr "Bản ghi hệ thống"
 
-#: ../../standalone/logdrake_.c:177
+#: ../../standalone/logdrake_.c:148
 msgid "Mandrake Tools Explanations"
 msgstr "Chú giải các Công Cụ của Mandrake"
 
-#: ../../standalone/logdrake_.c:180
+#: ../../standalone/logdrake_.c:151
 msgid "search"
 msgstr "tìm kiếm"
 
-#: ../../standalone/logdrake_.c:186
+#: ../../standalone/logdrake_.c:161
 msgid "A tool to monitor your logs"
 msgstr "Công cụ xem bản ghi"
 
-#: ../../standalone/logdrake_.c:187
+#: ../../standalone/logdrake_.c:162 ../../standalone/net_monitor_.c:91
 msgid "Settings"
 msgstr "Các thiết lập"
 
-#: ../../standalone/logdrake_.c:192
+#: ../../standalone/logdrake_.c:167
 msgid "matching"
 msgstr "làm khớp nhau"
 
-#: ../../standalone/logdrake_.c:193
+#: ../../standalone/logdrake_.c:168
 msgid "but not matching"
 msgstr "nhưng không khớp"
 
-#: ../../standalone/logdrake_.c:197
+#: ../../standalone/logdrake_.c:172
 msgid "Choose file"
 msgstr "Chọn tập tin"
 
-#: ../../standalone/logdrake_.c:202
+#: ../../standalone/logdrake_.c:181
 msgid "Calendar"
 msgstr "Lịch"
 
-#: ../../standalone/logdrake_.c:212
+#: ../../standalone/logdrake_.c:191
 msgid "Content of the file"
 msgstr "Nội dung tập tin"
 
-#: ../../standalone/logdrake_.c:216 ../../standalone/logdrake_.c:392
+#: ../../standalone/logdrake_.c:195 ../../standalone/logdrake_.c:375
 msgid "Mail alert"
 msgstr "Thư Cảnh báo"
 
-#: ../../standalone/logdrake_.c:268
+#: ../../standalone/logdrake_.c:245
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "Hãy đợi, đang phân tích tập tin: %s"
 
-#: ../../standalone/logdrake_.c:409
+#: ../../standalone/logdrake_.c:392
 msgid "Mail alert configuration"
 msgstr "Cấu hình Thư Cảnh Báo"
 
-#: ../../standalone/logdrake_.c:410
+#: ../../standalone/logdrake_.c:393
 msgid ""
 "Welcome to the mail configuration utility.\n"
 "\n"
@@ -13909,116 +14660,222 @@ msgstr ""
 "\n"
 "Tại đây, có thể thiết lập hệ thống cảnh báo.\n"
 
-#: ../../standalone/logdrake_.c:417
+#: ../../standalone/logdrake_.c:400
 msgid "Apache World Wide Web Server"
 msgstr "Máy Chủ WWW Apache"
 
-#: ../../standalone/logdrake_.c:418
+#: ../../standalone/logdrake_.c:401
 msgid "Domain Name Resolver"
 msgstr "Trình Xử Lý Tên Miền"
 
-#: ../../standalone/logdrake_.c:419
+#: ../../standalone/logdrake_.c:402
 msgid "Ftp Server"
 msgstr "Máy chủ FTP"
 
-#: ../../standalone/logdrake_.c:420
+#: ../../standalone/logdrake_.c:403
 msgid "Postfix Mail Server"
 msgstr "Máy Chủ Thư Postfix"
 
-#: ../../standalone/logdrake_.c:421
+#: ../../standalone/logdrake_.c:404
 msgid "Samba Server"
 msgstr "Máy Chủ Samba"
 
-#: ../../standalone/logdrake_.c:422
+#: ../../standalone/logdrake_.c:405
 msgid "SSH Server"
 msgstr "Máy chủ SSH"
 
-#: ../../standalone/logdrake_.c:423
+#: ../../standalone/logdrake_.c:406
 msgid "Webmin Service"
 msgstr "Dịch vụ Webmin"
 
-#: ../../standalone/logdrake_.c:424
+#: ../../standalone/logdrake_.c:407
 msgid "Xinetd Service"
 msgstr "Dịch Vụ Xinetd"
 
-#: ../../standalone/logdrake_.c:431
+#: ../../standalone/logdrake_.c:414
 msgid "service setting"
 msgstr "thiết lập dịch vụ"
 
-#: ../../standalone/logdrake_.c:432
+#: ../../standalone/logdrake_.c:415
 msgid ""
 "You will receive an alert if one of the selected services is no more running"
 msgstr ""
 "Bạn sẽ nhận được cảnh báo nếu một dịch vụ được chọn nào đó không còn chạy nữa"
 
-#: ../../standalone/logdrake_.c:444
+#: ../../standalone/logdrake_.c:428
 msgid "load setting"
 msgstr "nạp thiết lập"
 
-#: ../../standalone/logdrake_.c:445
+#: ../../standalone/logdrake_.c:429
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Bạn sẽ nhận được cảnh báo nếu tải cao hơn giá trị này"
 
-#: ../../standalone/logdrake_.c:458
+#: ../../standalone/logdrake_.c:444
 msgid "alert configuration"
 msgstr "Cấu hình cảnh báo"
 
-#: ../../standalone/logdrake_.c:459
+#: ../../standalone/logdrake_.c:445
 msgid "Please enter your email address below "
 msgstr "Hãy nhập địa chỉ e-mail của bạn ở dưới"
 
-#: ../../standalone/logdrake_.c:498
+#: ../../standalone/logdrake_.c:486
 msgid "Save as.."
 msgstr "Lưu là.."
 
-#: ../../standalone/mousedrake_.c:45
+#: ../../standalone/mousedrake_.c:37
 msgid "Please, choose the type of your mouse."
 msgstr "Hãy chọn kiểu chuột"
 
-#: ../../standalone/mousedrake_.c:58
+#: ../../standalone/mousedrake_.c:50
 msgid "Emulate third button?"
 msgstr "Mô phỏng nút thứ ba?"
 
-#: ../../standalone/printerdrake_.c:57
+#: ../../standalone/net_monitor_.c:53 ../../standalone/net_monitor_.c:87
+msgid "Network Monitoring"
+msgstr "Giám sát mạng"
+
+#: ../../standalone/net_monitor_.c:96
+msgid "Profile "
+msgstr "Lý lịch "
+
+#: ../../standalone/net_monitor_.c:99
+msgid "Statistics"
+msgstr "Thống kê"
+
+#: ../../standalone/net_monitor_.c:103
+msgid "Sending Speed:"
+msgstr "Tốc độ gửi:"
+
+#: ../../standalone/net_monitor_.c:104
+msgid "Receiving Speed:"
+msgstr "Tốc độ nhận:"
+
+#: ../../standalone/net_monitor_.c:106
+msgid "Connection Time: "
+msgstr "Thời gian kết nối:"
+
+#: ../../standalone/net_monitor_.c:113
+msgid "Logs"
+msgstr "Logs"
+
+#: ../../standalone/net_monitor_.c:147
+msgid "Wait please, testing your connection..."
+msgstr "Hãy chờ, đang thử kết nối của bạn ..."
+
+#: ../../standalone/net_monitor_.c:178 ../../standalone/net_monitor_.c:191
+msgid "Connecting to Internet "
+msgstr "Đang kết nối Internet "
+
+#: ../../standalone/net_monitor_.c:178 ../../standalone/net_monitor_.c:191
+msgid "Disconnecting from Internet "
+msgstr "Đang ngắt kết nối Internet "
+
+#: ../../standalone/net_monitor_.c:222
+msgid "Disconnection from Internet failed."
+msgstr "Không ngắt được kết nối Internet."
+
+#: ../../standalone/net_monitor_.c:223
+msgid "Disconnection from Internet complete."
+msgstr "Hoàn thành việc ngắt kết nối Internet."
+
+#: ../../standalone/net_monitor_.c:225
+msgid "Connection complete."
+msgstr "Hoàn thành kết nối."
+
+#: ../../standalone/net_monitor_.c:226
+msgid ""
+"Connection failed.\n"
+"Verify your configuration in the Mandrake Control Center."
+msgstr ""
+"Kết nối không được.\n"
+"Hãy kiểm tra cấu hình trong Trung Tâm Điều Khiển Mandrake."
+
+#: ../../standalone/net_monitor_.c:330
+msgid "Color configuration"
+msgstr "Cấu hình màu sắc"
+
+#: ../../standalone/net_monitor_.c:383 ../../standalone/net_monitor_.c:403
+msgid "sent: "
+msgstr "đã gửi: "
+
+#: ../../standalone/net_monitor_.c:390 ../../standalone/net_monitor_.c:407
+msgid "received: "
+msgstr "đã nhận: "
+
+#: ../../standalone/net_monitor_.c:397
+msgid "average"
+msgstr "trung bình"
+
+#: ../../standalone/net_monitor_.c:400
+msgid "Local measure"
+msgstr "Đo cục bộ"
+
+#: ../../standalone/net_monitor_.c:432
+msgid "transmitted"
+msgstr "đã truyền"
+
+#: ../../standalone/net_monitor_.c:433
+msgid "received"
+msgstr "đã nhận"
+
+#: ../../standalone/net_monitor_.c:453
+msgid ""
+"Warning, another internet connection has been detected, maybe using your "
+"network"
+msgstr ""
+"Cảnh báo, phát hiện thấy một kết nối Internet khác, có thể là đang dùng mạng "
+"của bạn"
+
+#: ../../standalone/net_monitor_.c:459
+#, c-format
+msgid "Connect %s"
+msgstr "Kết nối %s"
+
+#: ../../standalone/net_monitor_.c:459
+#, c-format
+msgid "Disconnect %s"
+msgstr "Ngắt kết nối %s"
+
+#: ../../standalone/printerdrake_.c:47
 msgid "Reading printer data ..."
 msgstr "Đang đọc dữ liệu máy in..."
 
-#: ../../standalone/scannerdrake_.c:41
+#: ../../standalone/scannerdrake_.c:39
 msgid "Detecting devices ..."
 msgstr "Đang phát hiện thiết bị..."
 
-#: ../../standalone/scannerdrake_.c:41
+#: ../../standalone/scannerdrake_.c:39
 msgid "Test ports"
 msgstr "Kiểm tra các cổng"
 
-#: ../../standalone/scannerdrake_.c:53 ../../standalone/scannerdrake_.c:68
-#: ../../standalone/scannerdrake_.c:81
+#: ../../standalone/scannerdrake_.c:51 ../../standalone/scannerdrake_.c:66
+#: ../../standalone/scannerdrake_.c:79
 #, c-format
 msgid "The %s is not supported by this version of Mandrake Linux."
 msgstr "%s không được hỗ trợ bởi phiên bản này của Mandrake Linux."
 
-#: ../../standalone/scannerdrake_.c:56
+#: ../../standalone/scannerdrake_.c:54
 #, c-format
 msgid "%s found on %s, configure it?"
 msgstr "Không thấy %s trên %s, thực hiện cấu hình nó không ?"
 
-#: ../../standalone/scannerdrake_.c:59
+#: ../../standalone/scannerdrake_.c:57
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr ""
 "%s không phải là cơ sở dữ liệu của máy quét, có cấu hình nó thủ công hay "
 "không?"
 
-#: ../../standalone/scannerdrake_.c:65
+#: ../../standalone/scannerdrake_.c:63
 msgid "Select a scanner"
 msgstr "Chọn máy quét"
 
-#: ../../standalone/scannerdrake_.c:93
+#: ../../standalone/scannerdrake_.c:91
 #, c-format
 msgid "This %s scanner is unsupported"
 msgstr "Máy quét %s này không được hỗ trợ"
 
-#: ../../standalone/scannerdrake_.c:107
+#: ../../standalone/scannerdrake_.c:105
 #, c-format
 msgid ""
 "Scannerdrake was not able to detect your %s scanner.\n"
@@ -14027,11 +14884,11 @@ msgstr ""
 "Scannerdrake đã không thể phát hiện máy quét %s của\n"
 "bạn. Hãy chọn thiết bị nơi mà máy quét được nối vào"
 
-#: ../../standalone/scannerdrake_.c:109
+#: ../../standalone/scannerdrake_.c:107
 msgid "choose device"
 msgstr "Chọn thiết bị"
 
-#: ../../standalone/scannerdrake_.c:115
+#: ../../standalone/scannerdrake_.c:113
 #, c-format
 msgid ""
 "This %s scanner must be configured by printerdrake.\n"
@@ -14042,7 +14899,7 @@ msgstr ""
 "Có thể chạy printerdrake trong mục Phần cứng tại Trung tâm Điều khiển "
 "Mandrake."
 
-#: ../../standalone/scannerdrake_.c:120
+#: ../../standalone/scannerdrake_.c:118
 #, c-format
 msgid ""
 "Your %s scanner has been configured.\n"
@@ -14062,6 +14919,10 @@ msgstr "Đã gỡ bỏ một số thiết bị trong loại phần cứng \"%s\"
 msgid "Some devices were added:\n"
 msgstr "Đã thêm một số thiết bị :\n"
 
+#: ../../standalone/service_harddrake_.c:64
+msgid "Hardware probing in progress"
+msgstr "Đang dò tìm phần cứng"
+
 #: ../../steps.pm_.c:14
 msgid "Choose your language"
 msgstr "Chọn ngôn ngữ"
@@ -14134,10 +14995,14 @@ msgstr "Cài đặt các cập nhật hệ thống"
 msgid "Exit install"
 msgstr "Thoát khỏi cài đặt"
 
-#: ../../ugtk.pm_.c:648
+#: ../../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-*"
 
+#: ../../ugtk2.pm_.c:711
+msgid "utopia 25"
+msgstr "utopia 25"
+
 #: ../../share/compssUsers:999
 msgid "Web/FTP"
 msgstr "Web/FTP"
@@ -14380,6 +15245,310 @@ msgstr "Đa phương tiện - Ghi CD"
 msgid "Scientific Workstation"
 msgstr "Trạm làm việc khoa học"
 
+#~ msgid "can not open /etc/inittab for reading: %s"
+#~ msgstr "không thể mở /etc/inittab để đọc: %s"
+
+#~ msgid "cpu number "
+#~ msgstr "Số CPU"
+
+#~ 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 ""
+#~ "Bây giờ bạn có thể tải phần mềm mã hóa về dùng.\n"
+#~ "\n"
+#~ "Cảnh báo:\n"
+#~ "\n"
+#~ "Vì các nhu cầu chung khác nhau để sử dụng phần mềm này dưới sự rằng buộc\n"
+#~ "pháp lý khác nhau, khách hàng và/hoặc người dùng đầu cuối sử dụng phần\n"
+#~ "mềm này nên khẳng địng rằng luật pháp nước mình cho phép tải xuống, lưu\n"
+#~ "giữ và/hoặc sử dụng.\n"
+#~ "\n"
+#~ "Hơn nữa, khách hàng và/hoặc người dùng đầu cuối sẽ phải biết là việc này\n"
+#~ "không vi phạm luật pháp.\n"
+#~ "\n"
+#~ "\n"
+#~ "Không một bộ phận nào của Mandrakesoft và/hoặc các nhà cung cấp chịu "
+#~ "trách\n"
+#~ "nhiện về các sự cố đặc biệt trực tiếp hay gián tiếp (bao gồm, nhưng "
+#~ "không\n"
+#~ "bị giới hạn cho các mất mát lợi ích, gián đoạn công việc, mất dữ liệu "
+#~ "thương mại\n"
+#~ "và các vấn đề tài chính khác, thậm chí các trách nhiệm và bồi thường phải "
+#~ "trả\n"
+#~ "theo quyết định của toà án) nảy sinh khi sử dụng, sở hữu, hay chỉ tải "
+#~ "xuống\n"
+#~ "các phần mềm này, do đó khách hàng và/hoặc người dùng đầu cuối có thể\n"
+#~ "tiến hành sau khi đăng ký vào phần giao kèo hiện thời.\n"
+#~ "\n"
+#~ "\n"
+#~ "Nếu muốn hỏi thêm về vấn đề này, hãy liên hệ với \n"
+#~ "Mandrakesoft, Inc.\n"
+#~ "2400 N. Lincoln Avenue Suite 243\n"
+#~ "Altadena California 91001\n"
+#~ "USA"
+
+#~ msgid "Proxy configuration"
+#~ msgstr "Cấu hình Proxy"
+
+#~ 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 ""
+#~ "Chào mừng tiện ích cấu hình proxy.\n"
+#~ "\n"
+#~ "Tại đây, bạn có thể thiết lập các proxy cho http và ftp\n"
+#~ "có hay không đòi hỏi đăng nhập và mật khẩu\n"
+
+#~ msgid ""
+#~ "Please fill in the http proxy informations\n"
+#~ "Leave it blank if you don't want an http proxy"
+#~ msgstr ""
+#~ "Hãy điền các thông tin về proxy cho http\n"
+#~ "Hãy để trống nếu không thiết lập proxy http"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "port"
+#~ msgstr "cổng"
+
+#~ msgid "Url should begin with 'http:'"
+#~ msgstr "URL nên bắt đầu bằng 'http:'"
+
+#~ msgid "The port part should be numeric"
+#~ msgstr " Bộ phận cổng nên là chữ số"
+
+#~ msgid ""
+#~ "Please fill in the ftp proxy informations\n"
+#~ "Leave it blank if you don't want an ftp proxy"
+#~ msgstr ""
+#~ "Hãy điền các thông tin cho proxy ftp\n"
+#~ "Hãy để trống nếu không thiết lập proxy ftp"
+
+#~ msgid ""
+#~ "Please enter proxy login and password, if any.\n"
+#~ "Leave it blank if you don't want login/passwd"
+#~ msgstr ""
+#~ "Hãy nhập vào phần đăng nhập và mật khẩu, nếu có.\n"
+#~ "Hãy để trống nếu không muốn đăng nhập/mật khẩu"
+
+#~ msgid "login"
+#~ msgstr "đăng nhập"
+
+#~ msgid "password"
+#~ msgstr "mật khẩu"
+
+#~ msgid "re-type password"
+#~ msgstr "gõ lại mật khẩu"
+
+#~ msgid "The passwords don't match. Try again!"
+#~ msgstr "Mật khẩu không đúng. Hãy gõ lại!"
+
+#~ msgid "Can't write file %s"
+#~ msgstr "Không thể ghi tập tin %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 ""
+#~ "Cảnh báo, phát hiện thấy một kết nối Internet khác, có lẽ đang dùng mạng "
+#~ "làm việc của bạn"
+
+#~ msgid "no help implemented yet.\n"
+#~ msgstr "vẫn chưa thực thi trợ giúp.\n"
+
+#~ msgid "Please click on a medium"
+#~ msgstr "Hãy nhấn chuột lên một phương tiện"
+
+#~ msgid "Removing LPRng..."
+#~ msgstr "Đang gỡ bỏ LPRng..."
+
+#~ msgid "Removing LPD..."
+#~ msgstr "Đang gỡ bỏ LPD..."
+
+#~ 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 ""
+#~ "Mô tả:\n"
+#~ "\n"
+#~ "  Drakbackup dùng để sao lưu hệ thống.\n"
+#~ "  Trong lúc cấu hình, bạn có thể chọn: \n"
+#~ "\t- Các tập tin hệ thống, \n"
+#~ "\t- Các tập tin người dùng, \n"
+#~ "\t- Các tập tin khác.\n"
+#~ "\thoặc là toàn bộ hệ thống... và thứ khác (phân vùng của Windows)\n"
+#~ "\n"
+#~ "  Drakbackup cho phép thực hiện sao lưu trên:\n"
+#~ "\t- Đĩa cứng.\n"
+#~ "\t- NFS.\n"
+#~ "\t- CDROM (CDRW), DVDROM (tự khởi động, cứu giải, tự cài đặt).\n"
+#~ "\t- FTP.\n"
+#~ "\t- Rsync.\n"
+#~ "\t- Webdav.\n"
+#~ "\t- Băng từ.\n"
+#~ "\n"
+#~ "  Drakbackup cho phép khôi phục hệ thống tới một\n"
+#~ "  thư mục người dùng đã chọn.\n"
+#~ "\n"
+#~ "  Theo mặc định, mọi sao lưu sẽ được cất trong thư mục\n"
+#~ "  /var/lib/drakbackup \n"
+#~ "\n"
+#~ "  Tập tin cấu hình:\n"
+#~ "\t/etc/drakconf/drakbackup/drakbakup.conf\n"
+#~ "\n"
+#~ "Bước khôi phục:\n"
+#~ "  \n"
+#~ "  Trong bước khôi phục, Drakbackup sẽ gỡ bỏ\n"
+#~ "  thư mục ban đầu và tiến hành xác minh là mọi\n"
+#~ "  tập tin sao lưu không bị hỏng. Khuyến cáo là bạn nên\n"
+#~ "  thực hiện sao lưu trước khi tiến hành khôi phục.\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 ""
+#~ "Phiên bản drakbug %s\n"
+#~ "Bản quyền (C) 2002 MandrakeSoft.\n"
+#~ "Đây là phần mềm tự do và có thể được phân phối lại dưới các điều khoản "
+#~ "của GNU GPL.\n"
+#~ "\n"
+#~ "Cách dùng: drakbug [OPTIONS] [PROGRAM_NAME]\n"
+#~ "\n"
+#~ "OPTIONS:\n"
+
+#~ msgid "  --help            - print this help message.\n"
+#~ msgstr "  --help            - để in ra thông điệp trợ giúp này.\n"
+
+#~ msgid "  --report          - program should be one of mandrake tools\n"
+#~ msgstr ""
+#~ "  --report          - chương trình nên là một trong số các công cụ của "
+#~ "mandrake\n"
+
+#~ msgid "  --incident        - program should be one of mandrake tools\n"
+#~ msgstr "  --incident        - chương trình nên là công cụ của Mandrake\n"
+
+#~ msgid "usage: drakfloppy\n"
+#~ msgstr "cách dùng: drakfloppy\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: harddrake [-h|--help] [--test]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Cách dùng: harddrake [-h|--help] [--test]\n"
+
+#~ msgid "usage: keyboarddrake [--expert] [keyboard]\n"
+#~ msgstr "cách dùng: keyboarddrake [--expert] [keyboard]\n"
+
+#~ msgid ""
+#~ "You have internal winmodem(s) :\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ " Go to http://www.linmodem.org for further information"
+#~ msgstr ""
+#~ "Bạn có win-modem lắp trong:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ " Đến http://www.linmodem.org để biết thêm thông tin"
+
+#~ msgid "Probing %s class\n"
+#~ msgstr "Đang thăm dò %s class\n"
+
+#~ msgid "detected on interface %s"
+#~ msgstr "dò tìm được trên giao diện %s"
+
+#~ msgid "Periodic Checks 2"
+#~ msgstr "Kiểm tra theo giai đoạn 2"
+
 #~ msgid "unable to backup lilo message"
 #~ msgstr "Không thể sao lưu thông điệp của LiLo"
author	Pablo Saratxaga <pablo@mandriva.com>	2002-12-06 19:58:27 +0000
committer	Pablo Saratxaga <pablo@mandriva.com>	2002-12-06 19:58:27 +0000
commit	56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2 (patch)
tree	a45ed0d08d1183f12467a51c92172ec3aa365f35 /perl-install/share
parent	9d2f74d9efc493079e7db4eb62eff738e52f5140 (diff)
download	drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.tar drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.tar.gz drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.tar.bz2 drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.tar.xz drakx-backup-do-not-use-56f9609cea6b3f178dd77e75e9f1b92fa21ed2b2.zip