From b4f641721706292a9f7d46783089a22b5db438f5 Mon Sep 17 00:00:00 2001
From: Pablo Saratxaga <pablo@mandriva.com>
Date: Tue, 23 Mar 2004 09:00:21 +0000
Subject: corrected "default:LTR" translations

---
 perl-install/share/po/et.po | 6724 +++++++++++++++++++++++--------------------
 1 file changed, 3548 insertions(+), 3176 deletions(-)

(limited to 'perl-install/share/po/et.po')

diff --git a/perl-install/share/po/et.po b/perl-install/share/po/et.po
index 3269affaf..f5356a573 100644
--- a/perl-install/share/po/et.po
+++ b/perl-install/share/po/et.po
@@ -1,13 +1,13 @@
 # Translation of DrakX.po to Estonian.
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # Riho Kurg <rx@linux.ee>, 1999-2003.
-# Marek Laane <bald@online.ee>, 2002-2003.
+# Marek Laane <bald@online.ee>, 2002-2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakX-et\n"
-"POT-Creation-Date: 2004-02-19 18:02+0100\n"
-"PO-Revision-Date: 2004-02-14 12:25+0200\n"
+"POT-Creation-Date: 2004-03-19 14:32+0100\n"
+"PO-Revision-Date: 2004-03-19 19:36+0200\n"
 "Last-Translator: Marek Laane <bald@online.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -106,7 +106,7 @@ msgstr ""
 "eemaldage kirjutuskaitse, ühendage seade uuesti ja käivitage taas Mandrake "
 "Move."
 
-#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1310
+#: ../move/move.pm:402 help.pm:418 install_steps_interactive.pm:1319
 #, c-format
 msgid "Reboot"
 msgstr "Taaskäivitus"
@@ -157,44 +157,51 @@ msgstr "Palun oodake, tuvastan ja seadistan seadmeid..."
 #: diskdrake/interactive.pm:505 diskdrake/interactive.pm:510
 #: diskdrake/smbnfs_gtk.pm:42 fsedit.pm:253 install_steps.pm:82
 #: install_steps_interactive.pm:40 interactive/http.pm:118
-#: interactive/http.pm:119 network/netconnect.pm:753 network/netconnect.pm:846
-#: network/netconnect.pm:849 network/netconnect.pm:894
-#: network/netconnect.pm:898 network/netconnect.pm:965
-#: network/netconnect.pm:1014 network/netconnect.pm:1019
-#: network/netconnect.pm:1034 printer/printerdrake.pm:213
+#: interactive/http.pm:119 network/netconnect.pm:929 network/netconnect.pm:932
+#: network/netconnect.pm:977 network/netconnect.pm:981
+#: network/netconnect.pm:1048 network/netconnect.pm:1098
+#: network/netconnect.pm:1103 network/netconnect.pm:1118
+#: network/netconnect.pm:1327 printer/printerdrake.pm:213
 #: printer/printerdrake.pm:220 printer/printerdrake.pm:245
 #: printer/printerdrake.pm:393 printer/printerdrake.pm:398
 #: printer/printerdrake.pm:411 printer/printerdrake.pm:421
-#: printer/printerdrake.pm:1052 printer/printerdrake.pm:1099
-#: printer/printerdrake.pm:1174 printer/printerdrake.pm:1178
-#: printer/printerdrake.pm:1349 printer/printerdrake.pm:1353
-#: printer/printerdrake.pm:1357 printer/printerdrake.pm:1457
-#: printer/printerdrake.pm:1461 printer/printerdrake.pm:1578
-#: printer/printerdrake.pm:1582 printer/printerdrake.pm:1668
-#: printer/printerdrake.pm:1755 printer/printerdrake.pm:2153
-#: printer/printerdrake.pm:2419 printer/printerdrake.pm:2425
-#: printer/printerdrake.pm:2842 printer/printerdrake.pm:2846
-#: printer/printerdrake.pm:2850 printer/printerdrake.pm:3241
-#: standalone/drakTermServ:399 standalone/drakTermServ:730
-#: standalone/drakTermServ:737 standalone/drakTermServ:931
-#: standalone/drakTermServ:1330 standalone/drakTermServ:1335
-#: standalone/drakTermServ:1342 standalone/drakTermServ:1353
-#: standalone/drakTermServ:1372 standalone/drakauth:36
-#: standalone/drakbackup:766 standalone/drakbackup:881
-#: standalone/drakbackup:1455 standalone/drakbackup:1488
-#: standalone/drakbackup:2004 standalone/drakbackup:2177
-#: standalone/drakbackup:2738 standalone/drakbackup:2805
-#: standalone/drakbackup:4826 standalone/drakboot:235 standalone/drakbug:267
-#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:569
-#: standalone/drakconnect:571 standalone/drakconnect:587
+#: printer/printerdrake.pm:1067 printer/printerdrake.pm:1114
+#: printer/printerdrake.pm:1151 printer/printerdrake.pm:1195
+#: printer/printerdrake.pm:1199 printer/printerdrake.pm:1213
+#: printer/printerdrake.pm:1303 printer/printerdrake.pm:1383
+#: printer/printerdrake.pm:1387 printer/printerdrake.pm:1391
+#: printer/printerdrake.pm:1440 printer/printerdrake.pm:1497
+#: printer/printerdrake.pm:1501 printer/printerdrake.pm:1515
+#: printer/printerdrake.pm:1625 printer/printerdrake.pm:1629
+#: printer/printerdrake.pm:1666 printer/printerdrake.pm:1731
+#: printer/printerdrake.pm:1749 printer/printerdrake.pm:1758
+#: printer/printerdrake.pm:1767 printer/printerdrake.pm:1778
+#: printer/printerdrake.pm:1840 printer/printerdrake.pm:2285
+#: printer/printerdrake.pm:2551 printer/printerdrake.pm:2557
+#: printer/printerdrake.pm:3010 printer/printerdrake.pm:3014
+#: printer/printerdrake.pm:3018 printer/printerdrake.pm:3421
+#: printer/printerdrake.pm:3664 printer/printerdrake.pm:3677
+#: printer/printerdrake.pm:3817 printer/printerdrake.pm:3909
+#: standalone/drakTermServ:415 standalone/drakTermServ:768
+#: standalone/drakTermServ:775 standalone/drakTermServ:970
+#: standalone/drakTermServ:1415 standalone/drakTermServ:1420
+#: standalone/drakTermServ:1427 standalone/drakTermServ:1438
+#: standalone/drakTermServ:1458 standalone/drakauth:36
+#: standalone/drakbackup:581 standalone/drakbackup:694
+#: standalone/drakbackup:1187 standalone/drakbackup:1220
+#: standalone/drakbackup:1735 standalone/drakbackup:1898
+#: standalone/drakbackup:2513 standalone/drakbackup:4286
+#: standalone/drakbackup:4509 standalone/drakboot:237 standalone/drakbug:267
+#: standalone/drakbug:286 standalone/drakbug:292 standalone/drakconnect:608
+#: standalone/drakconnect:611 standalone/drakconnect:632
 #: standalone/drakfloppy:301 standalone/drakfloppy:305
-#: standalone/drakfloppy:311 standalone/drakfont:208 standalone/drakfont:221
-#: standalone/drakfont:257 standalone/drakfont:597 standalone/draksplash:21
-#: standalone/logdrake:171 standalone/logdrake:415 standalone/logdrake:420
-#: standalone/scannerdrake:52 standalone/scannerdrake:194
-#: standalone/scannerdrake:253 standalone/scannerdrake:676
-#: standalone/scannerdrake:687 standalone/scannerdrake:826
-#: standalone/scannerdrake:837 standalone/scannerdrake:902 wizards.pm:95
+#: standalone/drakfloppy:311 standalone/drakfont:210 standalone/drakfont:223
+#: standalone/drakfont:259 standalone/drakfont:600 standalone/draksplash:21
+#: standalone/logdrake:170 standalone/logdrake:467 standalone/logdrake:472
+#: standalone/scannerdrake:58 standalone/scannerdrake:200
+#: standalone/scannerdrake:259 standalone/scannerdrake:683
+#: standalone/scannerdrake:694 standalone/scannerdrake:833
+#: standalone/scannerdrake:844 standalone/scannerdrake:914 wizards.pm:95
 #: wizards.pm:99 wizards.pm:121
 #, c-format
 msgid "Error"
@@ -446,15 +453,16 @@ msgstr ""
 msgid "Xpmac (installation display driver)"
 msgstr "Xpmac (paigalduse kuvadraiver)"
 
-#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:818
+#: Xconfig/main.pm:88 Xconfig/main.pm:89 Xconfig/monitor.pm:106 any.pm:823
 #, c-format
 msgid "Custom"
 msgstr "Isetehtud"
 
 #: Xconfig/main.pm:113 diskdrake/dav.pm:28 help.pm:14
-#: install_steps_interactive.pm:83 printer/printerdrake.pm:3871
-#: standalone/draksplash:114 standalone/harddrake2:187 standalone/logdrake:176
-#: standalone/scannerdrake:438
+#: install_steps_interactive.pm:83 printer/printerdrake.pm:608
+#: printer/printerdrake.pm:4076 standalone/draksplash:120
+#: standalone/harddrake2:188 standalone/logdrake:175
+#: standalone/scannerdrake:445
 #, c-format
 msgid "Quit"
 msgstr "Välju"
@@ -481,11 +489,11 @@ msgstr "Test"
 
 #: Xconfig/main.pm:131 diskdrake/dav.pm:67 diskdrake/interactive.pm:410
 #: diskdrake/removable.pm:25 diskdrake/smbnfs_gtk.pm:80
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:381 standalone/drakconnect:382
-#: standalone/drakconnect:540 standalone/drakfont:491 standalone/drakfont:551
-#: standalone/harddrake2:184
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:298
+#: standalone/drakconnect:404 standalone/drakconnect:405
+#: standalone/drakconnect:576 standalone/drakfont:494 standalone/drakfont:554
+#: standalone/harddrake2:185
 #, c-format
 msgid "Options"
 msgstr "Eelistused"
@@ -518,7 +526,7 @@ msgstr "Plug'n Play"
 msgid "Generic"
 msgstr "Tavaline"
 
-#: Xconfig/monitor.pm:109 standalone/drakconnect:520 standalone/harddrake2:68
+#: Xconfig/monitor.pm:109 standalone/drakconnect:556 standalone/harddrake2:68
 #: standalone/harddrake2:69
 #, c-format
 msgid "Vendor"
@@ -602,52 +610,51 @@ msgid "Graphics card: %s"
 msgstr "Graafikakaart: %s"
 
 #: Xconfig/resolution_and_depth.pm:289 interactive.pm:403
-#: interactive/gtk.pm:734 interactive/http.pm:103 interactive/http.pm:157
+#: interactive/gtk.pm:759 interactive/http.pm:103 interactive/http.pm:157
 #: interactive/newt.pm:308 interactive/newt.pm:410 interactive/stdio.pm:39
 #: interactive/stdio.pm:142 interactive/stdio.pm:143 interactive/stdio.pm:172
-#: standalone/drakbackup:4320 standalone/drakbackup:4352
-#: standalone/drakbackup:4445 standalone/drakbackup:4462
-#: standalone/drakbackup:4563 standalone/drakconnect:162
-#: standalone/drakconnect:734 standalone/drakconnect:821
-#: standalone/drakconnect:964 standalone/net_monitor:303 ugtk2.pm:412
-#: ugtk2.pm:509 ugtk2.pm:1047 ugtk2.pm:1070
+#: standalone/drakbackup:4045 standalone/drakbackup:4075
+#: standalone/drakbackup:4162 standalone/drakbackup:4175
+#: standalone/drakbackup:4247 standalone/drakconnect:165
+#: standalone/drakconnect:776 standalone/drakconnect:863
+#: standalone/drakconnect:962 standalone/drakups:194
+#: standalone/net_monitor:303 ugtk2.pm:413 ugtk2.pm:510 ugtk2.pm:1075
+#: ugtk2.pm:1098
 #, c-format
 msgid "Ok"
 msgstr "Olgu"
 
-#: Xconfig/resolution_and_depth.pm:289 any.pm:858 diskdrake/smbnfs_gtk.pm:81
+#: Xconfig/resolution_and_depth.pm:289 any.pm:863 diskdrake/smbnfs_gtk.pm:81
 #: help.pm:197 help.pm:457 install_steps_gtk.pm:488
-#: install_steps_interactive.pm:787 interactive.pm:404 interactive/gtk.pm:738
+#: install_steps_interactive.pm:788 interactive.pm:404 interactive/gtk.pm:763
 #: interactive/http.pm:104 interactive/http.pm:161 interactive/newt.pm:307
 #: interactive/newt.pm:414 interactive/stdio.pm:39 interactive/stdio.pm:142
-#: interactive/stdio.pm:176 printer/printerdrake.pm:2920
-#: standalone/drakautoinst:200 standalone/drakbackup:4284
-#: standalone/drakbackup:4311 standalone/drakbackup:4336
-#: standalone/drakbackup:4369 standalone/drakbackup:4395
-#: standalone/drakbackup:4421 standalone/drakbackup:4478
-#: standalone/drakbackup:4504 standalone/drakbackup:4534
-#: standalone/drakbackup:4558 standalone/drakconnect:161
-#: standalone/drakconnect:819 standalone/drakconnect:973
-#: standalone/drakfont:657 standalone/drakfont:734 standalone/logdrake:176
-#: standalone/net_monitor:299 ugtk2.pm:406 ugtk2.pm:507 ugtk2.pm:516
-#: ugtk2.pm:1047
+#: interactive/stdio.pm:176 printer/printerdrake.pm:3088
+#: standalone/drakautoinst:217 standalone/drakbackup:4009
+#: standalone/drakbackup:4035 standalone/drakbackup:4058
+#: standalone/drakbackup:4089 standalone/drakbackup:4113
+#: standalone/drakbackup:4137 standalone/drakbackup:4189
+#: standalone/drakbackup:4216 standalone/drakbackup:4241
+#: standalone/drakconnect:164 standalone/drakconnect:861
+#: standalone/drakconnect:961 standalone/drakfont:663 standalone/drakfont:740
+#: standalone/drakups:201 standalone/logdrake:175 standalone/net_monitor:299
+#: ugtk2.pm:407 ugtk2.pm:508 ugtk2.pm:517 ugtk2.pm:1075
 #, c-format
 msgid "Cancel"
 msgstr "Loobu"
 
 #: Xconfig/resolution_and_depth.pm:289 diskdrake/hd_gtk.pm:154
-#: install_steps_gtk.pm:267 install_steps_gtk.pm:667 interactive.pm:498
-#: interactive/gtk.pm:620 interactive/gtk.pm:622 standalone/drakTermServ:313
-#: standalone/drakbackup:4281 standalone/drakbackup:4308
-#: standalone/drakbackup:4333 standalone/drakbackup:4366
-#: standalone/drakbackup:4392 standalone/drakbackup:4418
-#: standalone/drakbackup:4459 standalone/drakbackup:4475
-#: standalone/drakbackup:4501 standalone/drakbackup:4530
-#: standalone/drakbackup:4555 standalone/drakbackup:4580
-#: standalone/drakbug:157 standalone/drakconnect:157
-#: standalone/drakconnect:227 standalone/drakfont:509 standalone/drakperm:134
-#: standalone/draksec:285 standalone/harddrake2:183 ugtk2.pm:1160
-#: ugtk2.pm:1161
+#: install_steps_gtk.pm:267 install_steps_gtk.pm:668 interactive.pm:498
+#: interactive/gtk.pm:623 interactive/gtk.pm:625 standalone/drakTermServ:316
+#: standalone/drakbackup:4010 standalone/drakbackup:4039
+#: standalone/drakbackup:4062 standalone/drakbackup:4093
+#: standalone/drakbackup:4117 standalone/drakbackup:4141
+#: standalone/drakbackup:4174 standalone/drakbackup:4193
+#: standalone/drakbackup:4220 standalone/drakbackup:4245
+#: standalone/drakbackup:4264 standalone/drakbug:157
+#: standalone/drakconnect:160 standalone/drakconnect:236
+#: standalone/drakfont:512 standalone/drakperm:134 standalone/draksec:296
+#: standalone/harddrake2:184 ugtk2.pm:1188 ugtk2.pm:1189
 #, c-format
 msgid "Help"
 msgstr "Abi"
@@ -746,7 +753,7 @@ msgstr "XFree86 server: %s\n"
 #: Xconfig/various.pm:42
 #, c-format
 msgid "XFree86 driver: %s\n"
-msgstr "XFree86 juhtprogramm: %s\n"
+msgstr "XFree86 draiver: %s\n"
 
 #: Xconfig/various.pm:71
 #, c-format
@@ -788,19 +795,20 @@ msgstr ""
 msgid "What norm is your TV using?"
 msgstr "Millist TV-standardit Te kasutate?"
 
-#: any.pm:98 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
-#: standalone/drakconnect:164 standalone/drakxtv:90 standalone/harddrake2:133
-#: standalone/service_harddrake:94
+#: any.pm:103 harddrake/sound.pm:150 interactive.pm:441 standalone/drakbug:259
+#: standalone/drakconnect:167 standalone/draksec:56 standalone/drakups:90
+#: standalone/drakxtv:90 standalone/harddrake2:134
+#: standalone/service_harddrake:98
 #, c-format
 msgid "Please wait"
 msgstr "Palun oodake"
 
-#: any.pm:98
+#: any.pm:103
 #, c-format
 msgid "Bootloader installation in progress"
 msgstr "Alglaaduri paigaldus..."
 
-#: any.pm:137
+#: any.pm:142
 #, c-format
 msgid ""
 "You decided to install the bootloader on a partition.\n"
@@ -815,269 +823,269 @@ msgstr ""
 "\n"
 "Milliselt kettalt Te alglaadimise teete?"
 
-#: any.pm:160 any.pm:192 help.pm:800
+#: any.pm:165 any.pm:197 help.pm:800
 #, c-format
 msgid "First sector of drive (MBR)"
 msgstr "Ketta algusesse (MBR)"
 
-#: any.pm:161
+#: any.pm:166
 #, c-format
 msgid "First sector of the root partition"
 msgstr "Juurpartitsiooni algusesse"
 
-#: any.pm:163
+#: any.pm:168
 #, c-format
 msgid "On Floppy"
-msgstr "Flopil"
+msgstr "Disketil"
 
-#: any.pm:165 help.pm:768 help.pm:800 printer/printerdrake.pm:3238
+#: any.pm:170 help.pm:768 help.pm:800 printer/printerdrake.pm:3418
 #, c-format
 msgid "Skip"
 msgstr "Jäta vahele"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "SILO Installation"
 msgstr "SILO paigaldamine"
 
-#: any.pm:170
+#: any.pm:175
 #, c-format
 msgid "LILO/grub Installation"
 msgstr "LiLo/grub paigaldamine"
 
-#: any.pm:171
+#: any.pm:176
 #, c-format
 msgid "Where do you want to install the bootloader?"
 msgstr "Kuhu soovite alglaaduri paigaldada?"
 
-#: any.pm:192
+#: any.pm:197
 #, c-format
 msgid "First sector of boot partition"
 msgstr "Partitsiooni algusesse"
 
-#: any.pm:204 any.pm:239
-#, c-format
-msgid "Bootloader main options"
-msgstr "Alglaaduri põhiseadistused"
-
-#: any.pm:205
+#: any.pm:208
 #, c-format
 msgid "Boot Style Configuration"
 msgstr "Alglaaduri stiil"
 
-#: any.pm:209
+#: any.pm:210 any.pm:244
+#, c-format
+msgid "Bootloader main options"
+msgstr "Alglaaduri põhiseadistused"
+
+#: any.pm:214
 #, c-format
 msgid "Give the ram size in MB"
 msgstr "Anna mälu suurus megabaitides"
 
-#: any.pm:211
+#: any.pm:216
 #, c-format
 msgid ""
 "Option ``Restrict command line options'' is of no use without a password"
 msgstr "Võti ``Piiratakse käsurea võtmeid'' ei ole kasutatav ilma salasõnata"
 
-#: any.pm:212 any.pm:519 install_steps_interactive.pm:1158
+#: any.pm:217 any.pm:524 install_steps_interactive.pm:1163
 #, c-format
 msgid "The passwords do not match"
 msgstr "Salasõnad ei klapi"
 
-#: any.pm:212 any.pm:519 diskdrake/interactive.pm:1255
-#: install_steps_interactive.pm:1158
+#: any.pm:217 any.pm:524 diskdrake/interactive.pm:1255
+#: install_steps_interactive.pm:1163
 #, c-format
 msgid "Please try again"
 msgstr "Palun proovige veel"
 
-#: any.pm:217 any.pm:242 help.pm:768
+#: any.pm:222 any.pm:247 help.pm:768
 #, c-format
 msgid "Bootloader to use"
 msgstr "Eelistatav alglaadur"
 
-#: any.pm:219
+#: any.pm:224
 #, c-format
 msgid "Bootloader installation"
 msgstr "Alglaaduri paigaldus"
 
-#: any.pm:221 any.pm:244 help.pm:768
+#: any.pm:226 any.pm:249 help.pm:768
 #, c-format
 msgid "Boot device"
 msgstr "Alglaadimisseade"
 
-#: any.pm:223
+#: any.pm:228
 #, c-format
 msgid "Delay before booting default image"
 msgstr "Ooteaeg alglaadimisel"
 
-#: any.pm:224 help.pm:768
+#: any.pm:229 help.pm:768
 #, c-format
 msgid "Enable ACPI"
 msgstr "ACPI lubamine"
 
-#: any.pm:225
+#: any.pm:230
 #, c-format
 msgid "Force No APIC"
 msgstr "APIC sunnitakse mitte toimima"
 
-#: any.pm:227 any.pm:546 diskdrake/smbnfs_gtk.pm:180
-#: install_steps_interactive.pm:1163 network/netconnect.pm:491
-#: printer/printerdrake.pm:1340 printer/printerdrake.pm:1454
-#: standalone/drakbackup:1990 standalone/drakbackup:3875
-#: standalone/drakconnect:916 standalone/drakconnect:944
+#: any.pm:232 any.pm:551 diskdrake/smbnfs_gtk.pm:180
+#: install_steps_interactive.pm:1168 network/netconnect.pm:562
+#: printer/printerdrake.pm:1374 printer/printerdrake.pm:1494
+#: standalone/drakbackup:1717 standalone/drakbackup:3592
+#: standalone/drakups:278
 #, c-format
 msgid "Password"
 msgstr "Salasõna"
 
-#: any.pm:228 any.pm:547 install_steps_interactive.pm:1164
+#: any.pm:233 any.pm:552 install_steps_interactive.pm:1169
 #, c-format
 msgid "Password (again)"
 msgstr "Salasõna (uuesti)"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "Restrict command line options"
 msgstr "Piiratakse käsurea võtmeid"
 
-#: any.pm:229
+#: any.pm:234
 #, c-format
 msgid "restrict"
 msgstr "piiratud"
 
-#: any.pm:231
+#: any.pm:236
 #, c-format
 msgid "Clean /tmp at each boot"
 msgstr "Puhastatakse /tmp igal laadimisel"
 
-#: any.pm:232
+#: any.pm:237
 #, c-format
 msgid "Precise RAM size if needed (found %d MB)"
 msgstr "Kui vaja, täpsustage RAM suurust (leitud %d MB)"
 
-#: any.pm:234
+#: any.pm:239
 #, c-format
 msgid "Enable multiple profiles"
 msgstr "Mitme profiili lubamine"
 
-#: any.pm:243
+#: any.pm:248
 #, c-format
 msgid "Init Message"
 msgstr "Initsialiseerimisteade"
 
-#: any.pm:245
+#: any.pm:250
 #, c-format
 msgid "Open Firmware Delay"
 msgstr "Open Firmware viivitus"
 
-#: any.pm:246
+#: any.pm:251
 #, c-format
 msgid "Kernel Boot Timeout"
 msgstr "Ajapiirang kerneli laadimisel"
 
-#: any.pm:247
+#: any.pm:252
 #, c-format
 msgid "Enable CD Boot?"
 msgstr "CD-lt laadimine lubatud?"
 
-#: any.pm:248
+#: any.pm:253
 #, c-format
 msgid "Enable OF Boot?"
 msgstr "OF laadimine lubatud?"
 
-#: any.pm:249
+#: any.pm:254
 #, c-format
 msgid "Default OS?"
 msgstr "Vaikimisi OS?"
 
-#: any.pm:290
+#: any.pm:295
 #, c-format
 msgid "Image"
 msgstr "Laadefail"
 
-#: any.pm:291 any.pm:300
+#: any.pm:296 any.pm:305
 #, c-format
 msgid "Root"
 msgstr "Juur"
 
-#: any.pm:292 any.pm:313
+#: any.pm:297 any.pm:318
 #, c-format
 msgid "Append"
 msgstr "Lisand"
 
-#: any.pm:294
+#: any.pm:299
 #, c-format
 msgid "Video mode"
 msgstr "Graafikamood"
 
-#: any.pm:296
+#: any.pm:301
 #, c-format
 msgid "Initrd"
 msgstr "Initrd"
 
-#: any.pm:305 any.pm:310 any.pm:312
+#: any.pm:310 any.pm:315 any.pm:317
 #, c-format
 msgid "Label"
 msgstr "Pealdis"
 
-#: any.pm:307 any.pm:317 harddrake/v4l.pm:236 standalone/drakfloppy:88
+#: any.pm:312 any.pm:322 harddrake/v4l.pm:236 standalone/drakfloppy:88
 #: standalone/drakfloppy:94
 #, c-format
 msgid "Default"
 msgstr "Vaikimisi"
 
-#: any.pm:314
+#: any.pm:319
 #, c-format
 msgid "Initrd-size"
 msgstr "Initrd suurus"
 
-#: any.pm:316
+#: any.pm:321
 #, c-format
 msgid "NoVideo"
 msgstr "NoVideo"
 
-#: any.pm:327
+#: any.pm:332
 #, c-format
 msgid "Empty label not allowed"
 msgstr "Tühi kirjetähis ei ole lubatud"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a kernel image"
 msgstr "Teil peab olema kerneli laadepilt"
 
-#: any.pm:328
+#: any.pm:333
 #, c-format
 msgid "You must specify a root partition"
 msgstr "Teil peab olema juurpartitsioon"
 
-#: any.pm:329
+#: any.pm:334
 #, c-format
 msgid "This label is already used"
 msgstr "Selline pealdis on juba kasutusel"
 
-#: any.pm:342
+#: any.pm:347
 #, c-format
 msgid "Which type of entry do you want to add?"
 msgstr "Millisele sektorile soovite seda tõsta?"
 
-#: any.pm:343 standalone/drakbackup:1904
+#: any.pm:348
 #, c-format
 msgid "Linux"
 msgstr "Linux"
 
-#: any.pm:343
+#: any.pm:348
 #, c-format
 msgid "Other OS (SunOS...)"
 msgstr "Muu OS (SunOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (MacOS...)"
 msgstr "Muu OS (MacOS...)"
 
-#: any.pm:344
+#: any.pm:349
 #, c-format
 msgid "Other OS (windows...)"
 msgstr "Muu OS (windows...)"
 
-#: any.pm:372
+#: any.pm:377
 #, c-format
 msgid ""
 "Here are the entries on your boot menu so far.\n"
@@ -1086,52 +1094,52 @@ msgstr ""
 "Praegu on kasutusel sellised kirjed.\n"
 "Te võite neid lisada ning olemasolevaid muuta."
 
-#: any.pm:504
+#: any.pm:509
 #, c-format
 msgid "access to X programs"
 msgstr "ligipääs X-i rakendustele"
 
-#: any.pm:505
+#: any.pm:510
 #, c-format
 msgid "access to rpm tools"
 msgstr "ligipääs rpm vahenditele"
 
-#: any.pm:506
+#: any.pm:511
 #, c-format
 msgid "allow \"su\""
 msgstr "\"su\" lubamine"
 
-#: any.pm:507
+#: any.pm:512
 #, c-format
 msgid "access to administrative files"
 msgstr "ligipääs administreerimisfailidele"
 
-#: any.pm:508
+#: any.pm:513
 #, c-format
 msgid "access to network tools"
 msgstr "ligipääs võrgutöövahenditele"
 
-#: any.pm:509
+#: any.pm:514
 #, c-format
 msgid "access to compilation tools"
 msgstr "ligipääs kompileerimisvahenditele"
 
-#: any.pm:515
+#: any.pm:520
 #, c-format
 msgid "(already added %s)"
 msgstr "(juba lisatud %s)"
 
-#: any.pm:520
+#: any.pm:525
 #, c-format
 msgid "This password is too simple"
 msgstr "Salasõna on liiga lihtne"
 
-#: any.pm:521
+#: any.pm:526
 #, c-format
 msgid "Please give a user name"
 msgstr "Palun andke kasutajanimi"
 
-#: any.pm:522
+#: any.pm:527
 #, c-format
 msgid ""
 "The user name must contain only lower cased letters, numbers, `-' and `_'"
@@ -1139,22 +1147,22 @@ msgstr ""
 "Kasutajanimi tohib sisaldada ainult väikesi tähti, numbreid ning märke '-' "
 "ja '_'"
 
-#: any.pm:523
+#: any.pm:528
 #, c-format
 msgid "The user name is too long"
 msgstr "See kasutajanimi on liiga pikk"
 
-#: any.pm:524
+#: any.pm:529
 #, c-format
 msgid "This user name has already been added"
 msgstr "See kasutajanimi on juba lisatud"
 
-#: any.pm:528
+#: any.pm:533
 #, c-format
 msgid "Add user"
 msgstr "Lisa kasutaja"
 
-#: any.pm:529
+#: any.pm:534
 #, c-format
 msgid ""
 "Enter a user\n"
@@ -1163,125 +1171,125 @@ msgstr ""
 "Sisesta kasutaja\n"
 "%s"
 
-#: any.pm:532 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
+#: any.pm:537 diskdrake/dav.pm:68 diskdrake/hd_gtk.pm:158
 #: diskdrake/removable.pm:27 diskdrake/smbnfs_gtk.pm:82 help.pm:544
 #: interactive/http.pm:152 printer/printerdrake.pm:165
-#: printer/printerdrake.pm:352 printer/printerdrake.pm:3871
-#: standalone/drakbackup:3094 standalone/scannerdrake:629
-#: standalone/scannerdrake:779
+#: printer/printerdrake.pm:352 printer/printerdrake.pm:4076
+#: standalone/drakbackup:2802 standalone/scannerdrake:636
+#: standalone/scannerdrake:786
 #, c-format
 msgid "Done"
 msgstr "Tehtud"
 
-#: any.pm:533 help.pm:52
+#: any.pm:538 help.pm:52
 #, c-format
 msgid "Accept user"
 msgstr "Kasutaja õige"
 
-#: any.pm:544
+#: any.pm:549
 #, c-format
 msgid "Real name"
 msgstr "Pärisnimi"
 
-#: any.pm:545 help.pm:52 printer/printerdrake.pm:1339
-#: printer/printerdrake.pm:1453
+#: any.pm:550 help.pm:52 printer/printerdrake.pm:1373
+#: printer/printerdrake.pm:1493
 #, c-format
 msgid "User name"
 msgstr "Kasutajanimi"
 
-#: any.pm:548
+#: any.pm:553
 #, c-format
 msgid "Shell"
 msgstr "Käsurida"
 
-#: any.pm:550
+#: any.pm:555
 #, c-format
 msgid "Icon"
 msgstr "Ikoon"
 
-#: any.pm:591 security/l10n.pm:14
+#: any.pm:596 security/l10n.pm:14
 #, c-format
 msgid "Autologin"
 msgstr "Vaikimisi sisenemine"
 
-#: any.pm:592
+#: any.pm:597
 #, c-format
 msgid "I can set up your computer to automatically log on one user."
 msgstr "Teie arvutit saab seada vaikimisi kasutaja sisenemisele."
 
-#: any.pm:593 help.pm:52
+#: any.pm:598 help.pm:52
 #, c-format
 msgid "Do you want to use this feature?"
 msgstr "Kas soovite kasutada seda omadust?"
 
-#: any.pm:594
+#: any.pm:599
 #, c-format
 msgid "Choose the default user:"
 msgstr "Valige vaikimisi kasutaja:"
 
-#: any.pm:595
+#: any.pm:600
 #, c-format
 msgid "Choose the window manager to run:"
 msgstr "Valige palun käivitatav aknahaldur:"
 
-#: any.pm:607
+#: any.pm:612
 #, c-format
 msgid "Please choose a language to use."
 msgstr "Valige palun kasutatav keel."
 
-#: any.pm:628
+#: any.pm:633
 #, c-format
 msgid ""
-"Mandrake Linux can support multiple languages. Select\n"
+"Mandrakelinux can support multiple languages. Select\n"
 "the languages you would like to install. They will be available\n"
 "when your installation is complete and you restart your system."
 msgstr ""
-"Mandrake Linux toetab paljusid keeli. Valige keeled, mida\n"
+"Mandrakelinux 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:646 help.pm:660
+#: any.pm:651 help.pm:660
 #, c-format
 msgid "Use Unicode by default"
 msgstr "Unicode kasutamine vaikimisi"
 
-#: any.pm:647 help.pm:660
+#: any.pm:652 help.pm:660
 #, c-format
 msgid "All languages"
 msgstr "Kõik keeled"
 
-#: any.pm:683 help.pm:581 help.pm:991 install_steps_interactive.pm:907
+#: any.pm:688 help.pm:581 help.pm:991 install_steps_interactive.pm:908
 #, c-format
 msgid "Country / Region"
 msgstr "Maa / Piirkond"
 
-#: any.pm:684
+#: any.pm:689
 #, c-format
 msgid "Please choose your country."
 msgstr "Palun valige oma maa."
 
-#: any.pm:686
+#: any.pm:691
 #, c-format
 msgid "Here is the full list of available countries"
 msgstr "See on saadaolevate maade täielik nimekiri"
 
-#: any.pm:687 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621
+#: any.pm:692 diskdrake/interactive.pm:292 help.pm:544 help.pm:581 help.pm:621
 #: help.pm:991 install_steps_interactive.pm:114
 #, c-format
 msgid "More"
 msgstr "Veel..."
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "No sharing"
 msgstr "Jagamiseta"
 
-#: any.pm:818
+#: any.pm:823
 #, c-format
 msgid "Allow all users"
 msgstr "Lubatud kõigile kasutajatele"
 
-#: any.pm:822
+#: any.pm:827
 #, c-format
 msgid ""
 "Would you like to allow users to share some of their directories?\n"
@@ -1296,23 +1304,23 @@ msgstr ""
 "\n"
 "\"Isetehtud\" lubab määrata seda kasutajate kaupa.\n"
 
-#: any.pm:838
+#: any.pm:843
 #, c-format
 msgid ""
 "You can export using NFS or Samba. Please select which you'd like to use."
 msgstr "Eksportida saab NFS või Samba abil. Palun valige, kumba kasutada."
 
-#: any.pm:846
+#: any.pm:851
 #, c-format
 msgid "The package %s is going to be removed."
 msgstr "Pakett %s eemaldatakse."
 
-#: any.pm:858
+#: any.pm:863
 #, c-format
 msgid "Launch userdrake"
 msgstr "Userdrake käivitamine"
 
-#: any.pm:860
+#: any.pm:865
 #, c-format
 msgid ""
 "The per-user sharing uses the group \"fileshare\". \n"
@@ -1424,7 +1432,7 @@ msgstr "Üldlevi kasutamine on ilma NIS domeenita võimatu"
 
 # NOTE: this message will be displayed at boot time; that is# only the ascii charset will be available on most machines# so use only 7bit for this message (and do transliteration or# leave it in English, as it is the best for your language)##. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
 #. -PO: these messages will be displayed at boot time in the BIOS, use only ASCII (7bit)
-#: bootloader.pm:542
+#: bootloader.pm:533
 #, c-format
 msgid ""
 "Welcome to the operating system chooser!\n"
@@ -1439,59 +1447,61 @@ msgstr ""
 "ehk oodake, kuni laetakse vaikimisi valitu.\n"
 "\n"
 
-#: bootloader.pm:674
+#: bootloader.pm:665
 #, c-format
 msgid "SILO"
 msgstr "SILO"
 
-#: bootloader.pm:676 help.pm:768
+#: bootloader.pm:668 help.pm:768
 #, c-format
 msgid "LILO with graphical menu"
 msgstr "LiLo graafikaresiimis"
 
-#: bootloader.pm:677 help.pm:768
+#: bootloader.pm:670 help.pm:768
 #, c-format
 msgid "LILO with text menu"
 msgstr "LiLo tekstiresiimis"
 
-#: bootloader.pm:679
+#: bootloader.pm:672
 #, c-format
 msgid "Grub"
 msgstr "Grub"
 
-#: bootloader.pm:681
+#: bootloader.pm:674
 #, c-format
 msgid "Yaboot"
 msgstr "Yaboot"
 
-#: bootloader.pm:1150
+#: bootloader.pm:1147
 #, c-format
 msgid "not enough room in /boot"
 msgstr "/boot on liiga täis"
 
-#: bootloader.pm:1178
+#: bootloader.pm:1175
 #, c-format
 msgid "You can't install the bootloader on a %s partition\n"
 msgstr "Alglaadurit ei ole võimalik paigaldada partitsioonile %s\n"
 
-#: bootloader.pm:1218
+#: bootloader.pm:1219
 #, c-format
 msgid ""
 "Your bootloader configuration must be updated because partition has been "
 "renumbered"
-msgstr ""
+msgstr "Alglaaduri seadistust tuleb uuendada, sest partitsioon on ümber seatud"
 
-#: bootloader.pm:1225
+#: bootloader.pm:1226
 #, c-format
 msgid ""
 "The bootloader can't be installed correctly. You have to boot rescue and "
 "choose \"%s\""
 msgstr ""
+"Alglaadurit ei ole võimalik korrektselt paigaldada. Teil tuleb ette võtta "
+"alglaadimine päästeresiimis (rescue) ja valida \"%s\""
 
-#: bootloader.pm:1226
-#, fuzzy, c-format
+#: bootloader.pm:1227
+#, c-format
 msgid "Re-install Boot Loader"
-msgstr "Alglaaduri seadistused"
+msgstr "Alglaaduri taaspaigaldus"
 
 #: common.pm:125
 #, c-format
@@ -1528,90 +1538,91 @@ msgstr "1 minut"
 msgid "%d seconds"
 msgstr "%d sekundit"
 
-#: common.pm:196
+#: common.pm:197
 #, c-format
 msgid "Can't make screenshots before partitioning"
 msgstr "Hetktõmmiseid ei saa teha enne partitsioneerimist"
 
-#: common.pm:203
+#: common.pm:204
 #, c-format
 msgid "Screenshots will be available after install in %s"
 msgstr "Hetktõmmised asuvad pärast paigaldust asukohas %s"
 
-#: common.pm:268
+#: common.pm:269
 #, c-format
 msgid "kdesu missing"
 msgstr "kdesu puudub"
 
-#: common.pm:271
+#: common.pm:272
 #, c-format
 msgid "consolehelper missing"
 msgstr "consolehelper puudub"
 
-#: crypto.pm:14 crypto.pm:28 lang.pm:231 network/adsl_consts.pm:37
-#: network/adsl_consts.pm:48 network/adsl_consts.pm:58
-#: network/adsl_consts.pm:68 network/adsl_consts.pm:79
-#: network/adsl_consts.pm:90 network/adsl_consts.pm:100
-#: network/adsl_consts.pm:110 network/netconnect.pm:46
+#: crypto.pm:14 crypto.pm:28 lang.pm:236 network/adsl_consts.pm:44
+#: network/adsl_consts.pm:55 network/adsl_consts.pm:65
+#: network/adsl_consts.pm:75 network/adsl_consts.pm:86
+#: network/adsl_consts.pm:97 network/adsl_consts.pm:107
+#: network/adsl_consts.pm:117 network/adsl_consts.pm:264
+#: network/netconnect.pm:46
 #, c-format
 msgid "France"
 msgstr "Prantsusmaa"
 
-#: crypto.pm:15 lang.pm:207
+#: crypto.pm:15 lang.pm:212
 #, c-format
 msgid "Costa Rica"
 msgstr "Costa Rica"
 
-#: crypto.pm:16 crypto.pm:29 lang.pm:179 network/adsl_consts.pm:20
-#: network/adsl_consts.pm:30 network/netconnect.pm:49
+#: crypto.pm:16 crypto.pm:29 lang.pm:184 network/adsl_consts.pm:26
+#: network/adsl_consts.pm:36 network/netconnect.pm:49
 #, c-format
 msgid "Belgium"
 msgstr "Belgia"
 
-#: crypto.pm:17 crypto.pm:30 lang.pm:212
+#: crypto.pm:17 crypto.pm:30 lang.pm:217
 #, c-format
 msgid "Czech Republic"
 msgstr "Tšehhi"
 
-#: crypto.pm:18 crypto.pm:31 lang.pm:213 network/adsl_consts.pm:126
-#: network/adsl_consts.pm:134
+#: crypto.pm:18 crypto.pm:31 lang.pm:218 network/adsl_consts.pm:134
+#: network/adsl_consts.pm:142
 #, c-format
 msgid "Germany"
 msgstr "Saksamaa"
 
-#: crypto.pm:19 crypto.pm:32 lang.pm:244
+#: crypto.pm:19 crypto.pm:32 lang.pm:249
 #, c-format
 msgid "Greece"
 msgstr "Kreeka"
 
-#: crypto.pm:20 crypto.pm:33 lang.pm:317
+#: crypto.pm:20 crypto.pm:33 lang.pm:322
 #, c-format
 msgid "Norway"
 msgstr "Norra"
 
-#: crypto.pm:21 crypto.pm:34 lang.pm:346 network/adsl_consts.pm:230
+#: crypto.pm:21 crypto.pm:34 lang.pm:351 network/adsl_consts.pm:240
 #, c-format
 msgid "Sweden"
 msgstr "Rootsi"
 
-#: crypto.pm:22 crypto.pm:36 lang.pm:316 network/adsl_consts.pm:170
+#: crypto.pm:22 crypto.pm:36 lang.pm:321 network/adsl_consts.pm:178
 #: network/netconnect.pm:47
 #, c-format
 msgid "Netherlands"
 msgstr "Holland"
 
-#: crypto.pm:23 crypto.pm:37 lang.pm:264 network/adsl_consts.pm:150
-#: network/adsl_consts.pm:160 network/netconnect.pm:48 standalone/drakxtv:48
+#: crypto.pm:23 crypto.pm:37 lang.pm:269 network/adsl_consts.pm:158
+#: network/adsl_consts.pm:168 network/netconnect.pm:48 standalone/drakxtv:48
 #, c-format
 msgid "Italy"
 msgstr "Itaalia"
 
-#: crypto.pm:24 crypto.pm:38 lang.pm:172
+#: crypto.pm:24 crypto.pm:38 lang.pm:177
 #, c-format
 msgid "Austria"
 msgstr "Austria"
 
-#: crypto.pm:35 crypto.pm:61 lang.pm:380 network/netconnect.pm:50
+#: crypto.pm:35 crypto.pm:65 lang.pm:385 network/netconnect.pm:50
 #, c-format
 msgid "United States"
 msgstr "USA"
@@ -1696,7 +1707,7 @@ msgstr "Palun tehke oma andmetest kõigepealt varukoopia"
 #: diskdrake/hd_gtk.pm:99
 #, c-format
 msgid ""
-"If you plan to use aboot, be carefull to leave a free space (2048 sectors is "
+"If you plan to use aboot, be careful to leave a free space (2048 sectors is "
 "enough)\n"
 "at the beginning of the disk"
 msgstr ""
@@ -1731,6 +1742,7 @@ msgid "Please click on a partition"
 msgstr "Palun valige partitsioon"
 
 #: diskdrake/hd_gtk.pm:209 diskdrake/smbnfs_gtk.pm:63 install_steps_gtk.pm:475
+#: standalone/drakbackup:3040 standalone/drakbackup:3102
 #, c-format
 msgid "Details"
 msgstr "Üksikasjad"
@@ -1771,7 +1783,7 @@ msgid "Windows"
 msgstr "Windows"
 
 #: diskdrake/hd_gtk.pm:327 install_steps_gtk.pm:327 mouse.pm:167
-#: services.pm:164 standalone/drakbackup:1947 standalone/drakperm:250
+#: services.pm:164 standalone/drakbackup:1673 standalone/drakperm:250
 #, c-format
 msgid "Other"
 msgstr "Muu"
@@ -1892,7 +1904,7 @@ msgstr "Kõik primaarsed partitsioonid on kasutusel"
 
 #: diskdrake/interactive.pm:330
 #, c-format
-msgid "I can't add any more partition"
+msgid "I can't add any more partitions"
 msgstr "Partitsioone ei saa enam lisada"
 
 #: diskdrake/interactive.pm:331
@@ -1943,13 +1955,19 @@ msgstr ""
 "Tabeli varukoopia ei ole sama suurusega\n"
 "Kas ikkagi jätkata?"
 
-#: diskdrake/interactive.pm:378 harddrake/sound.pm:222 keyboard.pm:311
-#: network/netconnect.pm:353 printer/printerdrake.pm:2159
-#: printer/printerdrake.pm:3246 printer/printerdrake.pm:3365
-#: printer/printerdrake.pm:4338 standalone/drakTermServ:1040
-#: standalone/drakTermServ:1715 standalone/drakbackup:765
-#: standalone/drakbackup:865 standalone/drakboot:137 standalone/drakclock:200
-#: standalone/drakconnect:856 standalone/drakfloppy:295
+#: diskdrake/interactive.pm:378 harddrake/sound.pm:226 keyboard.pm:314
+#: network/netconnect.pm:438 network/netconnect.pm:457
+#: network/netconnect.pm:641 printer/printerdrake.pm:936
+#: printer/printerdrake.pm:1891 printer/printerdrake.pm:1953
+#: printer/printerdrake.pm:1987 printer/printerdrake.pm:2291
+#: printer/printerdrake.pm:3149 printer/printerdrake.pm:3426
+#: printer/printerdrake.pm:3545 printer/printerdrake.pm:4543
+#: standalone/drakTermServ:351 standalone/drakTermServ:1082
+#: standalone/drakTermServ:1138 standalone/drakTermServ:1801
+#: standalone/drakbackup:580 standalone/drakbackup:678 standalone/drakboot:138
+#: standalone/drakclock:204 standalone/drakconnect:898
+#: standalone/drakfloppy:295 standalone/drakups:27 standalone/scannerdrake:50
+#: standalone/scannerdrake:908
 #, c-format
 msgid "Warning"
 msgstr "Hoiatus"
@@ -1960,7 +1978,7 @@ msgid ""
 "Insert a floppy in drive\n"
 "All data on this floppy will be lost"
 msgstr ""
-"Pange tühi flopi masinasse\n"
+"Pange tühi diskett masinasse\n"
 "Kõik andmed sellel hävivad"
 
 #: diskdrake/interactive.pm:390
@@ -2510,8 +2528,8 @@ msgstr "See krüptovõti on liiga lihtne (peaks olema vähemalt %d märki)"
 msgid "The encryption keys do not match"
 msgstr "Krüptovõtmed ei klapi"
 
-#: diskdrake/interactive.pm:1258 network/netconnect.pm:889
-#: standalone/drakconnect:370
+#: diskdrake/interactive.pm:1258 network/netconnect.pm:972
+#: standalone/drakconnect:393
 #, c-format
 msgid "Encryption key"
 msgstr "Krüptovõti"
@@ -2554,7 +2572,7 @@ msgstr ""
 "Palun sisestage sellele masinale ligipääsuks oma kasutajanimi, parool ja "
 "domeeni nimi."
 
-#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3874
+#: diskdrake/smbnfs_gtk.pm:179 standalone/drakbackup:3591
 #, c-format
 msgid "Username"
 msgstr "Kasutajanimi"
@@ -2584,17 +2602,17 @@ msgstr "Pakett %s tuleks kindlasti paigaldada. Kas soovite seda teha?"
 msgid "Mandatory package %s is missing"
 msgstr "Puudub kohustuslik pakett %s"
 
-#: do_pkgs.pm:136
+#: do_pkgs.pm:143
 #, c-format
 msgid "Installing packages..."
 msgstr "Pakettide paigaldamine..."
 
-#: do_pkgs.pm:210
+#: do_pkgs.pm:217
 #, c-format
 msgid "Removing packages..."
 msgstr "Pakettide eemaldamine..."
 
-#: fs.pm:399
+#: fs.pm:409
 #, c-format
 msgid ""
 "Do not update inode access times on this file system\n"
@@ -2603,7 +2621,7 @@ msgstr ""
 "Inode juurdepääsu kordi sellel failisüsteemil ei värskendada\n"
 "(nt. kiiremaks juurdepääsuks uudistepuhvrile uudisteserveri kiirendamiseks)."
 
-#: fs.pm:402
+#: fs.pm:412
 #, c-format
 msgid ""
 "Can only be mounted explicitly (i.e.,\n"
@@ -2612,12 +2630,12 @@ msgstr ""
 "Haagitakse ainult otsesel märkimisel\n"
 "(s.t. võti -a ei haagi failisüsteemi)."
 
-#: fs.pm:405
+#: fs.pm:415
 #, c-format
 msgid "Do not interpret character or block special devices on the file system."
 msgstr "Failisüsteemis ei interpreteerita märgi- või blokieriseadmeid."
 
-#: fs.pm:407
+#: fs.pm:417
 #, c-format
 msgid ""
 "Do not allow execution of any binaries on the mounted\n"
@@ -2628,7 +2646,7 @@ msgstr ""
 "See on kasulik serveritel, mille failisüsteemides on süsteemist\n"
 "erineva arhitektuuriga binaarfaile."
 
-#: fs.pm:411
+#: fs.pm:421
 #, c-format
 msgid ""
 "Do not allow set-user-identifier or set-group-identifier\n"
@@ -2639,17 +2657,17 @@ msgstr ""
 "(see võib tunduda turvaline, aga tegelikult ei ole, eriti kui on\n"
 "paigaldatud suidperl(1).)"
 
-#: fs.pm:415
+#: fs.pm:425
 #, c-format
 msgid "Mount the file system read-only."
 msgstr "Failisüsteem haagitakse ainult lugemisõigusega."
 
-#: fs.pm:417
+#: fs.pm:427
 #, c-format
 msgid "All I/O to the file system should be done synchronously."
 msgstr "Kogu failisüsteemi I/O sooritatakse sünkroonselt."
 
-#: fs.pm:421
+#: fs.pm:431
 #, c-format
 msgid ""
 "Allow an ordinary user to mount the file system. The\n"
@@ -2665,52 +2683,57 @@ msgstr ""
 "nosuid ja nodev (kui neid ei tühista järgnevad võtmed, nagu\n"
 "näiteks võtmerida user,exec,dev,suid )."
 
-#: fs.pm:429
+#: fs.pm:439
 #, c-format
 msgid "Give write access to ordinary users"
 msgstr "Kirjutamisõiguse andmine tavakasutajale"
 
-#: fs.pm:565 fs.pm:575 fs.pm:579 fs.pm:583 fs.pm:587 fs.pm:591 swap.pm:12
+#: fs.pm:441
+#, c-format
+msgid "Give read-only access to ordinary users"
+msgstr "Lugemisõiguse andmine tavakasutajale"
+
+#: fs.pm:580 fs.pm:590 fs.pm:594 fs.pm:598 fs.pm:602 fs.pm:606 swap.pm:12
 #, c-format
 msgid "%s formatting of %s failed"
 msgstr "%s vormindamine seadmel %s ebaõnnestus"
 
-#: fs.pm:628
+#: fs.pm:647
 #, c-format
 msgid "I don't know how to format %s in type %s"
 msgstr "Ei oska seadet %s vormindada tüüpi %s"
 
-#: fs.pm:635 fs.pm:642
+#: fs.pm:654 fs.pm:661
 #, c-format
 msgid "Formatting partition %s"
 msgstr "Partitsiooni %s vormindamine"
 
-#: fs.pm:639
+#: fs.pm:658
 #, c-format
 msgid "Creating and formatting file %s"
 msgstr "Faili %s loomine ja vormindamine"
 
-#: fs.pm:705 fs.pm:758
+#: fs.pm:718 fs.pm:771
 #, c-format
 msgid "Mounting partition %s"
 msgstr "Partitsiooni %s haakimine"
 
-#: fs.pm:706 fs.pm:759
+#: fs.pm:719 fs.pm:772
 #, c-format
 msgid "mounting partition %s in directory %s failed"
 msgstr "partitsiooni %s haakimine kataloogis %s ebaõnnestus"
 
-#: fs.pm:726 fs.pm:734
+#: fs.pm:739 fs.pm:747
 #, c-format
 msgid "Checking %s"
 msgstr "%s kontrollimine"
 
-#: fs.pm:775 partition_table.pm:636
+#: fs.pm:788 partition_table.pm:638
 #, c-format
 msgid "error unmounting %s: %s"
 msgstr "viga %s lahutamisel: %s"
 
-#: fs.pm:807
+#: fs.pm:820
 #, c-format
 msgid "Enabling swap partition %s"
 msgstr "Vormindan saaleala %s"
@@ -2747,32 +2770,32 @@ msgstr ""
 "\n"
 "Kas olete nõus kõigi partitsioonide kaotamisega?\n"
 
-#: fsedit.pm:514
+#: fsedit.pm:513
 #, c-format
 msgid "You can't use JFS for partitions smaller than 16MB"
 msgstr "JFS ei ole kasutatav alla 16MB partitsioonidel"
 
-#: fsedit.pm:515
+#: fsedit.pm:514
 #, c-format
 msgid "You can't use ReiserFS for partitions smaller than 32MB"
 msgstr "ReiserFS ei ole kasutatav alla 32MB partitsioonidel"
 
-#: fsedit.pm:534
+#: fsedit.pm:533
 #, c-format
 msgid "Mount points must begin with a leading /"
 msgstr "Haakepunktid peavad algama kaldkriipsuga (/)"
 
-#: fsedit.pm:535
+#: fsedit.pm:534
 #, c-format
 msgid "Mount points should contain only alphanumerical characters"
 msgstr "Haakepunkti nimi tohib sisaldada vaid tähti ja numbreid"
 
-#: fsedit.pm:536
+#: fsedit.pm:535
 #, c-format
 msgid "There is already a partition with mount point %s\n"
 msgstr "Haakepunktile %s on juba partitsioon määratud\n"
 
-#: fsedit.pm:538
+#: fsedit.pm:537
 #, c-format
 msgid ""
 "You've selected a software RAID partition as root (/).\n"
@@ -2783,12 +2806,23 @@ msgstr ""
 "Ilma /boot partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
 "Lisage kindlasti /boot partitsioon!"
 
-#: fsedit.pm:541
+#: fsedit.pm:540
 #, c-format
 msgid "You can't use a LVM Logical Volume for mount point %s"
 msgstr "Te ei saa haakepunkti %s jaoks kasutada LVM loogilist ketast"
 
-#: fsedit.pm:543
+#: fsedit.pm:542
+#, c-format
+msgid ""
+"You've selected a LVM Logical Volume as root (/).\n"
+"The bootloader is not able to handle this without a /boot partition.\n"
+"Please be sure to add a /boot partition"
+msgstr ""
+"Olete valinud juurpartitsiooniks (/) LVM loogilise ketta.\n"
+"Ilma /boot partitsioonita ei ole võimalik sellist süsteemi laadida.\n"
+"Lisage kindlasti /boot partitsioon!"
+
+#: fsedit.pm:545
 #, c-format
 msgid ""
 "You may not be able to install lilo (since lilo doesn't handle a LV on "
@@ -2797,12 +2831,12 @@ msgstr ""
 "Võib juhtuda, et Te ei saa LiLo-t paigaldada (sest LiLo ei suuda käsitleda "
 "loogilist ketast mitmel füüsilisel kettal)"
 
-#: fsedit.pm:546 fsedit.pm:548
+#: fsedit.pm:548 fsedit.pm:550
 #, c-format
 msgid "This directory should remain within the root filesystem"
 msgstr "See kataloog peab jääma kokku juurfailisüsteemiga"
 
-#: fsedit.pm:550
+#: fsedit.pm:552
 #, c-format
 msgid ""
 "You need a true filesystem (ext2/ext3, reiserfs, xfs, or jfs) for this mount "
@@ -2811,22 +2845,22 @@ msgstr ""
 "See haakepunkt vajab tõelist (ext2/ext3, reiserfs, xfs või jfs) "
 "failisüsteemi\n"
 
-#: fsedit.pm:552
+#: fsedit.pm:554
 #, c-format
 msgid "You can't use an encrypted file system for mount point %s"
 msgstr "Te ei saa haakepunkti %s jaoks kasutada krüptitud failisüsteemi"
 
-#: fsedit.pm:613
+#: fsedit.pm:615
 #, c-format
 msgid "Not enough free space for auto-allocating"
 msgstr "Ei ole piisavalt ruumi automaatpaigutuseks"
 
-#: fsedit.pm:615
+#: fsedit.pm:617
 #, c-format
 msgid "Nothing to do"
 msgstr "Pole midagi teha"
 
-#: fsedit.pm:711
+#: fsedit.pm:713
 #, c-format
 msgid "Error opening %s for writing: %s"
 msgstr "%s avamine kirjutamiseks ebaõnnestus: %s"
@@ -2834,7 +2868,7 @@ msgstr "%s avamine kirjutamiseks ebaõnnestus: %s"
 #: harddrake/data.pm:53
 #, c-format
 msgid "Floppy"
-msgstr "Flopi"
+msgstr "Diskett"
 
 #: harddrake/data.pm:54
 #, c-format
@@ -2861,7 +2895,7 @@ msgstr "CD/DVD kirjutajad"
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: harddrake/data.pm:59 standalone/drakbackup:2409
+#: harddrake/data.pm:59 standalone/drakbackup:2116
 #, c-format
 msgid "Tape"
 msgstr "Lint"
@@ -2901,36 +2935,41 @@ msgstr "Protsessorid"
 msgid "ISDN adapters"
 msgstr "ISDN kaardid"
 
-#: harddrake/data.pm:71
+#: harddrake/data.pm:70
 #, c-format
 msgid "Ethernetcard"
 msgstr "Võrgukaart"
 
-#: harddrake/data.pm:79 network/netconnect.pm:366 standalone/drakconnect:277
-#: standalone/drakconnect:447 standalone/drakconnect:448
-#: standalone/drakconnect:540
+#: harddrake/data.pm:78 network/netconnect.pm:452 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:472
+#: standalone/drakconnect:473 standalone/drakconnect:576
 #, c-format
 msgid "Modem"
 msgstr "Modem"
 
-#: harddrake/data.pm:80
+#: harddrake/data.pm:79
 #, c-format
 msgid "ADSL adapters"
 msgstr "ADSL kaardid"
 
+#: harddrake/data.pm:81
+#, c-format
+msgid "AGP controllers"
+msgstr "AGP kontrollerid"
+
 #: harddrake/data.pm:82
 #, c-format
 msgid "Bridges and system controllers"
 msgstr "Sillad ja kontrollerid"
 
 #: harddrake/data.pm:83 help.pm:203 help.pm:991
-#: install_steps_interactive.pm:935 printer/printerdrake.pm:680
-#: printer/printerdrake.pm:3970
+#: install_steps_interactive.pm:940 printer/printerdrake.pm:687
+#: printer/printerdrake.pm:4175
 #, c-format
 msgid "Printer"
 msgstr "Printer"
 
-#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:928
+#: harddrake/data.pm:85 help.pm:991 install_steps_interactive.pm:933
 #, c-format
 msgid "Mouse"
 msgstr "Hiir"
@@ -2945,75 +2984,75 @@ msgstr "Juhtkang"
 msgid "(E)IDE/ATA controllers"
 msgstr "(E)IDE/ATA kontrollerid"
 
-#: harddrake/data.pm:93
+#: harddrake/data.pm:94
 #, c-format
 msgid "Firewire controllers"
 msgstr "Firewire kontrollerid"
 
-#: harddrake/data.pm:94
+#: harddrake/data.pm:95
 #, c-format
 msgid "SCSI controllers"
 msgstr "SCSI kontrolerid"
 
-#: harddrake/data.pm:95
+#: harddrake/data.pm:96
 #, c-format
 msgid "USB controllers"
 msgstr "USB kontrollerid"
 
-#: harddrake/data.pm:96
+#: harddrake/data.pm:97
 #, c-format
 msgid "SMBus controllers"
 msgstr "SMBus kontrollerid"
 
-#: harddrake/data.pm:97
+#: harddrake/data.pm:98
 #, c-format
 msgid "Scanner"
 msgstr "Skänner"
 
-#: harddrake/data.pm:99 standalone/harddrake2:315
+#: harddrake/data.pm:100 standalone/harddrake2:319
 #, c-format
 msgid "Unknown/Others"
 msgstr "Tundmatu/Muu"
 
-#: harddrake/data.pm:113
+#: harddrake/data.pm:114
 #, c-format
 msgid "cpu # "
 msgstr "cpu # "
 
-#: harddrake/sound.pm:150 standalone/drakconnect:166
+#: harddrake/sound.pm:150 standalone/drakconnect:169
 #, c-format
 msgid "Please Wait... Applying the configuration"
 msgstr "Palun oodake... Rakendan seadistusi"
 
-#: harddrake/sound.pm:182
+#: harddrake/sound.pm:186
 #, c-format
 msgid "No alternative driver"
-msgstr "Alternatiivne juhtprogramm puudub"
+msgstr "Alternatiivne fraiver puudub"
 
-#: harddrake/sound.pm:183
+#: harddrake/sound.pm:187
 #, c-format
 msgid ""
 "There's no known OSS/ALSA alternative driver for your sound card (%s) which "
 "currently uses \"%s\""
 msgstr ""
-"Pole teada ühtegi alternatiivset OSS/ALSA juhtprogrammi Teie helikaardile (%"
-"s), millel praegu on kasutusel \"%s\""
+"Pole teada ühtegi alternatiivset OSS/ALSA draiverit Teie helikaardile (%s), "
+"millel praegu on kasutusel \"%s\""
 
-#: harddrake/sound.pm:189
+#: harddrake/sound.pm:193
 #, c-format
 msgid "Sound configuration"
 msgstr "Heliseadistused"
 
-#: harddrake/sound.pm:191
+#: harddrake/sound.pm:195
 #, c-format
 msgid ""
 "Here you can select an alternative driver (either OSS or ALSA) for your "
 "sound card (%s)."
 msgstr ""
-"Siin saate valida alternatiivse juhtprogrammi (OSS või ALSA) oma "
-"helikaardile (%s)."
+"Siin saate valida alternatiivse draiveri (OSS või ALSA) oma helikaardile (%"
+"s)."
 
-#: harddrake/sound.pm:193
+#: harddrake/sound.pm:197
 #, c-format
 msgid ""
 "\n"
@@ -3023,10 +3062,10 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Teie helikaart kasutab praegu %s\"%s\" juhtprogrammi (selle kaardi "
-"vaikedraiver on \"%s\")"
+"Teie helikaart kasutab praegu %s\"%s\" draiverit (selle kaardi vaikedraiver "
+"on \"%s\")"
 
-#: harddrake/sound.pm:195
+#: harddrake/sound.pm:199
 #, c-format
 msgid ""
 "OSS (Open Sound System) was the first sound API. It's an OS independent "
@@ -3060,17 +3099,17 @@ msgstr ""
 "- uut ALSA API-t, mis pakub hulga täiustatud võimalusi, kuid nõuab ALSA "
 "teegi kasutamist.\n"
 
-#: harddrake/sound.pm:209 harddrake/sound.pm:289
+#: harddrake/sound.pm:213 harddrake/sound.pm:293 standalone/drakups:134
 #, c-format
 msgid "Driver:"
-msgstr "Juhtprogramm: "
+msgstr "Draiver: "
 
-#: harddrake/sound.pm:214
+#: harddrake/sound.pm:218
 #, c-format
 msgid "Trouble shooting"
 msgstr "Probleemi otsimine"
 
-#: harddrake/sound.pm:222
+#: harddrake/sound.pm:226
 #, c-format
 msgid ""
 "The old \"%s\" driver is blacklisted.\n"
@@ -3079,52 +3118,52 @@ msgid ""
 "\n"
 "The new \"%s\" driver'll only be used on next bootstrap."
 msgstr ""
-"Vana \"%s\" juhtprogramm on mustas nimekirjas.\n"
+"Vana \"%s\" draiver on mustas nimekirjas.\n"
 "\n"
 "On teatatud, et see tekitab mahalaadimisel kernelile jama.\n"
 "\n"
-"Uut \"%s\" juhtprogrammi kasutatakse järgmisel alglaadimisel."
+"Uut \"%s\" draiverit kasutatakse järgmisel alglaadimisel."
 
-#: harddrake/sound.pm:230
+#: harddrake/sound.pm:234
 #, c-format
 msgid "No open source driver"
-msgstr "Vabavara-juhtprogramm puudub"
+msgstr "Vabavara-draiver puudub"
 
-#: harddrake/sound.pm:231
+#: harddrake/sound.pm:235
 #, c-format
 msgid ""
 "There's no free driver for your sound card (%s), but there's a proprietary "
 "driver at \"%s\"."
 msgstr ""
-"Pole teada ühtegi vabavara-juhtprogrammi Teie helikaardile (%s), kuid on "
-"olemas tootja juhtprogramm, mille asukoht on \"%s\"."
+"Pole teada ühtegi vabavara-draiverit Teie helikaardile (%s), kuid on olemas "
+"tootja draiver, mille asukoht on \"%s\"."
 
-#: harddrake/sound.pm:234
+#: harddrake/sound.pm:238
 #, c-format
 msgid "No known driver"
-msgstr "Juhtprogrammi ei õnnestunud tuvastada"
+msgstr "Draiverit ei õnnestunud tuvastada"
 
-#: harddrake/sound.pm:235
+#: harddrake/sound.pm:239
 #, c-format
 msgid "There's no known driver for your sound card (%s)"
-msgstr "Teie helikaardile (%s) ei õnnestunud tuvastada juhtprogrammi"
+msgstr "Teie helikaardile (%s) ei õnnestunud tuvastada draiverit"
 
-#: harddrake/sound.pm:239
+#: harddrake/sound.pm:243
 #, c-format
 msgid "Unknown driver"
-msgstr "Tundmatu juhtprogramm"
+msgstr "Tundmatu draiver"
 
-#: harddrake/sound.pm:240
+#: harddrake/sound.pm:244
 #, c-format
 msgid "Error: The \"%s\" driver for your sound card is unlisted"
-msgstr "Viga: helikaardi juhtprogramm \"%s\" ei ole loendis"
+msgstr "Viga: helikaardi draiverit \"%s\" ei ole loendis"
 
-#: harddrake/sound.pm:253
+#: harddrake/sound.pm:257
 #, c-format
 msgid "Sound trouble shooting"
 msgstr "Heliprobleemide lahendamine"
 
-#: harddrake/sound.pm:254
+#: harddrake/sound.pm:258
 #, c-format
 msgid ""
 "The classic bug sound tester is to run the following commands:\n"
@@ -3167,17 +3206,17 @@ msgstr ""
 "- \"/sbin/fuser -v /dev/dsp\" näitab, milline programm hetkel\n"
 "helikaarti kasutab.\n"
 
-#: harddrake/sound.pm:280
+#: harddrake/sound.pm:284
 #, c-format
 msgid "Let me pick any driver"
-msgstr "Suvalise juhtprogrammi valimine"
+msgstr "Suvalise draiveri valimine"
 
-#: harddrake/sound.pm:283
+#: harddrake/sound.pm:287
 #, c-format
 msgid "Choosing an arbitrary driver"
-msgstr "Suvalise juhtprogrammi valimine"
+msgstr "Suvalise draiveri valimine"
 
-#: harddrake/sound.pm:284
+#: harddrake/sound.pm:288
 #, c-format
 msgid ""
 "If you really think that you know which driver is the right one for your "
@@ -3186,10 +3225,10 @@ msgid ""
 "\n"
 "The current driver for your \"%s\" sound card is \"%s\" "
 msgstr ""
-"Kui Te tõesti arvate, et teate, milline juhtprogramm Teie helikaardile\n"
+"Kui Te tõesti arvate, et teate, milline draiver Teie helikaardile\n"
 "tegelikult sobib, võite valida selle ülaltoodud nimekirjast.\n"
 "\n"
-"Teie praegune helikaart \"%s\" kasutab juhtprogrammi \"%s\" "
+"Teie praegune helikaart \"%s\" kasutab draiverit \"%s\" "
 
 #: harddrake/v4l.pm:14 harddrake/v4l.pm:66
 #, c-format
@@ -3263,17 +3302,17 @@ msgstr "raadiotoe lubamine"
 #, c-format
 msgid ""
 "Before continuing, you should carefully read the terms of the license. It\n"
-"covers the entire Mandrake Linux distribution. If you do agree with all the\n"
+"covers the entire Mandrakelinux distribution. If you do agree with all the\n"
 "terms in it, check the \"%s\" box. If not, clicking on the \"%s\" button\n"
 "will reboot your computer."
 msgstr ""
 "Enne jätkamist lugege hoolikalt läbi litsentsileping. See kehtib kogu\n"
-"Mandrake Linuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
+"Mandrakelinuxi distributsiooni kohta. Kui Te kõigi selle tingimustega\n"
 "nõus olete, märkige ära kast \"%s\". Kui Teile aga miski ei meeldi, siis\n"
 "klõps nupule \"%s\" sooritab arvuti taaskäivitamise."
 
 #: help.pm:14 install_steps_gtk.pm:596 install_steps_interactive.pm:88
-#: install_steps_interactive.pm:697 standalone/drakautoinst:199
+#: install_steps_interactive.pm:697 standalone/drakautoinst:216
 #, c-format
 msgid "Accept"
 msgstr "Nõus"
@@ -3366,10 +3405,9 @@ msgstr ""
 
 #: help.pm:52 help.pm:197 help.pm:444 help.pm:691 help.pm:784 help.pm:1005
 #: install_steps_gtk.pm:275 interactive.pm:403 interactive/newt.pm:308
-#: network/netconnect.pm:242 network/tools.pm:208 printer/printerdrake.pm:2922
-#: standalone/drakTermServ:392 standalone/drakbackup:4487
-#: standalone/drakbackup:4513 standalone/drakbackup:4543
-#: standalone/drakbackup:4567 ugtk2.pm:509
+#: network/netconnect.pm:262 network/tools.pm:206 printer/printerdrake.pm:3090
+#: standalone/drakTermServ:408 standalone/drakbackup:4199
+#: standalone/drakbackup:4229 standalone/drakbackup:4251 ugtk2.pm:510
 #, c-format
 msgid "Next"
 msgstr "Järgmine"
@@ -3444,11 +3482,11 @@ msgstr ""
 #: help.pm:86
 #, c-format
 msgid ""
-"The Mandrake Linux installation is distributed on several CD-ROMs. If a\n"
+"The Mandrakelinux installation is distributed on several CD-ROMs. If a\n"
 "selected package is located on another CD-ROM, DrakX will eject the current\n"
 "CD and ask you to insert the correct CD as required."
 msgstr ""
-"Mandrake Linuxi paigalduspaketid on jagatud mitme CD-ROMi vahel. DrakX\n"
+"Mandrakelinuxi 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."
@@ -3457,12 +3495,12 @@ msgstr ""
 #, c-format
 msgid ""
 "It is now time to specify which programs you wish to install on your\n"
-"system. There are thousands of packages available for Mandrake Linux, and\n"
+"system. There are thousands of packages available for Mandrakelinux, and\n"
 "to make it simpler to manage the packages have been placed into groups of\n"
 "similar applications.\n"
 "\n"
 "Packages are sorted into groups corresponding to a particular use of your\n"
-"machine. Mandrake Linux sorts packages groups in four categories. You can\n"
+"machine. Mandrakelinux sorts packages groups in four categories. You can\n"
 "mix and match applications from the various categories, so a\n"
 "``Workstation'' installation can still have applications from the\n"
 "``Development'' category installed.\n"
@@ -3505,7 +3543,7 @@ msgid ""
 "updating an existing system."
 msgstr ""
 "Nüüd on aeg määrata rakendused, mida soovite oma süsteemi paigaldada.\n"
-"Mandrake Linux pakub tuhandeid pakette ja mõistagi ei eelda keegi, et Te\n"
+"Mandrakelinux pakub tuhandeid pakette ja mõistagi ei eelda keegi, et Te\n"
 "neid kõiki juba ette tunneksite.\n"
 "\n"
 "Paketid on rühmitatud gruppidesse vastavalt nende kasutusalale. Grupid ise "
@@ -3604,10 +3642,10 @@ msgid ""
 "!! If a server package has been selected, either because you specifically\n"
 "chose the individual package or because it was part of a group of packages,\n"
 "you will be asked to confirm that you really want those servers to be\n"
-"installed. By default Mandrake Linux will automatically start any installed\n"
+"installed. By default Mandrakelinux will automatically start any installed\n"
 "services at boot time. Even if they are safe and have no known issues at\n"
 "the time the distribution was shipped, it is entirely possible that that\n"
-"security holes were discovered after this version of Mandrake Linux was\n"
+"security holes were discovered after this version of Mandrakelinux was\n"
 "finalized. If you do not know what a particular service is supposed to do\n"
 "or why it is being installed, then click \"%s\". Clicking \"%s\" will\n"
 "install the listed services and they will be started automatically by\n"
@@ -3639,7 +3677,7 @@ msgstr ""
 "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"
+"Mandrakelinuxi 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 "
@@ -3656,25 +3694,25 @@ msgstr ""
 "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 "
+"Väike disketiikoon loendi all võimaldab avada eelmise paigalduse ajal "
 "valitud\n"
 "pakettide nimekirja. Sellel klõpsamise järel palutakse Teil sisestada "
-"flopiketas,\n"
+"diskett,\n"
 "mille lõite eelmise paigalduse lõpul. Vaadake ka eelmise sammu teist "
 "nõuannet\n"
-"selle kohta, kuidas sellist flopiketast luua."
+"selle kohta, kuidas sellist disketti luua."
 
-#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:422
-#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:218
-#: ugtk2.pm:1046 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:329 help.pm:457 install_any.pm:420
+#: interactive.pm:149 modules/interactive.pm:71 standalone/harddrake2:219
+#: ugtk2.pm:1074 wizards.pm:156
 #, c-format
 msgid "No"
 msgstr "Ei"
 
-#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:422 interactive.pm:149
-#: modules/interactive.pm:71 standalone/drakgw:280 standalone/drakgw:281
-#: standalone/drakgw:289 standalone/drakgw:299 standalone/harddrake2:217
-#: ugtk2.pm:1046 wizards.pm:156
+#: help.pm:172 help.pm:301 help.pm:457 install_any.pm:420 interactive.pm:149
+#: modules/interactive.pm:71 printer/printerdrake.pm:607 standalone/drakgw:288
+#: standalone/drakgw:289 standalone/drakgw:297 standalone/drakgw:307
+#: standalone/harddrake2:218 ugtk2.pm:1074 wizards.pm:156
 #, c-format
 msgid "Yes"
 msgstr "Jah"
@@ -3689,7 +3727,7 @@ msgstr "Automaatsõltuvused"
 msgid ""
 "You will now set up your Internet/network connection. If you wish to\n"
 "connect your computer to the Internet or to a local network, click \"%s\".\n"
-"Mandrake Linux will attempt to auto-detect network devices and modems. If\n"
+"Mandrakelinux will attempt to auto-detect network devices and modems. If\n"
 "this detection fails, uncheck the \"%s\" box. You may also choose not to\n"
 "configure the network, or to do it later, in which case clicking the \"%s\"\n"
 "button will take you to the next step.\n"
@@ -3704,7 +3742,7 @@ msgid ""
 "\n"
 "About Winmodem Connection. Winmodems are special integrated low-end modems\n"
 "that require additional software to work compared to Normal modems. Some of\n"
-"those modems actually work under Mandrake Linux, some others do not. You\n"
+"those modems actually work under Mandrakelinux, some others do not. You\n"
 "can consult the list of supported modems at LinModems.\n"
 "\n"
 "You can consult the ``Starter Guide'' chapter about Internet connections\n"
@@ -3730,7 +3768,7 @@ msgstr ""
 "\n"
 "Siiski veidi Winmodemite kohta. Need on spetsiaalsed integreeritud\n"
 "modemid, mis võrreldes tavaliste modemitega vajavad töötamiseks täiendavat\n"
-"tarkvara. Mõningad sellised modemid suudavad töötada ka Mandrake Linuxis,\n"
+"tarkvara. Mõningad sellised modemid suudavad töötada ka Mandrakelinuxis,\n"
 "kuid paraku mitte kõik. Millised mudelid on toetatud, võiks järele\n"
 "kontrollida Linuxi modemite veebileheküljelt.\n"
 "\n"
@@ -3759,8 +3797,8 @@ msgstr ""
 "sarnaneb sellele, mida võisite näha paigalduse ajal."
 
 #: help.pm:203 help.pm:581 help.pm:991 install_steps_gtk.pm:646
-#: standalone/drakbackup:2688 standalone/drakbackup:2696
-#: standalone/drakbackup:2704 standalone/drakbackup:2712
+#: standalone/drakbackup:2406 standalone/drakbackup:2414
+#: standalone/drakbackup:2422 standalone/drakbackup:2430
 #, c-format
 msgid "Configure"
 msgstr "Seadista"
@@ -3836,7 +3874,7 @@ msgstr ""
 "saab\n"
 "kasutada isegi teiste kohtvõrgus olevate masinate aja täpsustamiseks."
 
-#: help.pm:235 install_steps_interactive.pm:834
+#: help.pm:235 install_steps_interactive.pm:835
 #, c-format
 msgid "Hardware clock set to GMT"
 msgstr "Arvuti sisekell on seatud GMT ajale"
@@ -3874,7 +3912,7 @@ msgstr ""
 msgid ""
 "X (for X Window System) is the heart of the GNU/Linux graphical interface\n"
 "on which all the graphical environments (KDE, GNOME, AfterStep,\n"
-"WindowMaker, etc.) bundled with Mandrake Linux rely upon.\n"
+"WindowMaker, etc.) bundled with Mandrakelinux rely upon.\n"
 "\n"
 "You will be presented with a list of different parameters to change to get\n"
 "an optimal graphical display: Graphic Card\n"
@@ -3928,7 +3966,7 @@ msgid ""
 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"
+"tuuma ja südant, millele toetuvad kõik Mandrakelinuxiga kaasas käivad\n"
 "graafilised töökeskkonnad (KDE, GNOME, AfterStep, WindowMaker jne).\n"
 "\n"
 "Siin näidatakse Teile tervet nimekirja parameetreid, mida saab muuta,\n"
@@ -4049,7 +4087,7 @@ msgid ""
 "if an existing operating system is using all the available space you will\n"
 "have to partition the drive. Basically, partitioning a hard drive consists\n"
 "of logically dividing it to create the space needed to install your new\n"
-"Mandrake Linux system.\n"
+"Mandrakelinux system.\n"
 "\n"
 "Because the process of partitioning a hard drive is usually irreversible\n"
 "and can lead to lost data if there is an existing operating system already\n"
@@ -4076,7 +4114,7 @@ msgid ""
 "FAT or NTFS partition. Resizing can be performed without the loss of any\n"
 "data, provided you have previously defragmented the Windows partition.\n"
 "Backing up your data is strongly recommended.. Using this option is\n"
-"recommended if you want to use both Mandrake Linux and Microsoft Windows on\n"
+"recommended if you want to use both Mandrakelinux and Microsoft Windows on\n"
 "the same computer.\n"
 "\n"
 "   Before choosing this option, please understand that after this\n"
@@ -4085,7 +4123,7 @@ msgid ""
 "Windows to store your data or to install new software.\n"
 "\n"
 " * \"%s\": if you want to delete all data and all partitions present on\n"
-"your hard drive and replace them with your new Mandrake Linux system,\n"
+"your hard drive and replace them with your new Mandrakelinux system,\n"
 "choose this option. Be careful, because you will not be able to undo your\n"
 "choice after you confirm.\n"
 "\n"
@@ -4103,11 +4141,11 @@ msgid ""
 "experience. For more instructions on how to use the DiskDrake utility,\n"
 "refer to the ``Managing Your Partitions'' section in the ``Starter Guide''."
 msgstr ""
-"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrake Linux\n"
+"Olete jõudnud punkti, kus peate otsustama, kuhu täpselt Mandrakelinux\n"
 "oma kõvakettal paigaldada. Kui kõvaketas on tühi või mõni muu\n"
 "operatsioonisüsteem seda täielikult kasutab, on vaja partitsioneerida.\n"
 "Partitsioneerimine on tegevus, mille käigus tekitatakse kettale loogilised\n"
-"piirkonnad Teie uue Mandrake Linux süsteemi paigaldamiseks.\n"
+"piirkonnad Teie uue Mandrakelinux 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"
@@ -4138,7 +4176,7 @@ msgstr ""
 "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"
+"nii Mandrakelinuxit kui Microsoft Windowsit.\n"
 "\n"
 "   Enne selle valiku kasuks otsustamist pidage silmas, et kirjeldatud "
 "protseduuri\n"
@@ -4148,7 +4186,7 @@ msgstr ""
 "paigaldamiseks.\n"
 "\n"
 " * \"%s\": kui soovite kustutada kõik andmed ja partitsioonid, mis\n"
-"kõvakettal parajasti on, ning asendada need uue Mandrake Linuxi süsteemiga, "
+"kõvakettal parajasti on, ning asendada need uue Mandrakelinuxi süsteemiga, "
 "on\n"
 "see õige valik. Aga tasub olla ettevaatlik, sest pärast selle valiku "
 "langetamist\n"
@@ -4240,7 +4278,7 @@ msgstr ""
 "\n"
 "Nupp \"%s\" pakub veel kaks võimalust:\n"
 "\n"
-" * \"%s\": loob paigaldusflopi, mis sooritab kogu\n"
+" * \"%s\": loob paigaldusdisketi, mis sooritab kogu\n"
 "paigalduse ilma kasutajata, paigaldus ise on samasugune nagu äsja\n"
 "seljataha jäänu.\n"
 "\n"
@@ -4258,7 +4296,7 @@ msgstr ""
 "automaatpaigalduse sektsiooni.\n"
 "\n"
 " * \"%s\": salvestab paigalduse käigus valitud pakettide\n"
-"nimekirja. Kui nüüd võtate ette uue paigalduse, asetage flopi seadmesse "
+"nimekirja. Kui nüüd võtate ette uue paigalduse, asetage diskett seadmesse "
 "ning\n"
 "käivitage paigaldus klahvile [F1] vajutades abiekraani vahendusel, andes "
 "käsu\n"
@@ -4267,19 +4305,19 @@ msgstr ""
 #: help.pm:418
 #, c-format
 msgid "Generate auto-install floppy"
-msgstr "Loo kiirpaigaldusflopi"
+msgstr "Loo kiirpaigaldusdiskett"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Replay"
 msgstr "Kordamine"
 
-#: help.pm:418 install_steps_interactive.pm:1320
+#: help.pm:418 install_steps_interactive.pm:1329
 #, c-format
 msgid "Automated"
 msgstr "Automaatne"
 
-#: help.pm:418 install_steps_interactive.pm:1323
+#: help.pm:418 install_steps_interactive.pm:1332
 #, c-format
 msgid "Save packages selection"
 msgstr "Salvesta paketivalik"
@@ -4307,7 +4345,7 @@ msgid ""
 "Click on \"%s\" when you are ready to format the partitions.\n"
 "\n"
 "Click on \"%s\" if you want to choose another partition for your new\n"
-"Mandrake Linux operating system installation.\n"
+"Mandrakelinux operating system installation.\n"
 "\n"
 "Click on \"%s\" if you wish to select partitions that will be checked for\n"
 "bad blocks on the disk."
@@ -4329,7 +4367,7 @@ msgstr ""
 "\n"
 "Klõpsake \"%s\", kui olete vormindamiseks valmis.\n"
 "\n"
-"Klõpsake \"%s\", kui soovite valida oma uue Mandrake Linuxi süsteemi\n"
+"Klõpsake \"%s\", kui soovite valida oma uue Mandrakelinuxi süsteemi\n"
 "paigaldamiseks mõne muu partitsiooni.\n"
 "\n"
 "Klõpsake \"%s\", kui soovite valida partitsioone, millel kontrollitaks "
@@ -4337,12 +4375,12 @@ msgstr ""
 "blokkide olemasolu."
 
 #: help.pm:444 help.pm:1005 install_steps_gtk.pm:431 interactive.pm:404
-#: interactive/newt.pm:307 printer/printerdrake.pm:2920
-#: standalone/drakTermServ:371 standalone/drakbackup:4288
-#: standalone/drakbackup:4316 standalone/drakbackup:4374
-#: standalone/drakbackup:4400 standalone/drakbackup:4426
-#: standalone/drakbackup:4483 standalone/drakbackup:4509
-#: standalone/drakbackup:4539 standalone/drakbackup:4563 ugtk2.pm:507
+#: interactive/newt.pm:307 printer/printerdrake.pm:3088
+#: standalone/drakTermServ:387 standalone/drakbackup:4012
+#: standalone/drakbackup:4041 standalone/drakbackup:4095
+#: standalone/drakbackup:4119 standalone/drakbackup:4143
+#: standalone/drakbackup:4195 standalone/drakbackup:4225
+#: standalone/drakbackup:4247 ugtk2.pm:508
 #, c-format
 msgid "Previous"
 msgstr "Eelmine"
@@ -4350,7 +4388,7 @@ msgstr "Eelmine"
 #: help.pm:447
 #, c-format
 msgid ""
-"At the time you are installing Mandrake Linux, it is likely that some\n"
+"At the time you are installing Mandrakelinux, it is likely that some\n"
 "packages will have been updated since the initial release. Bugs may have\n"
 "been fixed, security issues resolved. To allow you to benefit from these\n"
 "updates, you are now able to download them from the Internet. Check \"%s\"\n"
@@ -4362,7 +4400,7 @@ msgid ""
 "appear: review the selection, and press \"%s\" to retrieve and install the\n"
 "selected package(s), or \"%s\" to abort."
 msgstr ""
-"On tõenäoline, et praegu, kui Te paigaldate Mandrake Linuxit, on mõned\n"
+"On tõenäoline, et praegu, kui Te paigaldate Mandrakelinuxit, 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 "
@@ -4379,7 +4417,7 @@ msgstr ""
 "paigaldada, või \"%s\", kui Te ei soovi seda teha."
 
 #: help.pm:457 help.pm:602 install_steps_gtk.pm:430
-#: install_steps_interactive.pm:148 standalone/drakbackup:4602
+#: install_steps_interactive.pm:148 standalone/drakbackup:4279
 #, c-format
 msgid "Install"
 msgstr "Paigaldus"
@@ -4423,7 +4461,7 @@ msgstr "Turvaadministraator"
 #, c-format
 msgid ""
 "At this point, you need to choose which partition(s) will be used for the\n"
-"installation of your Mandrake Linux system. If partitions have already been\n"
+"installation of your Mandrakelinux system. If partitions have already been\n"
 "defined, either from a previous installation of GNU/Linux or by another\n"
 "partitioning tool, you can use existing partitions. Otherwise, hard drive\n"
 "partitions must be defined.\n"
@@ -4493,7 +4531,7 @@ 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 Linuxi paigaldada.\n"
+"Nüüd peate valima partitsiooni(d), kuhu soovite Mandrakelinuxi paigaldada.\n"
 "Kui need on juba olemas kas GNU/Linuxi varasema paigalduse või mõne muu\n"
 "kettajagamisvahendi tegevuse tulemusena, võite kasutada olemasolevaid\n"
 "partitsioone. Vastasel juhul tuleb need luua.\n"
@@ -4519,11 +4557,11 @@ msgstr ""
 "partitsioonid vabale kettapinnale automaatselt.\n"
 "\n"
 "\"%s\": pakub mõned lisavõimalused:\n"
-" * \"%s\": salvestab partitsioonitabeli flopikettale.\n"
+" * \"%s\": salvestab partitsioonitabeli disketile.\n"
 "Sellest on kasu hilisemal partitsioonitabeli taastamisel, kui seda vaja\n"
 "peaks olema. Igal juhul on äärmiselt soovitav see samm ette võtta.\n"
 "\n"
-" * \"%s\": võimaldab taastada flopikettalt varem\n"
+" * \"%s\": võimaldab taastada disketilt varem\n"
 "salvestatud partitsioonitabeli.\n"
 "\n"
 " * \"%s\": kui partitsioonitabel on vigastatud, võib\n"
@@ -4534,7 +4572,7 @@ msgstr ""
 "\n"
 " * \"%s\": selle võimaluse\n"
 "tühistamine sunnib kasutajaid käsitsi haakima ja lahutama eemaldatavaid\n"
-"andmekandjaid, st flopikettaid ja CD-ROMe.\n"
+"andmekandjaid, st diskette ja CD-ROMe.\n"
 "\n"
 " * \"%s\": kui soovite uue partitsioonitabeli loomisel samm-sammulist\n"
 "juhatust. See on soovitatav, kui Te ei ole varem midagi sellist teinud.\n"
@@ -4582,7 +4620,7 @@ msgstr "Ekspert > Tavakasutaja"
 msgid ""
 "More than one Microsoft partition has been detected on your hard drive.\n"
 "Please choose the one which you want to resize in order to install your new\n"
-"Mandrake Linux operating system.\n"
+"Mandrakelinux operating system.\n"
 "\n"
 "Each partition is listed as follows: \"Linux name\", \"Windows name\"\n"
 "\"Capacity\".\n"
@@ -4611,7 +4649,7 @@ msgid ""
 "disk or partition is called \"C:\")."
 msgstr ""
 "Teie arvuti kõvakettal on rohkem kui üks Microsoft Windowsi partitsioon.\n"
-"Palun valige välja see, mille suurust soovite Mandrake Linuxi jaoks muuta.\n"
+"Palun valige välja see, mille suurust soovite Mandrakelinuxi jaoks muuta.\n"
 "\n"
 "Teie abistamiseks on igal partitsioonil näidatud \"Nimi Linuxis\", \"Nimi "
 "Windowsis\" ja \"Mahutavus\".\n"
@@ -4658,7 +4696,7 @@ msgid ""
 "found on your machine.\n"
 "\n"
 "DrakX now needs to know if you want to perform a new install or an upgrade\n"
-"of an existing Mandrake Linux system:\n"
+"of an existing Mandrakelinux system:\n"
 "\n"
 " * \"%s\": For the most part, this completely wipes out the old system. If\n"
 "you wish to change how your hard drives are partitioned, or change the file\n"
@@ -4666,19 +4704,19 @@ msgid ""
 "scheme, you can prevent some of your existing data from being over-written.\n"
 "\n"
 " * \"%s\": this installation class allows you to update the packages\n"
-"currently installed on your Mandrake Linux system. Your current\n"
+"currently installed on your Mandrakelinux system. Your current\n"
 "partitioning scheme and user data is not altered. Most of other\n"
 "configuration steps remain available, similar to a standard installation.\n"
 "\n"
-"Using the ``Upgrade'' option should work fine on Mandrake Linux systems\n"
+"Using the ``Upgrade'' option should work fine on Mandrakelinux systems\n"
 "running version \"8.1\" or later. Performing an Upgrade on versions prior\n"
-"to Mandrake Linux version \"8.1\" is not recommended."
+"to Mandrakelinux version \"8.1\" is not recommended."
 msgstr ""
 "Seda sammu on vaja ainult siis, kui masinas leiti varasem\n"
 "GNU/Linuxi partitsioon.\n"
 "\n"
 "DrakX soovib nüüd teada, kas tahate paigaldada uue süsteemi või uuendada\n"
-"olemasolevat Mandrake Linuxi süsteemi:\n"
+"olemasolevat Mandrakelinuxi süsteemi:\n"
 "\n"
 " * \"%s\": üldiselt pühib see vana süsteemi täielikult minema. Kui\n"
 "soovite muuta praeguseid partitsioone või failisüsteemi, siis võiks seda "
@@ -4687,13 +4725,13 @@ msgstr ""
 "ülekirjutamise eest päästa.\n"
 "\n"
 " * \"%s\": see paigaldusviis võimaldab uuendada praegu olemasolevasse\n"
-"Mandrake Linuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
+"Mandrakelinuxi süsteemi paigaldatud pakette. Kettajagamisskeemi ega "
 "kasutajate\n"
 "andmeid ei muudeta. Enamik seadistussamme on kasutatavad sarnaselt "
 "tavapärasele\n"
 "paigaldusele.\n"
 "\n"
-"Võimalus \"Uuendus\" peaks toimima edukalt Mandrake Linuxi süsteemides\n"
+"Võimalus \"Uuendus\" peaks toimima edukalt Mandrakelinuxi süsteemides\n"
 "alates versioonist 8.1. Uuenduse proovimist varasemate versioonide peal\n"
 "me siiski ei soovita."
 
@@ -4747,7 +4785,7 @@ msgid ""
 "\n"
 "About UTF-8 (unicode) support: Unicode is a new character encoding meant to\n"
 "cover all existing languages. Though full support for it in GNU/Linux is\n"
-"still under development. For that reason, Mandrake Linux will be using it\n"
+"still under development. For that reason, Mandrakelinux will be using it\n"
 "or not depending on the user choices:\n"
 "\n"
 " * If you choose a languages with a strong legacy encoding (latin1\n"
@@ -4785,7 +4823,7 @@ msgstr ""
 "\n"
 "Mõni sõna UTF-8 (unicode) toetuse kohta. Unicode on uus kodeering, mis\n"
 "peaks hõlmama kõiki keeli. Selle täielik toetus ei ole GNU/Linuxis\n"
-"siiski veel täielikult teostatud. Seetõttu lähtub Mandrake Linux selle\n"
+"siiski veel täielikult teostatud. Seetõttu lähtub Mandrakelinux selle\n"
 "kasutamisel või mittekasutamisel järgmistest asjaoludest:\n"
 "\n"
 " * Kui valite keele, mis üldreeglina kasutab muud kodeeringut (latin1 \n"
@@ -4978,7 +5016,7 @@ msgid "authentication"
 msgstr "autentimisviis"
 
 #. -PO: keep this short or else the buttons will not fit in the window
-#: help.pm:733 install_steps_interactive.pm:1154
+#: help.pm:733 install_steps_interactive.pm:1159
 #, c-format
 msgid "No password"
 msgstr "Salasõna puudub"
@@ -5013,7 +5051,7 @@ msgid ""
 "checking this box.\n"
 "\n"
 "!! Be aware that if you choose not to install a bootloader (by selecting\n"
-"\"%s\"), you must ensure that you have a way to boot your Mandrake Linux\n"
+"\"%s\"), you must ensure that you have a way to boot your Mandrakelinux\n"
 "system! Be sure you know what you are doing before changing any of the\n"
 "options. !!\n"
 "\n"
@@ -5032,7 +5070,7 @@ msgstr ""
 "\n"
 " * \"%s\": enamasti ei ole sügavat mõtet muuta vaikimisi valikut\n"
 "(\"%s\"), aga kui Te väga soovite, võib alglaaduri paigaldada ka teisele\n"
-"kõvakettale (\"%s\") või isegi flopikettale (\"%s\").\n"
+"kõvakettale (\"%s\") või isegi disketile (\"%s\").\n"
 "\n"
 " * \"%s\": arvutile alglaadimist tehes pakutakse Teile võimalust väikeseks\n"
 "pausiks, mille jooksul saab alglaadimismenüüst valida mõne muu kirje kui\n"
@@ -5119,8 +5157,9 @@ msgstr ""
 "pääseda!"
 
 #: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakbackup:1843 standalone/drakfont:586 standalone/drakfont:649
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakbackup:1604 standalone/drakfont:589 standalone/drakfont:655
+#: standalone/drakups:280 standalone/drakups:329 standalone/drakups:349
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, c-format
 msgid "Add"
 msgstr "Lisa"
@@ -5131,7 +5170,8 @@ msgid "Modify"
 msgstr "Muuda"
 
 #: help.pm:784 interactive.pm:295 interactive/gtk.pm:480
-#: standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakups:282 standalone/drakups:331 standalone/drakups:351
+#: standalone/drakvpn:331 standalone/drakvpn:692
 #, c-format
 msgid "Remove"
 msgstr "Eemalda"
@@ -5172,7 +5212,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Now, it's time to select a printing system for your computer. Other OSs may\n"
-"offer you one, but Mandrake Linux offers two. Each of the printing systems\n"
+"offer you one, but Mandrakelinux offers two. Each of the printing systems\n"
 "is best suited to particular types of configuration.\n"
 "\n"
 " * \"%s\" -- which is an acronym for ``print, don't queue'', is the choice\n"
@@ -5198,7 +5238,7 @@ msgid ""
 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"
+"võivad Teile pakkuda vaid üht süsteemi, kuid Mandrakelinuxi puhul saate\n"
 "valida tervelt kahe seast.\n"
 "\n"
 " * \"%s\" - mis tähendab ``trüki kohe'' (``print, don't queue'') - tuleks "
@@ -5230,7 +5270,7 @@ msgstr ""
 msgid "pdq"
 msgstr "pdq"
 
-#: help.pm:826 printer/cups.pm:99 printer/data.pm:82
+#: help.pm:826 printer/cups.pm:115 printer/data.pm:83
 #, c-format
 msgid "CUPS"
 msgstr "CUPS"
@@ -5460,10 +5500,10 @@ msgid ""
 msgstr ""
 "\"%s\": kui süsteemis leiti helikaart, näidatakse seda siin.\n"
 "Kui märkate, et näidatav helikaart ei ole mitte see, mis süsteemis\n"
-"Teie teada tegelikult on, klõpsake nuppu ja valige uus juhtprogramm."
+"Teie teada tegelikult on, klõpsake nuppu ja valige uus draiver."
 
-#: help.pm:929 help.pm:991 install_steps_interactive.pm:962
-#: install_steps_interactive.pm:979
+#: help.pm:929 help.pm:991 install_steps_interactive.pm:967
+#: install_steps_interactive.pm:984
 #, c-format
 msgid "Sound card"
 msgstr "Helikaart"
@@ -5561,7 +5601,7 @@ msgstr ""
 "\n"
 " * \"%s\": kui süsteemis leiti helikaart, näidatakse seda.\n"
 "Kui märkate, et siintoodud helikaart pole see, mis tegelikult on\n"
-"süsteemi paigaldatud, vajutage nuppu ja valige sobiv juhtprogramm.\n"
+"süsteemi paigaldatud, vajutage nuppu ja valige sobiv draiver.\n"
 "\n"
 " * \"%s\": vaikimisi määrab DrakX Teie graafilise liidese\n"
 "kuvatiheduseks \"800x600\" või \"1024x768\". Kui see Teile ei sobi,\n"
@@ -5594,12 +5634,12 @@ msgstr ""
 "ära seadistused üle vaadata."
 
 #: help.pm:991 install_steps_interactive.pm:110
-#: install_steps_interactive.pm:899 standalone/keyboarddrake:23
+#: install_steps_interactive.pm:900 standalone/keyboarddrake:23
 #, c-format
 msgid "Keyboard"
 msgstr "Klaviatuur"
 
-#: help.pm:991 install_steps_interactive.pm:921
+#: help.pm:991 install_steps_interactive.pm:926
 #, c-format
 msgid "Timezone"
 msgstr "Ajavöönd"
@@ -5609,7 +5649,7 @@ msgstr "Ajavöönd"
 msgid "Graphical Interface"
 msgstr "Graafiline kasutajaliides"
 
-#: help.pm:991 install_steps_interactive.pm:995
+#: help.pm:991 install_steps_interactive.pm:1000
 #, c-format
 msgid "TV card"
 msgstr "TV kaart"
@@ -5619,27 +5659,27 @@ msgstr "TV kaart"
 msgid "ISDN card"
 msgstr "ISDN kaart"
 
-#: help.pm:991 install_steps_interactive.pm:1013 standalone/drakbackup:2394
+#: help.pm:991 install_steps_interactive.pm:1018 standalone/drakbackup:2101
 #, c-format
 msgid "Network"
 msgstr "Võrk"
 
-#: help.pm:991 install_steps_interactive.pm:1039
+#: help.pm:991 install_steps_interactive.pm:1044
 #, c-format
 msgid "Security Level"
 msgstr "Turvatase"
 
-#: help.pm:991 install_steps_interactive.pm:1053
+#: help.pm:991 install_steps_interactive.pm:1058
 #, c-format
 msgid "Firewall"
 msgstr "Tulemüür"
 
-#: help.pm:991 install_steps_interactive.pm:1067
+#: help.pm:991 install_steps_interactive.pm:1072
 #, c-format
 msgid "Bootloader"
 msgstr "Alglaadur"
 
-#: help.pm:991 install_steps_interactive.pm:1077 services.pm:195
+#: help.pm:991 install_steps_interactive.pm:1082 services.pm:195
 #, c-format
 msgid "Services"
 msgstr "Teenused"
@@ -5648,10 +5688,10 @@ msgstr "Teenused"
 #, c-format
 msgid ""
 "Choose the hard drive you want to erase in order to install your new\n"
-"Mandrake Linux partition. Be careful, all data on this drive will be lost\n"
+"Mandrakelinux partition. Be careful, all data on this drive will be lost\n"
 "and will not be recoverable!"
 msgstr ""
-"Valige kõvaketas, mida soovite puhastada oma uue Mandrake Linuxi\n"
+"Valige kõvaketas, mida soovite puhastada oma uue Mandrakelinuxi\n"
 "paigaldamiseks. Ettevaatust, kõik sellel leiduvad andmed hävitatakse\n"
 "ja neid ei saa enam taastada."
 
@@ -5681,15 +5721,15 @@ msgid ""
 "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)"
+"fail %s), mis enamasti tähendab, et Teie alglaadimisdiskett ei ole "
+"sünkroonis paigaldus-andmekandjaga (palun looge uus alglaadimisdiskett)"
 
 #: install2.pm:169
 #, c-format
 msgid "You must also format %s"
 msgstr "Vormindada tuleb ka %s"
 
-#: install_any.pm:413
+#: install_any.pm:411
 #, c-format
 msgid ""
 "You have selected the following server(s): %s\n"
@@ -5713,7 +5753,7 @@ msgstr ""
 "\n"
 "Kas tõesti paigaldada need serverid?\n"
 
-#: install_any.pm:434
+#: install_any.pm:432
 #, c-format
 msgid ""
 "The following packages will be removed to allow upgrading your system: %s\n"
@@ -5726,17 +5766,17 @@ msgstr ""
 "\n"
 "Kas tõesti eemaldada need paketid?\n"
 
-#: install_any.pm:812
+#: install_any.pm:827
 #, c-format
 msgid "Insert a FAT formatted floppy in drive %s"
-msgstr "Pange FAT-vormingus flopi seadmesse %s"
+msgstr "Pange FAT-vormingus diskett seadmesse %s"
 
-#: install_any.pm:816
+#: install_any.pm:831
 #, c-format
 msgid "This floppy is not FAT formatted"
-msgstr "See flopi ei ole FAT-vormingus"
+msgstr "See diskett ei ole FAT-vormingus"
 
-#: install_any.pm:828
+#: install_any.pm:843
 #, c-format
 msgid ""
 "To use this saved packages selection, boot installation with ``linux "
@@ -5745,12 +5785,12 @@ msgstr ""
 "Selle paketivaliku kasutamiseks alustage paigaldamist käsuga \"linux "
 "defcfg=floppy\""
 
-#: install_any.pm:856 partition_table.pm:845
+#: install_any.pm:871 partition_table.pm:847
 #, c-format
 msgid "Error reading file %s"
 msgstr "Viga faili %s lugemisel"
 
-#: install_any.pm:973
+#: install_any.pm:995
 #, c-format
 msgid ""
 "An error occurred - no valid devices were found on which to create new "
@@ -5875,12 +5915,12 @@ msgstr "Vaba ruumi arvutamine Windowsi partitsioonil"
 #, c-format
 msgid ""
 "Your Windows partition is too fragmented. Please reboot your computer under "
-"Windows, run the ``defrag'' utility, then restart the Mandrake Linux "
+"Windows, run the ``defrag'' utility, then restart the Mandrakelinux "
 "installation."
 msgstr ""
 "Teie Windowsi partitsioon on fragmenteerunud. Palun tehke arvutile uus "
 "alglaadimine, käivitage Windows ja seejärel utiliit 'defrag' ning tulge siis "
-"Mandrake Linuxi paigalduse juurde tagasi."
+"Mandrakelinuxi paigalduse juurde tagasi."
 
 #: install_interactive.pm:164
 #, c-format
@@ -5993,13 +6033,13 @@ msgstr "Võrgu seiskamine"
 msgid ""
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandrake "
-"Linux distribution \n"
+"The operating system and the different components available in the "
+"Mandrakelinux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrake Linux distribution.\n"
+"system and the different components of the Mandrakelinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6053,7 +6093,7 @@ msgid ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrake Linux sites  which are prohibited or restricted in some "
+"from one of Mandrakelinux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6090,7 +6130,7 @@ msgid ""
 "MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -6113,13 +6153,13 @@ msgstr ""
 "\n"
 "Introduction\n"
 "\n"
-"The operating system and the different components available in the Mandrake "
-"Linux distribution \n"
+"The operating system and the different components available in the "
+"Mandrakelinux distribution \n"
 "shall be called the \"Software Products\" hereafter. The Software Products "
 "include, but are not \n"
 "restricted to, the set of programs, methods, rules and documentation related "
 "to the operating \n"
-"system and the different components of the Mandrake Linux distribution.\n"
+"system and the different components of the Mandrakelinux distribution.\n"
 "\n"
 "\n"
 "1. License Agreement\n"
@@ -6173,7 +6213,7 @@ msgstr ""
 "loss) arising out \n"
 "of the possession and use of software components or arising out of  "
 "downloading software components \n"
-"from one of Mandrake Linux sites  which are prohibited or restricted in some "
+"from one of Mandrakelinux sites  which are prohibited or restricted in some "
 "countries by local laws.\n"
 "This limited liability applies to, but is not restricted to, the strong "
 "cryptography components \n"
@@ -6210,7 +6250,7 @@ msgstr ""
 "MandrakeSoft S.A. reserves its rights to modify or adapt the Software "
 "Products, as a whole or in \n"
 "parts, by all means and for all purposes.\n"
-"\"Mandrake\", \"Mandrake Linux\" and associated logos are trademarks of "
+"\"Mandrake\", \"Mandrakelinux\" and associated logos are trademarks of "
 "MandrakeSoft S.A.  \n"
 "\n"
 "\n"
@@ -6318,8 +6358,8 @@ msgid ""
 "Remove the boot media and press return to reboot.\n"
 "\n"
 "\n"
-"For information on fixes which are available for this release of Mandrake "
-"Linux,\n"
+"For information on fixes which are available for this release of "
+"Mandrakelinux,\n"
 "consult the Errata available from:\n"
 "\n"
 "\n"
@@ -6327,21 +6367,21 @@ msgid ""
 "\n"
 "\n"
 "Information on configuring your system is available in the post\n"
-"install chapter of the Official Mandrake Linux User's Guide."
+"install chapter of the Official Mandrakelinux User's Guide."
 msgstr ""
-"Õnnitlen, paigaldamine on edukalt lõpetatud.\n"
-"Võtke palun välja flopi ja/või CD ja vajutage Enter alglaadimiseks.\n"
+"Õnnitleme, paigaldamine on edukalt lõpetatud.\n"
+"Võtke palun välja diskett ja/või CD ja vajutage Enter alglaadimiseks.\n"
 "\n"
 "\n"
 "Informatsiooni selle distributsiooni paranduste kohta (Errata) saab\n"
-"Mandrake Linuxi koduleheküljelt:\n"
+"Mandrakelinuxi koduleheküljelt:\n"
 "\n"
 "\n"
 "%s\n"
 "\n"
 "\n"
 "Abi süsteemi edasiseks seadistamiseks saab eelkõige dokumendist\n"
-"\"Official Mandrake Linux User's Guide\"."
+"\"Mandrakelinux User's Guide\"."
 
 #: install_messages.pm:141
 #, c-format
@@ -6353,7 +6393,7 @@ msgstr "http://www.mandrakelinux.com/en/100errata.php3"
 msgid "Duplicate mount point %s"
 msgstr "Haakepunkt %s on määratud topelt"
 
-#: install_steps.pm:410
+#: install_steps.pm:406
 #, c-format
 msgid ""
 "Some important packages didn't get installed properly.\n"
@@ -6365,10 +6405,10 @@ msgstr ""
 "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:541
+#: install_steps.pm:535
 #, c-format
 msgid "No floppy drive available"
-msgstr "Flopiseade ei ole kättesaadav"
+msgstr "Disketiseade ei ole kättesaadav"
 
 #: install_steps_auto_install.pm:76 install_steps_stdio.pm:27
 #, c-format
@@ -6379,7 +6419,7 @@ msgstr "Järgmine samm: '%s'\n"
 #, c-format
 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 "
+"Mandrakelinux. If that occurs, you can try a text install instead. For "
 "this,\n"
 "press `F1' when booting on CDROM, then enter `text'."
 msgstr ""
@@ -6495,7 +6535,7 @@ msgstr "Näita automaatselt valitud pakette"
 #: install_steps_gtk.pm:433
 #, c-format
 msgid "Load/Save on floppy"
-msgstr "Laadi flopilt/Salvesta flopile"
+msgstr "Laadi disketilt/Salvesta disketile"
 
 #: install_steps_gtk.pm:434
 #, c-format
@@ -6565,7 +6605,7 @@ msgstr ""
 "Vahetage CD-ROM!\n"
 "\n"
 "Palun sisestage CD pealdisega \"%s\" lugejasse ja vajutage <Olgu>.\n"
-"Kui teil säherdust ei ole, vajutage <Loobu>."
+"Kui teil sellist ei ole, vajutage <Loobu>."
 
 #: install_steps_gtk.pm:612 install_steps_interactive.pm:710
 #, c-format
@@ -6583,8 +6623,8 @@ msgstr "Kas ikkagi jätkata?"
 msgid "There was an error installing packages:"
 msgstr "Pakettide paigaldamisel tekkis viga:"
 
-#: install_steps_gtk.pm:656 install_steps_interactive.pm:881
-#: install_steps_interactive.pm:1029
+#: install_steps_gtk.pm:656 install_steps_interactive.pm:882
+#: install_steps_interactive.pm:1034
 #, c-format
 msgid "not configured"
 msgstr "seadistamata"
@@ -6679,7 +6719,7 @@ msgstr "IDE"
 msgid "Configuring IDE"
 msgstr "IDE seadistamine"
 
-#: install_steps_interactive.pm:248 network/tools.pm:197
+#: install_steps_interactive.pm:248 network/tools.pm:195
 #, c-format
 msgid "No partition available"
 msgstr "Partitsioone ei leitud"
@@ -6762,18 +6802,18 @@ 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."
+"Valige palun paketivaliku laadimine või salvestamine disketil(t).\n"
+"Vorming on sama, mis automaatpaigaldusega loodud diskettide puhul."
 
 #: install_steps_interactive.pm:441
 #, c-format
 msgid "Load from floppy"
-msgstr "Laadi flopilt"
+msgstr "Laadi disketilt"
 
 #: install_steps_interactive.pm:441
 #, c-format
 msgid "Save on floppy"
-msgstr "Salvesta flopile"
+msgstr "Salvesta disketile"
 
 #: install_steps_interactive.pm:445
 #, c-format
@@ -6783,12 +6823,12 @@ msgstr "Pakettide valik"
 #: install_steps_interactive.pm:445
 #, c-format
 msgid "Loading from floppy"
-msgstr "Laadimine flopilt"
+msgstr "Laadimine disketilt"
 
 #: install_steps_interactive.pm:450
 #, c-format
 msgid "Insert a floppy containing package selection"
-msgstr "Sisestage palun paketivalikut sisaldav flopi"
+msgstr "Sisestage palun paketivalikut sisaldav diskett"
 
 #: install_steps_interactive.pm:533
 #, c-format
@@ -6872,12 +6912,12 @@ msgstr "Paigaldusjärgsed seadistused"
 #: install_steps_interactive.pm:734
 #, c-format
 msgid "Please insert the Boot floppy used in drive %s"
-msgstr "Pange palun alglaadimisflopi seadmesse %s"
+msgstr "Pange palun alglaadimisdiskett seadmesse %s"
 
 #: install_steps_interactive.pm:740
 #, c-format
 msgid "Please insert the Update Modules floppy in drive %s"
-msgstr "Pange palun moodulite uuendamise flopi seadmesse %s"
+msgstr "Pange palun moodulite uuendamise diskett seadmesse %s"
 
 #: install_steps_interactive.pm:761
 #, c-format
@@ -6892,7 +6932,7 @@ msgid ""
 "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"
+"pärast Mandrakelinuxi distributsiooni ilmumist ja võivad sisaldada vigade\n"
 "parandusi või turvauuendusi.\n"
 "\n"
 "Allalaadimiseks peab Teil olema töötav internetiühendus.\n"
@@ -6902,176 +6942,175 @@ msgstr ""
 #: install_steps_interactive.pm:782
 #, c-format
 msgid ""
-"Contacting Mandrake Linux web site to get the list of available mirrors..."
+"Contacting Mandrakelinux web site to get the list of available mirrors..."
 msgstr ""
-"Mandrake Linuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
+"Mandrakelinuxi veebisaidilt saadaolevate peeglite nimekirja hankimine..."
 
-#: install_steps_interactive.pm:786
+#: install_steps_interactive.pm:787
 #, c-format
 msgid "Choose a mirror from which to get the packages"
 msgstr "Valige peegel, millelt lugeda pakettide nimekiri"
 
-#: install_steps_interactive.pm:800
+#: install_steps_interactive.pm:801
 #, c-format
 msgid "Contacting the mirror to get the list of available packages..."
 msgstr "Peeglilt pakettide nimekirja lugemine..."
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Unable to contact mirror %s"
 msgstr "Ühendust peegliga %s ei saadud"
 
-#: install_steps_interactive.pm:804
+#: install_steps_interactive.pm:805
 #, c-format
 msgid "Would you like to try again?"
 msgstr "Kas soovite uuesti proovida?"
 
-#: install_steps_interactive.pm:830 standalone/drakclock:42
+#: install_steps_interactive.pm:831 standalone/drakclock:42
 #, c-format
 msgid "Which is your timezone?"
 msgstr "Millises ajavöötmes asute?"
 
-#: install_steps_interactive.pm:835
+#: install_steps_interactive.pm:836
 #, c-format
 msgid "Automatic time synchronization (using NTP)"
 msgstr "Aja automaatne sünkroniseerimine (NTP abil)"
 
-#: install_steps_interactive.pm:843
+#: install_steps_interactive.pm:844
 #, c-format
 msgid "NTP Server"
 msgstr "NTP server"
 
-#: install_steps_interactive.pm:885 steps.pm:30
+#: install_steps_interactive.pm:886 steps.pm:30
 #, c-format
 msgid "Summary"
 msgstr "Kokkuvõte"
 
-#: install_steps_interactive.pm:898 install_steps_interactive.pm:906
-#: install_steps_interactive.pm:920 install_steps_interactive.pm:927
-#: install_steps_interactive.pm:1076 services.pm:135
-#: standalone/drakbackup:1937
+#: install_steps_interactive.pm:899 install_steps_interactive.pm:907
+#: install_steps_interactive.pm:925 install_steps_interactive.pm:932
+#: install_steps_interactive.pm:1081 services.pm:135
+#: standalone/drakbackup:1663
 #, c-format
 msgid "System"
 msgstr "Süsteem"
 
-#: install_steps_interactive.pm:934 install_steps_interactive.pm:961
-#: install_steps_interactive.pm:978 install_steps_interactive.pm:994
-#: install_steps_interactive.pm:1005
+#: install_steps_interactive.pm:939 install_steps_interactive.pm:966
+#: install_steps_interactive.pm:983 install_steps_interactive.pm:999
+#: install_steps_interactive.pm:1010
 #, c-format
 msgid "Hardware"
 msgstr "Riistvara"
 
-#: install_steps_interactive.pm:940 install_steps_interactive.pm:949
+#: install_steps_interactive.pm:945 install_steps_interactive.pm:954
 #, c-format
 msgid "Remote CUPS server"
 msgstr "CUPS printserver"
 
-#: install_steps_interactive.pm:940
+#: install_steps_interactive.pm:945
 #, c-format
 msgid "No printer"
 msgstr "Printer puudub"
 
-#: install_steps_interactive.pm:982
+#: install_steps_interactive.pm:987
 #, c-format
 msgid "Do you have an ISA sound card?"
 msgstr "Kas Teil on ISA helikaart?"
 
-#: install_steps_interactive.pm:984
+#: install_steps_interactive.pm:989
 #, c-format
 msgid "Run \"sndconfig\" after installation to configure your sound card"
 msgstr "Helikaardi seadistamiseks käivitage pärast paigaldust \"sndconfig\""
 
-#: install_steps_interactive.pm:986
+#: install_steps_interactive.pm:991
 #, c-format
 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:1006
+#: install_steps_interactive.pm:1011
 #, c-format
 msgid "Graphical interface"
 msgstr "Graafiline kasutajaliides"
 
-#: install_steps_interactive.pm:1012 install_steps_interactive.pm:1027
+#: install_steps_interactive.pm:1017 install_steps_interactive.pm:1032
 #, c-format
 msgid "Network & Internet"
 msgstr "Kohtvõrk ja Internet"
 
-#: install_steps_interactive.pm:1028
+#: install_steps_interactive.pm:1033
 #, c-format
 msgid "Proxies"
 msgstr "Vahendajad"
 
-#: install_steps_interactive.pm:1029
+#: install_steps_interactive.pm:1034
 #, c-format
 msgid "configured"
 msgstr "seadistatud"
 
-#: install_steps_interactive.pm:1038 install_steps_interactive.pm:1052
+#: install_steps_interactive.pm:1043 install_steps_interactive.pm:1057
 #: steps.pm:20
 #, c-format
 msgid "Security"
 msgstr "Turvalisus"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "activated"
 msgstr "aktiveeritud"
 
-#: install_steps_interactive.pm:1057
+#: install_steps_interactive.pm:1062
 #, c-format
 msgid "disabled"
 msgstr "keelatud"
 
-#: install_steps_interactive.pm:1066
+#: install_steps_interactive.pm:1071
 #, c-format
 msgid "Boot"
 msgstr "Alglaadimine"
 
 #. -PO: example: lilo-graphic on /dev/hda1
-#: install_steps_interactive.pm:1070
+#: install_steps_interactive.pm:1075
 #, c-format
 msgid "%s on %s"
 msgstr "%s asukohas %s"
 
-#: install_steps_interactive.pm:1081 services.pm:177
+#: install_steps_interactive.pm:1086 services.pm:177
 #, c-format
 msgid "Services: %d activated for %d registered"
 msgstr "Teenused: %d aktiveeritud, kokku %d"
 
-#: install_steps_interactive.pm:1091
+#: install_steps_interactive.pm:1096
 #, c-format
 msgid "You have not configured X. Are you sure you really want this?"
 msgstr "Te ei ole seadistanud X-i. Kas Te tõesti ei taha seda teha?"
 
-#: install_steps_interactive.pm:1149
+#: install_steps_interactive.pm:1154
 #, c-format
 msgid "Set root password and network authentication methods"
 msgstr "Administraatori salasõna ja võrguautentimismeetodite määramine"
 
-#: install_steps_interactive.pm:1150
+#: install_steps_interactive.pm:1155
 #, c-format
 msgid "Set root password"
 msgstr "Juurkasutaja salasõna"
 
-#: install_steps_interactive.pm:1160
+#: install_steps_interactive.pm:1165
 #, c-format
 msgid "This password is too short (it must be at least %d characters long)"
 msgstr "Salasõna on liiga lühike (peaks olema vähemalt %d tähemärki)"
 
-#: install_steps_interactive.pm:1165 network/netconnect.pm:492
-#: standalone/drakauth:26 standalone/drakconnect:428
-#: standalone/drakconnect:917
+#: install_steps_interactive.pm:1170 network/netconnect.pm:563
+#: standalone/drakauth:26 standalone/drakconnect:451
 #, c-format
 msgid "Authentication"
 msgstr "Autentimisviis"
 
-#: install_steps_interactive.pm:1196
+#: install_steps_interactive.pm:1201
 #, c-format
 msgid "Preparing bootloader..."
 msgstr "Alglaaduri ettevalmistamine..."
 
-#: install_steps_interactive.pm:1206
+#: install_steps_interactive.pm:1211
 #, c-format
 msgid ""
 "You appear to have an OldWorld or Unknown\n"
@@ -7084,12 +7123,12 @@ msgstr ""
 "Paigaldus küll jätkub, aga masina käivitamiseks\n"
 " tuleb Teil kasutada BootX-i või mingit muud nippi"
 
-#: install_steps_interactive.pm:1212
+#: install_steps_interactive.pm:1217
 #, c-format
 msgid "Do you want to use aboot?"
 msgstr "Kas soovite kasutada aboot-i?"
 
-#: install_steps_interactive.pm:1215
+#: install_steps_interactive.pm:1220
 #, c-format
 msgid ""
 "Error installing aboot, \n"
@@ -7098,17 +7137,17 @@ msgstr ""
 "Viga aboot-i paigaldamisel, \n"
 "kas sundida peale, riskides esimese partitsiooni hävinguga?"
 
-#: install_steps_interactive.pm:1226
+#: install_steps_interactive.pm:1231
 #, c-format
 msgid "Installing bootloader"
 msgstr "Alglaaduri paigaldamine"
 
-#: install_steps_interactive.pm:1233
+#: install_steps_interactive.pm:1238
 #, c-format
 msgid "Installation of bootloader failed. The following error occured:"
 msgstr "Alglaaduri paigaldamine ebaõnnestus. Tekkis järgmine viga:"
 
-#: install_steps_interactive.pm:1238
+#: install_steps_interactive.pm:1243
 #, c-format
 msgid ""
 "You may need to change your Open Firmware boot-device to\n"
@@ -7125,24 +7164,31 @@ msgstr ""
 " Seejärel kirjutage: shut-down\n"
 "Järgmisel käivitusel peaksite nägema alglaaduri käsurida."
 
-#: install_steps_interactive.pm:1251
+#: install_steps_interactive.pm:1256
 #, c-format
 msgid ""
 "In this security level, access to the files in the Windows partition is "
 "restricted to the administrator."
 msgstr ""
+"Sellel turvatasemel pääseb Windowsi partitsioonil asuvatele failidele ligi "
+"ainult administraator."
 
-#: install_steps_interactive.pm:1283 standalone/drakautoinst:75
+#: install_steps_interactive.pm:1288 standalone/drakautoinst:76
 #, c-format
 msgid "Insert a blank floppy in drive %s"
-msgstr "Pange palun tühi flopi seadmesse %s"
+msgstr "Pange palun tühi diskett seadmesse %s"
+
+#: install_steps_interactive.pm:1293
+#, c-format
+msgid "Please insert another floppy for drivers disk"
+msgstr "Pange palun draiverite jaoks seadmesse uus diskett"
 
-#: install_steps_interactive.pm:1287
+#: install_steps_interactive.pm:1295
 #, c-format
 msgid "Creating auto install floppy..."
-msgstr "Kiirpaigaldusflopi loomine..."
+msgstr "Kiirpaigaldusdisketi loomine..."
 
-#: install_steps_interactive.pm:1298
+#: install_steps_interactive.pm:1307
 #, c-format
 msgid ""
 "Some steps are not completed.\n"
@@ -7153,12 +7199,12 @@ msgstr ""
 "\n"
 "Kas soovite tõesti praegu lõpetada ja väljuda?"
 
-#: install_steps_interactive.pm:1313
+#: install_steps_interactive.pm:1322
 #, c-format
 msgid "Generate auto install floppy"
-msgstr "Loo kiirpaigaldusflopi"
+msgstr "Loo kiirpaigaldusdiskett"
 
-#: install_steps_interactive.pm:1315
+#: install_steps_interactive.pm:1324
 #, c-format
 msgid ""
 "The auto install can be fully automated if wanted,\n"
@@ -7174,8 +7220,8 @@ msgstr ""
 
 #: install_steps_newt.pm:20
 #, c-format
-msgid "Mandrake Linux Installation %s"
-msgstr "Mandrake Linuxi paigaldamine %s"
+msgid "Mandrakelinux Installation %s"
+msgstr "Mandrakelinuxi paigaldamine %s"
 
 #: install_steps_newt.pm:33
 #, c-format
@@ -7194,7 +7240,7 @@ msgstr "Valige fail"
 msgid "Basic"
 msgstr "Põhiline"
 
-#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:509
+#: interactive.pm:403 interactive/newt.pm:308 ugtk2.pm:510
 #, c-format
 msgid "Finish"
 msgstr "Lõpeta"
@@ -7308,7 +7354,7 @@ msgstr "Soome"
 msgid "French"
 msgstr "Prantsuse"
 
-#: keyboard.pm:143 keyboard.pm:217
+#: keyboard.pm:143 keyboard.pm:220
 #, c-format
 msgid "Norwegian"
 msgstr "Norra"
@@ -7318,22 +7364,22 @@ msgstr "Norra"
 msgid "Polish"
 msgstr "Poola"
 
-#: keyboard.pm:145 keyboard.pm:226
+#: keyboard.pm:145 keyboard.pm:229
 #, c-format
 msgid "Russian"
 msgstr "Vene"
 
-#: keyboard.pm:147 keyboard.pm:230
+#: keyboard.pm:147 keyboard.pm:233
 #, c-format
 msgid "Swedish"
 msgstr "Rootsi"
 
-#: keyboard.pm:148 keyboard.pm:249
+#: keyboard.pm:148 keyboard.pm:252
 #, c-format
 msgid "UK keyboard"
 msgstr "Briti"
 
-#: keyboard.pm:149 keyboard.pm:250
+#: keyboard.pm:149 keyboard.pm:253
 #, c-format
 msgid "US keyboard"
 msgstr "USA"
@@ -7528,312 +7574,312 @@ msgstr "Itaalia"
 msgid "Inuktitut"
 msgstr "Inuktituti"
 
-#: keyboard.pm:197
+#: keyboard.pm:200
 #, c-format
 msgid "Japanese 106 keys"
 msgstr "Jaapani 106 klahviga"
 
-#: keyboard.pm:198
+#: keyboard.pm:201
 #, c-format
 msgid "Kannada"
 msgstr "Kannada"
 
-#: keyboard.pm:201
+#: keyboard.pm:204
 #, c-format
 msgid "Korean keyboard"
 msgstr "Korea"
 
-#: keyboard.pm:202
+#: keyboard.pm:205
 #, c-format
 msgid "Latin American"
 msgstr "Ladina-Ameerika"
 
-#: keyboard.pm:203
+#: keyboard.pm:206
 #, c-format
 msgid "Laotian"
 msgstr "Laose"
 
-#: keyboard.pm:204
+#: keyboard.pm:207
 #, c-format
 msgid "Lithuanian AZERTY (old)"
 msgstr "Leedu AZERTY (vanem)"
 
-#: keyboard.pm:206
+#: keyboard.pm:209
 #, c-format
 msgid "Lithuanian AZERTY (new)"
 msgstr "Leedu AZERTY (uuem)"
 
-#: keyboard.pm:207
+#: keyboard.pm:210
 #, c-format
 msgid "Lithuanian \"number row\" QWERTY"
 msgstr "Leedu \"numbrireaga\" QWERTY"
 
-#: keyboard.pm:208
+#: keyboard.pm:211
 #, c-format
 msgid "Lithuanian \"phonetic\" QWERTY"
 msgstr "Leedu \"foneetiline\" QWERTY"
 
-#: keyboard.pm:209
+#: keyboard.pm:212
 #, c-format
 msgid "Latvian"
 msgstr "Läti"
 
-#: keyboard.pm:210
+#: keyboard.pm:213
 #, c-format
 msgid "Malayalam"
 msgstr "Malajalami"
 
-#: keyboard.pm:211
+#: keyboard.pm:214
 #, c-format
 msgid "Macedonian"
 msgstr "Makedoonia"
 
-#: keyboard.pm:212
+#: keyboard.pm:215
 #, c-format
 msgid "Myanmar (Burmese)"
 msgstr "Myanmari (Birma)"
 
-#: keyboard.pm:213
+#: keyboard.pm:216
 #, c-format
 msgid "Mongolian (cyrillic)"
 msgstr "Mongoli (kirillitsa)"
 
-#: keyboard.pm:214
+#: keyboard.pm:217
 #, c-format
 msgid "Maltese (UK)"
 msgstr "Malta (briti)"
 
-#: keyboard.pm:215
+#: keyboard.pm:218
 #, c-format
 msgid "Maltese (US)"
 msgstr "Malta (USA)"
 
-#: keyboard.pm:216
+#: keyboard.pm:219
 #, c-format
 msgid "Dutch"
 msgstr "Hollandi"
 
-#: keyboard.pm:218
+#: keyboard.pm:221
 #, c-format
 msgid "Oriya"
 msgstr "Oria"
 
-#: keyboard.pm:219
+#: keyboard.pm:222
 #, c-format
 msgid "Polish (qwerty layout)"
 msgstr "Poola (QWERTY)"
 
-#: keyboard.pm:220
+#: keyboard.pm:223
 #, c-format
 msgid "Polish (qwertz layout)"
 msgstr "Poola (QWERTZ)"
 
-#: keyboard.pm:221
+#: keyboard.pm:224
 #, c-format
 msgid "Portuguese"
 msgstr "Portugali"
 
-#: keyboard.pm:222
+#: keyboard.pm:225
 #, c-format
 msgid "Canadian (Quebec)"
 msgstr "Kanada (Quebec)"
 
-#: keyboard.pm:224
+#: keyboard.pm:227
 #, c-format
 msgid "Romanian (qwertz)"
 msgstr "Rumeenia (QWERTZ)"
 
-#: keyboard.pm:225
+#: keyboard.pm:228
 #, c-format
 msgid "Romanian (qwerty)"
 msgstr "Rumeenia (QWERTY)"
 
-#: keyboard.pm:227
+#: keyboard.pm:230
 #, c-format
 msgid "Russian (Phonetic)"
 msgstr "Vene (foneetiline)"
 
-#: keyboard.pm:228
+#: keyboard.pm:231
 #, c-format
 msgid "Saami (norwegian)"
 msgstr "Saami (Norra)"
 
-#: keyboard.pm:229
+#: keyboard.pm:232
 #, c-format
 msgid "Saami (swedish/finnish)"
 msgstr "Saami (Rootsi/Soome)"
 
-#: keyboard.pm:231
+#: keyboard.pm:234
 #, c-format
 msgid "Slovenian"
 msgstr "Sloveenia"
 
-#: keyboard.pm:232
+#: keyboard.pm:235
 #, c-format
 msgid "Slovakian (QWERTZ)"
 msgstr "Slovaki (QWERTZ)"
 
-#: keyboard.pm:233
+#: keyboard.pm:236
 #, c-format
 msgid "Slovakian (QWERTY)"
 msgstr "Slovaki (QWERTY)"
 
-#: keyboard.pm:235
+#: keyboard.pm:238
 #, c-format
 msgid "Serbian (cyrillic)"
 msgstr "Serbia (kirillitsa)"
 
-#: keyboard.pm:236
+#: keyboard.pm:239
 #, c-format
 msgid "Syriac"
 msgstr "Süüria"
 
-#: keyboard.pm:237
+#: keyboard.pm:240
 #, c-format
 msgid "Syriac (phonetic)"
 msgstr "Süüria (foneetiline)"
 
-#: keyboard.pm:238
+#: keyboard.pm:241
 #, c-format
 msgid "Telugu"
 msgstr "Telugu"
 
-#: keyboard.pm:240
+#: keyboard.pm:243
 #, c-format
 msgid "Tamil (ISCII-layout)"
 msgstr "Tamili (ISCII)"
 
-#: keyboard.pm:241
+#: keyboard.pm:244
 #, c-format
 msgid "Tamil (Typewriter-layout)"
 msgstr "Tamili (kirjutusmasin)"
 
-#: keyboard.pm:242
+#: keyboard.pm:245
 #, c-format
 msgid "Thai keyboard"
 msgstr "Tai"
 
-#: keyboard.pm:244
+#: keyboard.pm:247
 #, c-format
 msgid "Tajik keyboard"
 msgstr "Tadžiki"
 
-#: keyboard.pm:245
+#: keyboard.pm:248
 #, c-format
 msgid "Turkish (traditional \"F\" model)"
 msgstr "Türgi (traditsiooniline \"F\" mudel)"
 
-#: keyboard.pm:246
+#: keyboard.pm:249
 #, c-format
 msgid "Turkish (modern \"Q\" model)"
 msgstr "Türgi (modernne \"Q\" mudel)"
 
-#: keyboard.pm:248
+#: keyboard.pm:251
 #, c-format
 msgid "Ukrainian"
 msgstr "Ukraina"
 
-#: keyboard.pm:251
+#: keyboard.pm:254
 #, c-format
 msgid "US keyboard (international)"
 msgstr "USA (rahvusvaheline)"
 
-#: keyboard.pm:252
+#: keyboard.pm:255
 #, c-format
 msgid "Uzbek (cyrillic)"
 msgstr "Usbeki (kirillitsa)"
 
-#: keyboard.pm:253
+#: keyboard.pm:256
 #, c-format
 msgid "Vietnamese \"numeric row\" QWERTY"
 msgstr "Vietnami \"numbrireaga\" QWERTY"
 
-#: keyboard.pm:254
+#: keyboard.pm:257
 #, c-format
 msgid "Yugoslavian (latin)"
 msgstr "Jugoslaavia (ladina)"
 
-#: keyboard.pm:261
+#: keyboard.pm:264
 #, c-format
 msgid "Right Alt key"
 msgstr "Parempoolne Alt-klahv"
 
-#: keyboard.pm:262
+#: keyboard.pm:265
 #, c-format
 msgid "Both Shift keys simultaneously"
 msgstr "Mõlemad Shift-klahvid korraga"
 
-#: keyboard.pm:263
+#: keyboard.pm:266
 #, c-format
 msgid "Control and Shift keys simultaneously"
 msgstr "Ctrl- ja Shift-klahvid korraga"
 
-#: keyboard.pm:264
+#: keyboard.pm:267
 #, c-format
 msgid "CapsLock key"
 msgstr "CapsLock-klahv"
 
-#: keyboard.pm:265
+#: keyboard.pm:268
 #, c-format
 msgid "Ctrl and Alt keys simultaneously"
 msgstr "Ctrl- ja Alt-klahvid korraga"
 
-#: keyboard.pm:266
+#: keyboard.pm:269
 #, c-format
 msgid "Alt and Shift keys simultaneously"
 msgstr "Alt- ja Shift-klahvid korraga"
 
-#: keyboard.pm:267
+#: keyboard.pm:270
 #, c-format
 msgid "\"Menu\" key"
 msgstr "\"Menüü\"-klahv"
 
-#: keyboard.pm:268
+#: keyboard.pm:271
 #, c-format
 msgid "Left \"Windows\" key"
 msgstr "Vasakpoolne \"Windows\"-klahv"
 
-#: keyboard.pm:269
+#: keyboard.pm:272
 #, c-format
 msgid "Right \"Windows\" key"
 msgstr "Parempoolne \"Windows\"-klahv"
 
-#: keyboard.pm:270
+#: keyboard.pm:273
 #, c-format
 msgid "Both Control keys simultaneously"
 msgstr "Mõlemad Ctrl-klahvid korraga"
 
-#: keyboard.pm:271
+#: keyboard.pm:274
 #, c-format
 msgid "Both Alt keys simultaneously"
 msgstr "Mõlemad Alt-klahvid korraga"
 
-#: keyboard.pm:272
+#: keyboard.pm:275
 #, c-format
 msgid "Left Shift key"
 msgstr "Vasakpoolne Shift-klahv"
 
-#: keyboard.pm:273
+#: keyboard.pm:276
 #, c-format
 msgid "Right Shift key"
 msgstr "Parempoolne Shift-klahv"
 
-#: keyboard.pm:274
+#: keyboard.pm:277
 #, c-format
 msgid "Left Alt key"
 msgstr "Vasakpoolne Alt-klahv"
 
-#: keyboard.pm:275
+#: keyboard.pm:278
 #, c-format
 msgid "Left Control key"
 msgstr "Vasakpoolne Ctrl-klahv"
 
-#: keyboard.pm:276
+#: keyboard.pm:279
 #, c-format
 msgid "Right Control key"
 msgstr "Parempoolne Ctrl-klahv"
 
-#: keyboard.pm:307
+#: keyboard.pm:310
 #, c-format
 msgid ""
 "Here you can choose the key or key combination that will \n"
@@ -7843,7 +7889,7 @@ msgstr ""
 "Siin saab valida klahvi või klahvikombinatsiooni, mis laseb\n"
 "vahetada klaviatuuri (nt. ladina ja mitte-ladina tähestikuga)"
 
-#: keyboard.pm:312
+#: keyboard.pm:315
 #, c-format
 msgid ""
 "This setting will be activated after the installation.\n"
@@ -7854,1144 +7900,1144 @@ msgstr ""
 "Paigalduse ajal tuleb erinevate klaviatuuripaigutuste\n"
 "vahel liikumiseks kasutada parempoolset Ctrl-klahvi."
 
-#: lang.pm:144
+#: lang.pm:149
 #, c-format
 msgid "default:LTR"
-msgstr "vaikimisi:LTR"
+msgstr "default:LTR"
 
-#: lang.pm:160
+#: lang.pm:165
 #, c-format
 msgid "Afghanistan"
 msgstr "Afganistan"
 
-#: lang.pm:161
+#: lang.pm:166
 #, c-format
 msgid "Andorra"
 msgstr "Andorra"
 
-#: lang.pm:162
+#: lang.pm:167
 #, c-format
 msgid "United Arab Emirates"
 msgstr "Araabia Ühendemiraadid"
 
-#: lang.pm:163
+#: lang.pm:168
 #, c-format
 msgid "Antigua and Barbuda"
 msgstr "Antigua ja Barbuda"
 
-#: lang.pm:164
+#: lang.pm:169
 #, c-format
 msgid "Anguilla"
 msgstr "Anguilla"
 
-#: lang.pm:165
+#: lang.pm:170
 #, c-format
 msgid "Albania"
 msgstr "Albaania"
 
-#: lang.pm:166
+#: lang.pm:171
 #, c-format
 msgid "Armenia"
 msgstr "Armeenia"
 
-#: lang.pm:167
+#: lang.pm:172
 #, c-format
 msgid "Netherlands Antilles"
 msgstr "Hollandi Antillid"
 
-#: lang.pm:168
+#: lang.pm:173
 #, c-format
 msgid "Angola"
 msgstr "Angola"
 
-#: lang.pm:169
+#: lang.pm:174
 #, c-format
 msgid "Antarctica"
 msgstr "Antarktika"
 
-#: lang.pm:170 standalone/drakxtv:51
+#: lang.pm:175 standalone/drakxtv:51
 #, c-format
 msgid "Argentina"
 msgstr "Argentina"
 
-#: lang.pm:171
+#: lang.pm:176
 #, c-format
 msgid "American Samoa"
 msgstr "Ameerika Samoa"
 
-#: lang.pm:173 standalone/drakxtv:49
+#: lang.pm:178 network/adsl_consts.pm:20 standalone/drakxtv:49
 #, c-format
 msgid "Australia"
 msgstr "Austraalia"
 
-#: lang.pm:174
+#: lang.pm:179
 #, c-format
 msgid "Aruba"
 msgstr "Aruba"
 
-#: lang.pm:175
+#: lang.pm:180
 #, c-format
 msgid "Azerbaijan"
 msgstr "Aserbaidžaan"
 
-#: lang.pm:176
+#: lang.pm:181
 #, c-format
 msgid "Bosnia and Herzegovina"
 msgstr "Bosnia ja Hertsegoviina"
 
-#: lang.pm:177
+#: lang.pm:182
 #, c-format
 msgid "Barbados"
 msgstr "Barbados"
 
-#: lang.pm:178
+#: lang.pm:183
 #, c-format
 msgid "Bangladesh"
 msgstr "Bangladesh"
 
-#: lang.pm:180
+#: lang.pm:185
 #, c-format
 msgid "Burkina Faso"
 msgstr "Burkina Faso"
 
-#: lang.pm:181
+#: lang.pm:186
 #, c-format
 msgid "Bulgaria"
 msgstr "Bulgaaria"
 
-#: lang.pm:182
+#: lang.pm:187
 #, c-format
 msgid "Bahrain"
 msgstr "Bahrein"
 
-#: lang.pm:183
+#: lang.pm:188
 #, c-format
 msgid "Burundi"
 msgstr "Burundi"
 
-#: lang.pm:184
+#: lang.pm:189
 #, c-format
 msgid "Benin"
 msgstr "Benin"
 
-#: lang.pm:185
+#: lang.pm:190
 #, c-format
 msgid "Bermuda"
 msgstr "Bermuda"
 
-#: lang.pm:186
+#: lang.pm:191
 #, c-format
 msgid "Brunei Darussalam"
 msgstr "Brunei"
 
-#: lang.pm:187
+#: lang.pm:192
 #, c-format
 msgid "Bolivia"
 msgstr "Boliivia"
 
-#: lang.pm:188
+#: lang.pm:193
 #, c-format
 msgid "Brazil"
 msgstr "Brasiilia"
 
-#: lang.pm:189
+#: lang.pm:194
 #, c-format
 msgid "Bahamas"
 msgstr "Bahama saared"
 
-#: lang.pm:190
+#: lang.pm:195
 #, c-format
 msgid "Bhutan"
 msgstr "Bhutan"
 
-#: lang.pm:191
+#: lang.pm:196
 #, c-format
 msgid "Bouvet Island"
 msgstr "Bouvet' saar"
 
-#: lang.pm:192
+#: lang.pm:197
 #, c-format
 msgid "Botswana"
 msgstr "Botswana"
 
-#: lang.pm:193
+#: lang.pm:198
 #, c-format
 msgid "Belarus"
 msgstr "Valgevene"
 
-#: lang.pm:194
+#: lang.pm:199
 #, c-format
 msgid "Belize"
 msgstr "Belize"
 
-#: lang.pm:195
+#: lang.pm:200
 #, c-format
 msgid "Canada"
 msgstr "Kanada"
 
-#: lang.pm:196
+#: lang.pm:201
 #, c-format
 msgid "Cocos (Keeling) Islands"
 msgstr "Kookosesaared"
 
-#: lang.pm:197
+#: lang.pm:202
 #, c-format
 msgid "Congo (Kinshasa)"
 msgstr "Kongo (Kinshasa)"
 
-#: lang.pm:198
+#: lang.pm:203
 #, c-format
 msgid "Central African Republic"
 msgstr "Kesk-Aafrika Vabariik"
 
-#: lang.pm:199
+#: lang.pm:204
 #, c-format
 msgid "Congo (Brazzaville)"
 msgstr "Kongo (Brazzaville)"
 
-#: lang.pm:200
+#: lang.pm:205
 #, c-format
 msgid "Switzerland"
 msgstr "Šveits"
 
-#: lang.pm:201
+#: lang.pm:206
 #, c-format
 msgid "Cote d'Ivoire"
 msgstr "Cote d'Ivoire"
 
-#: lang.pm:202
+#: lang.pm:207
 #, c-format
 msgid "Cook Islands"
 msgstr "Cooki saared"
 
-#: lang.pm:203
+#: lang.pm:208
 #, c-format
 msgid "Chile"
 msgstr "Tšiili"
 
-#: lang.pm:204
+#: lang.pm:209
 #, c-format
 msgid "Cameroon"
 msgstr "Kamerun"
 
-#: lang.pm:205
+#: lang.pm:210
 #, c-format
 msgid "China"
 msgstr "Hiina"
 
-#: lang.pm:206
+#: lang.pm:211
 #, c-format
 msgid "Colombia"
 msgstr "Colombia"
 
-#: lang.pm:208
+#: lang.pm:213
 #, c-format
 msgid "Cuba"
 msgstr "Kuuba"
 
-#: lang.pm:209
+#: lang.pm:214
 #, c-format
 msgid "Cape Verde"
 msgstr "Cabo Verde"
 
-#: lang.pm:210
+#: lang.pm:215
 #, c-format
 msgid "Christmas Island"
 msgstr "Jõulusaar"
 
-#: lang.pm:211
+#: lang.pm:216
 #, c-format
 msgid "Cyprus"
 msgstr "Küpros"
 
-#: lang.pm:214
+#: lang.pm:219
 #, c-format
 msgid "Djibouti"
 msgstr "Djibouti"
 
-#: lang.pm:215
+#: lang.pm:220
 #, c-format
 msgid "Denmark"
 msgstr "Taani"
 
-#: lang.pm:216
+#: lang.pm:221
 #, c-format
 msgid "Dominica"
 msgstr "Dominica"
 
-#: lang.pm:217
+#: lang.pm:222
 #, c-format
 msgid "Dominican Republic"
 msgstr "Dominikaani Vabariik"
 
-#: lang.pm:218
+#: lang.pm:223
 #, c-format
 msgid "Algeria"
 msgstr "Alžeeria"
 
-#: lang.pm:219
+#: lang.pm:224
 #, c-format
 msgid "Ecuador"
 msgstr "Ecuador"
 
-#: lang.pm:220
+#: lang.pm:225
 #, c-format
 msgid "Estonia"
 msgstr "Eesti"
 
-#: lang.pm:221
+#: lang.pm:226
 #, c-format
 msgid "Egypt"
 msgstr "Egiptus"
 
-#: lang.pm:222
+#: lang.pm:227
 #, c-format
 msgid "Western Sahara"
 msgstr "Lääne-Sahara"
 
-#: lang.pm:223
+#: lang.pm:228
 #, c-format
 msgid "Eritrea"
 msgstr "Eritrea"
 
-#: lang.pm:224 network/adsl_consts.pm:193 network/adsl_consts.pm:200
-#: network/adsl_consts.pm:209 network/adsl_consts.pm:220
+#: lang.pm:229 network/adsl_consts.pm:202 network/adsl_consts.pm:210
+#: network/adsl_consts.pm:219 network/adsl_consts.pm:230
 #, c-format
 msgid "Spain"
 msgstr "Hispaania"
 
-#: lang.pm:225
+#: lang.pm:230
 #, c-format
 msgid "Ethiopia"
 msgstr "Etioopia"
 
-#: lang.pm:226 network/adsl_consts.pm:119
+#: lang.pm:231 network/adsl_consts.pm:127
 #, c-format
 msgid "Finland"
 msgstr "Soome"
 
-#: lang.pm:227
+#: lang.pm:232
 #, c-format
 msgid "Fiji"
 msgstr "Fidži"
 
-#: lang.pm:228
+#: lang.pm:233
 #, c-format
 msgid "Falkland Islands (Malvinas)"
 msgstr "Falklandi saared (Malviinid)"
 
-#: lang.pm:229
+#: lang.pm:234
 #, c-format
 msgid "Micronesia"
 msgstr "Mikroneesia"
 
-#: lang.pm:230
+#: lang.pm:235
 #, c-format
 msgid "Faroe Islands"
 msgstr "Fääri saared"
 
-#: lang.pm:232
+#: lang.pm:237
 #, c-format
 msgid "Gabon"
 msgstr "Gabon"
 
-#: lang.pm:233 network/adsl_consts.pm:237 network/adsl_consts.pm:244
+#: lang.pm:238 network/adsl_consts.pm:247 network/adsl_consts.pm:255
 #: network/netconnect.pm:51
 #, c-format
 msgid "United Kingdom"
 msgstr "Suurbritannia"
 
-#: lang.pm:234
+#: lang.pm:239
 #, c-format
 msgid "Grenada"
 msgstr "Grenada"
 
-#: lang.pm:235
+#: lang.pm:240
 #, c-format
 msgid "Georgia"
 msgstr "Gruusia"
 
-#: lang.pm:236
+#: lang.pm:241
 #, c-format
 msgid "French Guiana"
 msgstr "Prantsuse Guajaana"
 
-#: lang.pm:237
+#: lang.pm:242
 #, c-format
 msgid "Ghana"
 msgstr "Ghana"
 
-#: lang.pm:238
+#: lang.pm:243
 #, c-format
 msgid "Gibraltar"
 msgstr "Gibraltar"
 
-#: lang.pm:239
+#: lang.pm:244
 #, c-format
 msgid "Greenland"
 msgstr "Gröönimaa"
 
-#: lang.pm:240
+#: lang.pm:245
 #, c-format
 msgid "Gambia"
 msgstr "Gambia"
 
-#: lang.pm:241
+#: lang.pm:246
 #, c-format
 msgid "Guinea"
 msgstr "Guinea"
 
-#: lang.pm:242
+#: lang.pm:247
 #, c-format
 msgid "Guadeloupe"
 msgstr "Guadeloupe"
 
-#: lang.pm:243
+#: lang.pm:248
 #, c-format
 msgid "Equatorial Guinea"
 msgstr "Ekvatoriaal-Guinea"
 
-#: lang.pm:245
+#: lang.pm:250
 #, c-format
 msgid "South Georgia and the South Sandwich Islands"
 msgstr "Lõuna-Georgia ja Lõuna-Sandwichi saared"
 
-#: lang.pm:246
+#: lang.pm:251
 #, c-format
 msgid "Guatemala"
 msgstr "Guatemala"
 
-#: lang.pm:247
+#: lang.pm:252
 #, c-format
 msgid "Guam"
 msgstr "Guam"
 
-#: lang.pm:248
+#: lang.pm:253
 #, c-format
 msgid "Guinea-Bissau"
 msgstr "Guinea-Bissau"
 
-#: lang.pm:249
+#: lang.pm:254
 #, c-format
 msgid "Guyana"
 msgstr "Guyana"
 
-#: lang.pm:250
+#: lang.pm:255
 #, c-format
 msgid "China (Hong Kong)"
 msgstr "Hiina (Hongkong)"
 
-#: lang.pm:251
+#: lang.pm:256
 #, c-format
 msgid "Heard and McDonald Islands"
 msgstr "Heard ja McDonald"
 
-#: lang.pm:252
+#: lang.pm:257
 #, c-format
 msgid "Honduras"
 msgstr "Honduras"
 
-#: lang.pm:253
+#: lang.pm:258
 #, c-format
 msgid "Croatia"
 msgstr "Horvaatia"
 
-#: lang.pm:254
+#: lang.pm:259
 #, c-format
 msgid "Haiti"
 msgstr "Haiti"
 
-#: lang.pm:255 network/adsl_consts.pm:144
+#: lang.pm:260 network/adsl_consts.pm:152
 #, c-format
 msgid "Hungary"
 msgstr "Ungari"
 
-#: lang.pm:256
+#: lang.pm:261
 #, c-format
 msgid "Indonesia"
 msgstr "Indoneesia"
 
-#: lang.pm:257 standalone/drakxtv:48
+#: lang.pm:262 standalone/drakxtv:48
 #, c-format
 msgid "Ireland"
 msgstr "Iirimaa"
 
-#: lang.pm:258
+#: lang.pm:263
 #, c-format
 msgid "Israel"
 msgstr "Iisrael"
 
-#: lang.pm:259
+#: lang.pm:264
 #, c-format
 msgid "India"
 msgstr "India"
 
-#: lang.pm:260
+#: lang.pm:265
 #, c-format
 msgid "British Indian Ocean Territory"
 msgstr "Briti India ookeani ala"
 
-#: lang.pm:261
+#: lang.pm:266
 #, c-format
 msgid "Iraq"
 msgstr "Iraak"
 
-#: lang.pm:262
+#: lang.pm:267
 #, c-format
 msgid "Iran"
 msgstr "Iraan"
 
-#: lang.pm:263
+#: lang.pm:268
 #, c-format
 msgid "Iceland"
 msgstr "Island"
 
-#: lang.pm:265
+#: lang.pm:270
 #, c-format
 msgid "Jamaica"
 msgstr "Jamaica"
 
-#: lang.pm:266
+#: lang.pm:271
 #, c-format
 msgid "Jordan"
 msgstr "Jordaania"
 
-#: lang.pm:267
+#: lang.pm:272
 #, c-format
 msgid "Japan"
 msgstr "Jaapan"
 
-#: lang.pm:268
+#: lang.pm:273
 #, c-format
 msgid "Kenya"
 msgstr "Keenia"
 
-#: lang.pm:269
+#: lang.pm:274
 #, c-format
 msgid "Kyrgyzstan"
 msgstr "Kõrgõzstan"
 
-#: lang.pm:270
+#: lang.pm:275
 #, c-format
 msgid "Cambodia"
 msgstr "Kambodža"
 
-#: lang.pm:271
+#: lang.pm:276
 #, c-format
 msgid "Kiribati"
 msgstr "Kiribati"
 
-#: lang.pm:272
+#: lang.pm:277
 #, c-format
 msgid "Comoros"
 msgstr "Komoorid"
 
-#: lang.pm:273
+#: lang.pm:278
 #, c-format
 msgid "Saint Kitts and Nevis"
 msgstr "Saint Kitts ja Nevis"
 
-#: lang.pm:274
+#: lang.pm:279
 #, c-format
 msgid "Korea (North)"
 msgstr "Põhja-Korea"
 
-#: lang.pm:275
+#: lang.pm:280
 #, c-format
 msgid "Korea"
 msgstr "Korea"
 
-#: lang.pm:276
+#: lang.pm:281
 #, c-format
 msgid "Kuwait"
 msgstr "Kuveit"
 
-#: lang.pm:277
+#: lang.pm:282
 #, c-format
 msgid "Cayman Islands"
 msgstr "Kaimanisaared"
 
-#: lang.pm:278
+#: lang.pm:283
 #, c-format
 msgid "Kazakhstan"
 msgstr "Kasahstan"
 
-#: lang.pm:279
+#: lang.pm:284
 #, c-format
 msgid "Laos"
 msgstr "Laos"
 
-#: lang.pm:280
+#: lang.pm:285
 #, c-format
 msgid "Lebanon"
 msgstr "Liibanon"
 
-#: lang.pm:281
+#: lang.pm:286
 #, c-format
 msgid "Saint Lucia"
 msgstr "Saint Lucia"
 
-#: lang.pm:282
+#: lang.pm:287
 #, c-format
 msgid "Liechtenstein"
 msgstr "Liechtenstein"
 
-#: lang.pm:283
+#: lang.pm:288
 #, c-format
 msgid "Sri Lanka"
 msgstr "Sri Lanka"
 
-#: lang.pm:284
+#: lang.pm:289
 #, c-format
 msgid "Liberia"
 msgstr "Libeeria"
 
-#: lang.pm:285
+#: lang.pm:290
 #, c-format
 msgid "Lesotho"
 msgstr "Lesotho"
 
-#: lang.pm:286
+#: lang.pm:291
 #, c-format
 msgid "Lithuania"
 msgstr "Leedu"
 
-#: lang.pm:287
+#: lang.pm:292
 #, c-format
 msgid "Luxembourg"
 msgstr "Luksemburg"
 
-#: lang.pm:288
+#: lang.pm:293
 #, c-format
 msgid "Latvia"
 msgstr "Läti"
 
-#: lang.pm:289
+#: lang.pm:294
 #, c-format
 msgid "Libya"
 msgstr "Liibüa"
 
-#: lang.pm:290
+#: lang.pm:295
 #, c-format
 msgid "Morocco"
 msgstr "Maroko"
 
-#: lang.pm:291
+#: lang.pm:296
 #, c-format
 msgid "Monaco"
 msgstr "Monaco"
 
-#: lang.pm:292
+#: lang.pm:297
 #, c-format
 msgid "Moldova"
 msgstr "Moldova"
 
-#: lang.pm:293
+#: lang.pm:298
 #, c-format
 msgid "Madagascar"
 msgstr "Madagaskar"
 
-#: lang.pm:294
+#: lang.pm:299
 #, c-format
 msgid "Marshall Islands"
 msgstr "Marshalli saared"
 
-#: lang.pm:295
+#: lang.pm:300
 #, c-format
 msgid "Macedonia"
 msgstr "Makedoonia"
 
-#: lang.pm:296
+#: lang.pm:301
 #, c-format
 msgid "Mali"
 msgstr "Mali"
 
-#: lang.pm:297
+#: lang.pm:302
 #, c-format
 msgid "Myanmar"
 msgstr "Myanmar"
 
-#: lang.pm:298
+#: lang.pm:303
 #, c-format
 msgid "Mongolia"
 msgstr "Mongoolia"
 
-#: lang.pm:299
+#: lang.pm:304
 #, c-format
 msgid "Northern Mariana Islands"
 msgstr "Põhja-Mariaani saared"
 
-#: lang.pm:300
+#: lang.pm:305
 #, c-format
 msgid "Martinique"
 msgstr "Martinique"
 
-#: lang.pm:301
+#: lang.pm:306
 #, c-format
 msgid "Mauritania"
 msgstr "Mauritaania"
 
-#: lang.pm:302
+#: lang.pm:307
 #, c-format
 msgid "Montserrat"
 msgstr "Montserrat"
 
-#: lang.pm:303
+#: lang.pm:308
 #, c-format
 msgid "Malta"
 msgstr "Malta"
 
-#: lang.pm:304
+#: lang.pm:309
 #, c-format
 msgid "Mauritius"
 msgstr "Mauritius"
 
-#: lang.pm:305
+#: lang.pm:310
 #, c-format
 msgid "Maldives"
 msgstr "Maldiivid"
 
-#: lang.pm:306
+#: lang.pm:311
 #, c-format
 msgid "Malawi"
 msgstr "Malawi"
 
-#: lang.pm:307
+#: lang.pm:312
 #, c-format
 msgid "Mexico"
 msgstr "Mehhiko"
 
-#: lang.pm:308
+#: lang.pm:313
 #, c-format
 msgid "Malaysia"
 msgstr "Malaisia"
 
-#: lang.pm:309
+#: lang.pm:314
 #, c-format
 msgid "Mozambique"
 msgstr "Mosambiik"
 
-#: lang.pm:310
+#: lang.pm:315
 #, c-format
 msgid "Namibia"
 msgstr "Namiibia"
 
-#: lang.pm:311
+#: lang.pm:316
 #, c-format
 msgid "New Caledonia"
 msgstr "Uus-Kaledoonia"
 
-#: lang.pm:312
+#: lang.pm:317
 #, c-format
 msgid "Niger"
 msgstr "Niger"
 
-#: lang.pm:313
+#: lang.pm:318
 #, c-format
 msgid "Norfolk Island"
 msgstr "Norfolki saar"
 
-#: lang.pm:314
+#: lang.pm:319
 #, c-format
 msgid "Nigeria"
 msgstr "Nigeeria"
 
-#: lang.pm:315
+#: lang.pm:320
 #, c-format
 msgid "Nicaragua"
 msgstr "Nicaragua"
 
-#: lang.pm:318
+#: lang.pm:323
 #, c-format
 msgid "Nepal"
 msgstr "Nepal"
 
-#: lang.pm:319
+#: lang.pm:324
 #, c-format
 msgid "Nauru"
 msgstr "Nauru"
 
-#: lang.pm:320
+#: lang.pm:325
 #, c-format
 msgid "Niue"
 msgstr "Niue"
 
-#: lang.pm:321
+#: lang.pm:326
 #, c-format
 msgid "New Zealand"
 msgstr "Uus-Meremaa"
 
-#: lang.pm:322
+#: lang.pm:327
 #, c-format
 msgid "Oman"
 msgstr "Omaan"
 
-#: lang.pm:323
+#: lang.pm:328
 #, c-format
 msgid "Panama"
 msgstr "Panama"
 
-#: lang.pm:324
+#: lang.pm:329
 #, c-format
 msgid "Peru"
 msgstr "Peruu"
 
-#: lang.pm:325
+#: lang.pm:330
 #, c-format
 msgid "French Polynesia"
 msgstr "Prantsuse Polüneesia"
 
-#: lang.pm:326
+#: lang.pm:331
 #, c-format
 msgid "Papua New Guinea"
 msgstr "Paapua Uus-Guinea"
 
-#: lang.pm:327
+#: lang.pm:332
 #, c-format
 msgid "Philippines"
 msgstr "Filipiinid"
 
-#: lang.pm:328
+#: lang.pm:333
 #, c-format
 msgid "Pakistan"
 msgstr "Pakistan"
 
-#: lang.pm:329 network/adsl_consts.pm:177
+#: lang.pm:334 network/adsl_consts.pm:186
 #, c-format
 msgid "Poland"
 msgstr "Poola"
 
-#: lang.pm:330
+#: lang.pm:335
 #, c-format
 msgid "Saint Pierre and Miquelon"
 msgstr "Saint Pierre ja Miquelon"
 
-#: lang.pm:331
+#: lang.pm:336
 #, c-format
 msgid "Pitcairn"
 msgstr "Pitcairn"
 
-#: lang.pm:332
+#: lang.pm:337
 #, c-format
 msgid "Puerto Rico"
 msgstr "Puerto Rico"
 
-#: lang.pm:333
+#: lang.pm:338
 #, c-format
 msgid "Palestine"
 msgstr "Palestiina"
 
-#: lang.pm:334 network/adsl_consts.pm:187
+#: lang.pm:339 network/adsl_consts.pm:196
 #, c-format
 msgid "Portugal"
 msgstr "Portugal"
 
-#: lang.pm:335
+#: lang.pm:340
 #, c-format
 msgid "Paraguay"
 msgstr "Paraguay"
 
-#: lang.pm:336
+#: lang.pm:341
 #, c-format
 msgid "Palau"
 msgstr "Belau"
 
-#: lang.pm:337
+#: lang.pm:342
 #, c-format
 msgid "Qatar"
 msgstr "Katar"
 
-#: lang.pm:338
+#: lang.pm:343
 #, c-format
 msgid "Reunion"
 msgstr "Réunion"
 
-#: lang.pm:339
+#: lang.pm:344
 #, c-format
 msgid "Romania"
 msgstr "Rumeenia"
 
-#: lang.pm:340
+#: lang.pm:345
 #, c-format
 msgid "Russia"
 msgstr "Venemaa"
 
-#: lang.pm:341
+#: lang.pm:346
 #, c-format
 msgid "Rwanda"
 msgstr "Rwanda"
 
-#: lang.pm:342
+#: lang.pm:347
 #, c-format
 msgid "Saudi Arabia"
 msgstr "Saudi Araabia"
 
-#: lang.pm:343
+#: lang.pm:348
 #, c-format
 msgid "Solomon Islands"
 msgstr "Saalomoni saared"
 
-#: lang.pm:344
+#: lang.pm:349
 #, c-format
 msgid "Seychelles"
 msgstr "Seišellid"
 
-#: lang.pm:345
+#: lang.pm:350
 #, c-format
 msgid "Sudan"
 msgstr "Sudaan"
 
-#: lang.pm:347
+#: lang.pm:352
 #, c-format
 msgid "Singapore"
 msgstr "Singapur"
 
-#: lang.pm:348
+#: lang.pm:353
 #, c-format
 msgid "Saint Helena"
 msgstr "Saint Helena"
 
-#: lang.pm:349
+#: lang.pm:354
 #, c-format
 msgid "Slovenia"
 msgstr "Sloveenia"
 
-#: lang.pm:350
+#: lang.pm:355
 #, c-format
 msgid "Svalbard and Jan Mayen Islands"
 msgstr "Svalbard ja Jan Mayen"
 
-#: lang.pm:351
+#: lang.pm:356
 #, c-format
 msgid "Slovakia"
 msgstr "Slovakkia"
 
-#: lang.pm:352
+#: lang.pm:357
 #, c-format
 msgid "Sierra Leone"
 msgstr "Sierra Leone"
 
-#: lang.pm:353
+#: lang.pm:358
 #, c-format
 msgid "San Marino"
 msgstr "San Marino"
 
-#: lang.pm:354
+#: lang.pm:359
 #, c-format
 msgid "Senegal"
 msgstr "Senegal"
 
-#: lang.pm:355
+#: lang.pm:360
 #, c-format
 msgid "Somalia"
 msgstr "Somaalia"
 
-#: lang.pm:356
+#: lang.pm:361
 #, c-format
 msgid "Suriname"
 msgstr "Suriname"
 
-#: lang.pm:357
+#: lang.pm:362
 #, c-format
 msgid "Sao Tome and Principe"
 msgstr "Sao Tomé ja Principe"
 
-#: lang.pm:358
+#: lang.pm:363
 #, c-format
 msgid "El Salvador"
 msgstr "El Salvador"
 
-#: lang.pm:359
+#: lang.pm:364
 #, c-format
 msgid "Syria"
 msgstr "Süüria"
 
-#: lang.pm:360
+#: lang.pm:365
 #, c-format
 msgid "Swaziland"
 msgstr "Svaasimaa"
 
-#: lang.pm:361
+#: lang.pm:366
 #, c-format
 msgid "Turks and Caicos Islands"
 msgstr "Turks ja Caicos"
 
-#: lang.pm:362
+#: lang.pm:367
 #, c-format
 msgid "Chad"
 msgstr "Tšaad"
 
-#: lang.pm:363
+#: lang.pm:368
 #, c-format
 msgid "French Southern Territories"
 msgstr "Prantsuse Lõunaalad"
 
-#: lang.pm:364
+#: lang.pm:369
 #, c-format
 msgid "Togo"
 msgstr "Togo"
 
-#: lang.pm:365
+#: lang.pm:370
 #, c-format
 msgid "Thailand"
 msgstr "Tai"
 
-#: lang.pm:366
+#: lang.pm:371
 #, c-format
 msgid "Tajikistan"
 msgstr "Tadžikistan"
 
-#: lang.pm:367
+#: lang.pm:372
 #, c-format
 msgid "Tokelau"
 msgstr "Tokelau"
 
-#: lang.pm:368
+#: lang.pm:373
 #, c-format
 msgid "East Timor"
 msgstr "Ida-Timor"
 
-#: lang.pm:369
+#: lang.pm:374
 #, c-format
 msgid "Turkmenistan"
 msgstr "Türkmenistan"
 
-#: lang.pm:370
+#: lang.pm:375
 #, c-format
 msgid "Tunisia"
 msgstr "Tuneesia"
 
-#: lang.pm:371
+#: lang.pm:376
 #, c-format
 msgid "Tonga"
 msgstr "Tonga"
 
-#: lang.pm:372
+#: lang.pm:377
 #, c-format
 msgid "Turkey"
 msgstr "Türgi"
 
-#: lang.pm:373
+#: lang.pm:378
 #, c-format
 msgid "Trinidad and Tobago"
 msgstr "Trinidad ja Tobago"
 
-#: lang.pm:374
+#: lang.pm:379
 #, c-format
 msgid "Tuvalu"
 msgstr "Tuvalu"
 
-#: lang.pm:375
+#: lang.pm:380
 #, c-format
 msgid "Taiwan"
 msgstr "Taiwan"
 
-#: lang.pm:376
+#: lang.pm:381
 #, c-format
 msgid "Tanzania"
 msgstr "Tansaania"
 
-#: lang.pm:377
+#: lang.pm:382
 #, c-format
 msgid "Ukraine"
 msgstr "Ukraina"
 
-#: lang.pm:378
+#: lang.pm:383
 #, c-format
 msgid "Uganda"
 msgstr "Uganda"
 
-#: lang.pm:379
+#: lang.pm:384
 #, c-format
 msgid "United States Minor Outlying Islands"
 msgstr "Ühendriikide hajasaared"
 
-#: lang.pm:381
+#: lang.pm:386
 #, c-format
 msgid "Uruguay"
 msgstr "Uruguay"
 
-#: lang.pm:382
+#: lang.pm:387
 #, c-format
 msgid "Uzbekistan"
 msgstr "Usbekistan"
 
-#: lang.pm:383
+#: lang.pm:388
 #, c-format
 msgid "Vatican"
 msgstr "Vatikan"
 
-#: lang.pm:384
+#: lang.pm:389
 #, c-format
 msgid "Saint Vincent and the Grenadines"
 msgstr "Saint Vincent ja Grenadiinid"
 
-#: lang.pm:385
+#: lang.pm:390
 #, c-format
 msgid "Venezuela"
 msgstr "Venezuela"
 
-#: lang.pm:386
+#: lang.pm:391
 #, c-format
 msgid "Virgin Islands (British)"
 msgstr "Neitsisaared (Briti)"
 
-#: lang.pm:387
+#: lang.pm:392
 #, c-format
 msgid "Virgin Islands (U.S.)"
 msgstr "Neitsisaared (USA)"
 
-#: lang.pm:388
+#: lang.pm:393
 #, c-format
 msgid "Vietnam"
 msgstr "Vietnam"
 
-#: lang.pm:389
+#: lang.pm:394
 #, c-format
 msgid "Vanuatu"
 msgstr "Vanuatu"
 
-#: lang.pm:390
+#: lang.pm:395
 #, c-format
 msgid "Wallis and Futuna"
 msgstr "Wallis ja Futuna"
 
-#: lang.pm:391
+#: lang.pm:396
 #, c-format
 msgid "Samoa"
 msgstr "Samoa"
 
-#: lang.pm:392
+#: lang.pm:397
 #, c-format
 msgid "Yemen"
 msgstr "Jeemen"
 
-#: lang.pm:393
+#: lang.pm:398
 #, c-format
 msgid "Mayotte"
 msgstr "Mayotte"
 
-#: lang.pm:394
+#: lang.pm:399
 #, c-format
 msgid "Serbia & Montenegro"
 msgstr "Serbia ja Tšernogooria"
 
-#: lang.pm:395 standalone/drakxtv:50
+#: lang.pm:400 standalone/drakxtv:50
 #, c-format
 msgid "South Africa"
 msgstr "Lõuna-Aafrika"
 
-#: lang.pm:396
+#: lang.pm:401
 #, c-format
 msgid "Zambia"
 msgstr "Sambia"
 
-#: lang.pm:397
+#: lang.pm:402
 #, c-format
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: lang.pm:966
+#: lang.pm:983
 #, c-format
 msgid "Welcome to %s"
 msgstr "See ongi %s"
@@ -9006,7 +9052,7 @@ msgstr "Ringühendus %s\n"
 msgid "Remove the logical volumes first\n"
 msgstr "Eemaldage esmalt kettarühmad (logical volumes)\n"
 
-#: modules/interactive.pm:21 standalone/drakconnect:962
+#: modules/interactive.pm:21 standalone/drakconnect:959
 #, c-format
 msgid "Parameters"
 msgstr "Parameetrid"
@@ -9051,7 +9097,7 @@ msgstr "Info riistvara kohta"
 #: modules/interactive.pm:87
 #, c-format
 msgid "Installing driver for %s card %s"
-msgstr "Juhtprogrammi %s paigaldamine kaardile %s"
+msgstr "Draiveri %s paigaldamine kaardile %s"
 
 #: modules/interactive.pm:87
 #, c-format
@@ -9087,7 +9133,7 @@ msgstr "Mooduli parameetrid:"
 #: modules/interactive.pm:118
 #, c-format
 msgid "Which %s driver should I try?"
-msgstr "Millist %s juhtprogrammi peaks proovima?"
+msgstr "Millist %s draiverit peaks proovima?"
 
 #: modules/interactive.pm:127
 #, c-format
@@ -9100,9 +9146,9 @@ msgid ""
 "should\n"
 "not cause any damage."
 msgstr ""
-"Mõnel juhul vajab %s juhtprogramm tööks lisainformatsiooni,\n"
+"Mõnel juhul vajab %s draiver tööks lisainformatsiooni,\n"
 "kuigi tavaliselt saab ka ilma hakkama. Kas soovite eraldi parameetreid\n"
-"määrata või lasta juhtprogrammil ise Teie arvutit kompida? Võib juhtuda,\n"
+"määrata või lasta draiveril ise Teie arvutit kompida? Võib juhtuda,\n"
 "et see viib arvuti segadusse, kuid ei tohiks mingit jäävat kahju teha."
 
 #: modules/interactive.pm:131
@@ -9174,12 +9220,11 @@ msgstr "Tavaline PS2 rattaga hiir"
 msgid "GlidePoint"
 msgstr "GlidePoint"
 
-#: mouse.pm:36 network/modem.pm:23 network/modem.pm:37 network/modem.pm:42
-#: network/modem.pm:73 network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:503
-#: network/netconnect.pm:508 network/netconnect.pm:520
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#: network/netconnect.pm:543
+#: mouse.pm:36 network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
+#: network/modem.pm:58 network/modem.pm:72 network/modem.pm:77
+#: network/modem.pm:108 network/netconnect.pm:574 network/netconnect.pm:579
+#: network/netconnect.pm:591 network/netconnect.pm:596
+#: network/netconnect.pm:612 network/netconnect.pm:614
 #, c-format
 msgid "Automatic"
 msgstr "Automaatne"
@@ -9324,7 +9369,7 @@ msgstr "Universaalne"
 msgid "Any PS/2 & USB mice"
 msgstr "Suvaline PS/2 ja USB hiir"
 
-#: mouse.pm:92
+#: mouse.pm:92 standalone/drakvpn:1138
 #, c-format
 msgid "none"
 msgstr "puudub"
@@ -9384,12 +9429,12 @@ msgstr "Sagem (pppoa vahendusel) usb"
 msgid "Sagem (using dhcp) usb"
 msgstr "Sagem (dhcp vahendusel) usb"
 
-#: network/adsl.pm:35 network/netconnect.pm:679
+#: network/adsl.pm:35 network/netconnect.pm:754
 #, c-format
 msgid "Connect to the Internet"
 msgstr "Loo internetiühendus"
 
-#: network/adsl.pm:36 network/netconnect.pm:680
+#: network/adsl.pm:36 network/netconnect.pm:755
 #, c-format
 msgid ""
 "The most common way to connect with adsl is pppoe.\n"
@@ -9400,7 +9445,7 @@ msgstr ""
 "Mõnel juhul aga kasutatakse pptp-d, harva dhcp-d.\n"
 "Kui Te ei tea, kasutage pppoe-d"
 
-#: network/adsl.pm:41 network/netconnect.pm:684
+#: network/adsl.pm:41 network/netconnect.pm:759
 #, c-format
 msgid "ADSL connection type :"
 msgstr "ADSL ühenduse tüüp:"
@@ -9465,7 +9510,7 @@ msgstr "Võrgukaart puudub"
 msgid ""
 "drakfirewall configurator\n"
 "\n"
-"This configures a personal firewall for this Mandrake Linux machine.\n"
+"This configures a personal firewall for this Mandrakelinux machine.\n"
 "For a powerful and dedicated firewall solution, please look to the\n"
 "specialized MandrakeSecurity Firewall distribution."
 msgstr ""
@@ -9497,11 +9542,11 @@ msgstr "Millistel teenustel soovite lubada kasutada Internetiühendust?"
 #, c-format
 msgid ""
 "You can enter miscellaneous ports. \n"
-"Valid examples are: 139/tcp 139/udp.\n"
+"Valid examples are: 139/tcp 139/udp 600:610/tcp 600:610/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"
+"Sobivad näiteks: 139/tcp 139/udp 600:610/tcp 600:610/udp.\n"
 "Vaadake lähemalt /etc/services."
 
 #: network/drakfirewall.pm:176
@@ -9510,341 +9555,292 @@ msgid ""
 "Invalid port given: %s.\n"
 "The proper format is \"port/tcp\" or \"port/udp\", \n"
 "where port is between 1 and 65535.\n"
-"\n"
-"You can also give a range of ports (eg: 24300:24350/udp)"
-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.\n"
-"\n"
-"Määrata võib ka portide vahemiku (nt. 24300:24350/udp)"
-
-#
-#: network/drakfirewall.pm:186
-#, c-format
-msgid "Everything (no firewall)"
-msgstr "Kõik (tulemüür puudub)"
-
-#: network/drakfirewall.pm:188
-#, c-format
-msgid "Other ports"
-msgstr "Muud pordid"
-
-#: network/isdn.pm:127 network/isdn.pm:145 network/isdn.pm:157
-#: network/isdn.pm:163 network/isdn.pm:173 network/isdn.pm:183
-#: network/netconnect.pm:332
-#, c-format
-msgid "ISDN Configuration"
-msgstr "ISDN seadistused"
-
-#: network/isdn.pm:127
-#, c-format
-msgid ""
-"Select your provider.\n"
-"If it isn't listed, choose Unlisted."
-msgstr ""
-"Valige oma teenusepakkuja.\n"
-"Kui see ei ole nimekirjas, valige 'Tundmatu'."
-
-#: network/isdn.pm:140 standalone/drakconnect:503
-#, c-format
-msgid "European protocol (EDSS1)"
-msgstr "Euroopa protokoll (EDSS1)"
-
-#: network/isdn.pm:140
-#, c-format
-msgid "European protocol"
-msgstr "Euroopa protokoll"
-
-#: network/isdn.pm:142 standalone/drakconnect:504
-#, c-format
-msgid ""
-"Protocol for the rest of the world\n"
-"No D-Channel (leased lines)"
-msgstr ""
-"Protokoll ülejäänud maailma tarbeks\n"
-"Ilma D-kanalita (liisitud liinid)"
-
-#: network/isdn.pm:142
-#, c-format
-msgid "Protocol for the rest of the world"
-msgstr "Protokoll ülejäänud maailma tarbeks"
+"\n"
+"You can also give a range of ports (eg: 24300:24350/udp)"
+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.\n"
+"\n"
+"Määrata võib ka portide vahemiku (nt. 24300:24350/udp)"
 
-#: network/isdn.pm:146
+#
+#: network/drakfirewall.pm:186
 #, c-format
-msgid "Which protocol do you want to use?"
-msgstr "Millist protokolli soovite kasutada?"
+msgid "Everything (no firewall)"
+msgstr "Kõik (tulemüür puudub)"
 
-#: network/isdn.pm:157
+#: network/drakfirewall.pm:188
 #, c-format
-msgid "Found \"%s\" interface do you want to use it ?"
-msgstr "Leiti \"%s\" liides, kas soovite seda kasutada?"
+msgid "Other ports"
+msgstr "Muud pordid"
 
-#: network/isdn.pm:164
+#: network/isdn.pm:113 network/netconnect.pm:424
 #, c-format
-msgid "What kind of card do you have?"
-msgstr "Millist tüüpi kaart Teil on?"
+msgid "Unlisted - edit manually"
+msgstr "Puudub nimekirjast - käsitsimääramine"
 
-#: network/isdn.pm:165
+#: network/isdn.pm:156 network/netconnect.pm:376
 #, c-format
 msgid "ISA / PCMCIA"
 msgstr "ISA / PCMCIA"
 
-#: network/isdn.pm:165
+#: network/isdn.pm:156 network/netconnect.pm:376
+#, c-format
+msgid "I don't know"
+msgstr "Ei tea"
+
+#: network/isdn.pm:157 network/netconnect.pm:376
 #, c-format
 msgid "PCI"
 msgstr "PCI"
 
-#: network/isdn.pm:165
+#: network/isdn.pm:158 network/netconnect.pm:376
 #, c-format
 msgid "USB"
 msgstr "USB"
 
-#: network/isdn.pm:165
-#, c-format
-msgid "I don't know"
-msgstr "Ei tea"
-
-#: network/isdn.pm:174
-#, c-format
-msgid ""
-"\n"
-"If you have an ISA card, the values on the next screen should be right.\n"
-"\n"
-"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
-"card.\n"
-msgstr ""
-"\n"
-"Kui Teil on ISA kaart, siis peaks järgmised väärtused olema õiged.\n"
-"\n"
-"Kui Teil on PCMCIA kaart, peate ise teadma selle IRQ ning IO väärtusi.\n"
-
-#: network/isdn.pm:178
+#: network/modem.pm:42 network/modem.pm:43 network/modem.pm:44
+#: network/netconnect.pm:579 network/netconnect.pm:596
+#: network/netconnect.pm:612
 #, c-format
-msgid "Continue"
-msgstr "Jätka"
+msgid "Manual"
+msgstr "käsitsi"
 
-#: network/isdn.pm:178
+#: network/netconnect.pm:88 network/netconnect.pm:453
+#: network/netconnect.pm:463 network/netconnect.pm:822
+#: network/netconnect.pm:827
 #, c-format
-msgid "Abort"
-msgstr "Katkesta"
+msgid "Manual choice"
+msgstr "Käsitsivalik"
 
-#: network/isdn.pm:184
+#: network/netconnect.pm:88
 #, c-format
-msgid "Which of the following is your ISDN card?"
-msgstr "Milline on Teie ISDN kaart?"
+msgid "Internal ISDN card"
+msgstr "Sisemine ISDN kaart"
 
-#: network/netconnect.pm:95
+#: network/netconnect.pm:97
 #, c-format
 msgid "Ad-hoc"
 msgstr "Ad hoc"
 
-#: network/netconnect.pm:96
+#: network/netconnect.pm:98
 #, c-format
 msgid "Managed"
 msgstr "Määratud"
 
-#: network/netconnect.pm:97
+#: network/netconnect.pm:99
 #, c-format
 msgid "Master"
 msgstr "Esmane"
 
-#: network/netconnect.pm:98
+#: network/netconnect.pm:100
 #, c-format
 msgid "Repeater"
 msgstr "Repiiter"
 
-#: network/netconnect.pm:99
+#: network/netconnect.pm:101
 #, c-format
 msgid "Secondary"
 msgstr "Teisene"
 
-#: network/netconnect.pm:100
+#: network/netconnect.pm:102
 #, c-format
 msgid "Auto"
 msgstr "Automaatne"
 
-#: network/netconnect.pm:103 printer/printerdrake.pm:1118
+#: network/netconnect.pm:105 printer/printerdrake.pm:1133
+#: standalone/drakups:64
 #, c-format
 msgid "Manual configuration"
 msgstr "Käsitsiseadistamine"
 
-#: network/netconnect.pm:104
+#: network/netconnect.pm:106
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP)"
 msgstr "Automaatne IP (BOOTP/DHCP)"
 
-#: network/netconnect.pm:106
+#: network/netconnect.pm:108
 #, c-format
 msgid "Automatic IP (BOOTP/DHCP/Zeroconf)"
 msgstr "Automaatne IP (BOOTP/DHCP/Zeroconf)"
 
-#: network/netconnect.pm:156
+#: network/netconnect.pm:111
+#, c-format
+msgid "Protocol for the rest of the world"
+msgstr "Protokoll ülejäänud maailma tarbeks"
+
+#: network/netconnect.pm:113 standalone/drakconnect:528
+#, c-format
+msgid "European protocol (EDSS1)"
+msgstr "Euroopa protokoll (EDSS1)"
+
+#: network/netconnect.pm:114 standalone/drakconnect:529
+#, c-format
+msgid ""
+"Protocol for the rest of the world\n"
+"No D-Channel (leased lines)"
+msgstr ""
+"Protokoll ülejäänud maailma tarbeks\n"
+"Ilma D-kanalita (liisitud liinid)"
+
+#: network/netconnect.pm:146
 #, c-format
 msgid "Alcatel speedtouch USB modem"
 msgstr "Alcatel speedtouch USB modem"
 
-#: network/netconnect.pm:157
+#: network/netconnect.pm:147
 #, c-format
 msgid "Sagem USB modem"
 msgstr "Sagem USB modem"
 
-#: network/netconnect.pm:158
-#, c-format
-msgid "Bewan USB modem"
-msgstr "Bewan USB modem"
-
-#: network/netconnect.pm:159
+#: network/netconnect.pm:148
 #, c-format
-msgid "Bewan PCI modem"
-msgstr "Bewan PCI modem"
+msgid "Bewan modem"
+msgstr "Bewan modem"
 
-#: network/netconnect.pm:160
+#: network/netconnect.pm:149
 #, c-format
 msgid "ECI Hi-Focus modem"
 msgstr "ECI Hi-Focus modem"
 
-#: network/netconnect.pm:164
+#: network/netconnect.pm:153
 #, c-format
 msgid "Dynamic Host Configuration Protocol (DHCP)"
 msgstr "DHCP"
 
-#: network/netconnect.pm:165
+#: network/netconnect.pm:154
 #, c-format
 msgid "Manual TCP/IP configuration"
 msgstr "TCP/IP käsitsiseadistamine"
 
-#: network/netconnect.pm:166
+#: network/netconnect.pm:155
 #, c-format
 msgid "Point to Point Tunneling Protocol (PPTP)"
 msgstr "PPTP (Point-to-Point tunneldusprotokoll)"
 
-#: network/netconnect.pm:167
+#: network/netconnect.pm:156
 #, c-format
 msgid "PPP over Ethernet (PPPoE)"
 msgstr "PPPoE (PPP over Ethernet)"
 
-#: network/netconnect.pm:168
+#: network/netconnect.pm:157
 #, c-format
 msgid "PPP over ATM (PPPoA)"
 msgstr "PPPoA (PPP over ATM)"
 
-#: network/netconnect.pm:172
+#: network/netconnect.pm:161
 #, c-format
 msgid "Bridged Ethernet LLC"
 msgstr "Sillatud Ethernet LLC"
 
-#: network/netconnect.pm:173
+#: network/netconnect.pm:162
 #, c-format
 msgid "Bridged Ethernet VC"
 msgstr "Sillatud Ethernet VC"
 
-#: network/netconnect.pm:174
+#: network/netconnect.pm:163
 #, c-format
 msgid "Routed IP LLC"
 msgstr "Marsruuditud IP LLC"
 
-#: network/netconnect.pm:175
+#: network/netconnect.pm:164
 #, c-format
 msgid "Routed IP VC"
 msgstr "Marsruuditud IP VC"
 
-#: network/netconnect.pm:176
+#: network/netconnect.pm:165
 #, c-format
 msgid "PPPOA LLC"
 msgstr "PPPOA LLC"
 
-#: network/netconnect.pm:177
+#: network/netconnect.pm:166
 #, c-format
 msgid "PPPOA VC"
 msgstr "PPPOA VC"
 
-#: network/netconnect.pm:181 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:170 standalone/drakconnect:466
 #, c-format
 msgid "Script-based"
 msgstr "Skriptipõhine"
 
-#: network/netconnect.pm:182 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:171 standalone/drakconnect:466
 #, c-format
 msgid "PAP"
 msgstr "PAP"
 
-#: network/netconnect.pm:183 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:172 standalone/drakconnect:466
 #, c-format
 msgid "Terminal-based"
 msgstr "Terminalipõhine"
 
-#: network/netconnect.pm:184 standalone/drakconnect:443
-#: standalone/drakconnect:917
+#: network/netconnect.pm:173 standalone/drakconnect:466
 #, c-format
 msgid "CHAP"
 msgstr "CHAP"
 
-#: network/netconnect.pm:185
+#: network/netconnect.pm:174 standalone/drakconnect:466
 #, c-format
 msgid "PAP/CHAP"
 msgstr "PAP/CHAP"
 
-#: network/netconnect.pm:199 standalone/drakconnect:54
+#: network/netconnect.pm:219 standalone/drakconnect:55
 #, c-format
 msgid "Network & Internet Configuration"
 msgstr "Interneti ja kohtvõrgu seadistused"
 
-#: network/netconnect.pm:205
+#: network/netconnect.pm:225
 #, c-format
 msgid "(detected on port %s)"
 msgstr "(tuvastati pordis %s)"
 
 #. -PO: here, "(detected)" string will be appended to eg "ADSL connection"
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, c-format
 msgid "(detected %s)"
 msgstr "(tuvastati %s)"
 
-#: network/netconnect.pm:207
+#: network/netconnect.pm:227
 #, c-format
 msgid "(detected)"
 msgstr "(tuvastati)"
 
-#: network/netconnect.pm:209
+#: network/netconnect.pm:229
 #, c-format
 msgid "Modem connection"
 msgstr "Modemiühendus"
 
-#: network/netconnect.pm:210
+#: network/netconnect.pm:230
 #, c-format
 msgid "ISDN connection"
 msgstr "ISDN ühendus"
 
-#: network/netconnect.pm:211
+#: network/netconnect.pm:231
 #, c-format
 msgid "ADSL connection"
 msgstr "ADSL ühendus"
 
-#: network/netconnect.pm:212
+#: network/netconnect.pm:232
 #, c-format
 msgid "Cable connection"
 msgstr "Kaabliühendus"
 
-#: network/netconnect.pm:213
+#: network/netconnect.pm:233
 #, c-format
 msgid "LAN connection"
 msgstr "LAN ühendus"
 
-#: network/netconnect.pm:214 network/netconnect.pm:228
+#: network/netconnect.pm:234 network/netconnect.pm:248
 #, c-format
 msgid "Wireless connection"
 msgstr "Traadita ühendus"
 
-#: network/netconnect.pm:224
+#: network/netconnect.pm:244
 #, c-format
 msgid "Choose the connection you want to configure"
 msgstr "Valige ühendus, mida seadistada"
 
-#: network/netconnect.pm:241
+#: network/netconnect.pm:261
 #, c-format
 msgid ""
 "We are now going to configure the %s connection.\n"
@@ -9857,138 +9853,191 @@ msgstr ""
 "\n"
 "Vajutage jätkamiseks \"%s\"."
 
-#: network/netconnect.pm:249 network/netconnect.pm:710
+#: network/netconnect.pm:269 network/netconnect.pm:781
 #, c-format
 msgid "Connection Configuration"
 msgstr "Internetiühenduse seadistused"
 
-#: network/netconnect.pm:250 network/netconnect.pm:711
+#: network/netconnect.pm:270 network/netconnect.pm:782
 #, c-format
 msgid "Please fill or check the field below"
 msgstr "Palun täitke allpool olev väli"
 
-#: network/netconnect.pm:256 standalone/drakconnect:494
-#: standalone/drakconnect:899
+#: network/netconnect.pm:277 standalone/drakconnect:519
 #, c-format
 msgid "Card IRQ"
 msgstr "Kaardi IRQ"
 
-#: network/netconnect.pm:257 standalone/drakconnect:495
-#: standalone/drakconnect:900
+#: network/netconnect.pm:278 standalone/drakconnect:520
 #, c-format
 msgid "Card mem (DMA)"
 msgstr "Kaardi mälu (DMA)"
 
-#: network/netconnect.pm:258 standalone/drakconnect:496
-#: standalone/drakconnect:901
+#: network/netconnect.pm:279 standalone/drakconnect:521
 #, c-format
 msgid "Card IO"
 msgstr "Kaardi IO"
 
-#: network/netconnect.pm:259 standalone/drakconnect:497
-#: standalone/drakconnect:902
+#: network/netconnect.pm:280 standalone/drakconnect:522
 #, c-format
 msgid "Card IO_0"
 msgstr "Kaardi IO_0"
 
-#: network/netconnect.pm:260 standalone/drakconnect:903
+#: network/netconnect.pm:281
 #, c-format
 msgid "Card IO_1"
 msgstr "Kaardi IO_1"
 
-#: network/netconnect.pm:261 standalone/drakconnect:904
+#: network/netconnect.pm:282
 #, c-format
 msgid "Your personal phone number"
 msgstr "Teie telefoninumber"
 
-#: network/netconnect.pm:262 network/netconnect.pm:714
-#: standalone/drakconnect:905
+#: network/netconnect.pm:283 network/netconnect.pm:785
 #, c-format
 msgid "Provider name (ex provider.net)"
 msgstr "Teenusepakkuja tunnus (näiteks minuisp.ee)"
 
-#: network/netconnect.pm:263 standalone/drakconnect:440
-#: standalone/drakconnect:906
+#: network/netconnect.pm:284 standalone/drakconnect:463
 #, c-format
 msgid "Provider phone number"
 msgstr "Sissehelistamiskeskuse number"
 
-#: network/netconnect.pm:264
+#: network/netconnect.pm:285
 #, c-format
 msgid "Provider DNS 1 (optional)"
 msgstr "DNS 1 (võib jätta tühjaks)"
 
-#: network/netconnect.pm:265
+#: network/netconnect.pm:286
 #, c-format
 msgid "Provider DNS 2 (optional)"
 msgstr "DNS 2 (võib jätta tühjaks)"
 
-#: network/netconnect.pm:266 standalone/drakconnect:396
-#: standalone/drakconnect:462 standalone/drakconnect:911
+#: network/netconnect.pm:287 standalone/drakconnect:419
 #, c-format
 msgid "Dialing mode"
 msgstr "Valimisviis"
 
-#: network/netconnect.pm:267 standalone/drakconnect:401
-#: standalone/drakconnect:459 standalone/drakconnect:923
+#: network/netconnect.pm:288 standalone/drakconnect:424
+#: standalone/drakconnect:484
 #, c-format
 msgid "Connection speed"
 msgstr "Ühenduse kiirus"
 
-#: network/netconnect.pm:268 standalone/drakconnect:406
-#: standalone/drakconnect:924
+#: network/netconnect.pm:289 standalone/drakconnect:429
 #, c-format
 msgid "Connection timeout (in sec)"
 msgstr "Ühenduse aegumine (sekundites)"
 
-#: network/netconnect.pm:271 network/netconnect.pm:717
-#: standalone/drakconnect:438 standalone/drakconnect:909
+#: network/netconnect.pm:292 network/netconnect.pm:788
+#: standalone/drakconnect:461
 #, c-format
 msgid "Account Login (user name)"
 msgstr "Kasutajatunnus"
 
-#: network/netconnect.pm:272 network/netconnect.pm:718
-#: standalone/drakconnect:439 standalone/drakconnect:910
-#: standalone/drakconnect:944
+#: network/netconnect.pm:293 network/netconnect.pm:789
+#: standalone/drakconnect:462
 #, c-format
 msgid "Account Password"
 msgstr "Salasõna"
 
-#: network/netconnect.pm:300
+#: network/netconnect.pm:323 network/netconnect.pm:637
+#: network/netconnect.pm:820
 #, c-format
-msgid "What kind is your ISDN connection?"
-msgstr "Millist ISDN ühendust kasutate?"
+msgid "Select the network interface to configure:"
+msgstr "Valige seadistatav võrguliides:"
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:323 network/netconnect.pm:457
+#: network/netconnect.pm:641 standalone/drakgw:113 standalone/drakvpn:49
 #, c-format
-msgid "Internal ISDN card"
-msgstr "Sisemine ISDN kaart"
+msgid "Sorry, we support only 2.4 and above kernels."
+msgstr "Vabandust, me toetame ainult 2.4 ja uuemaid kerneleid."
 
-#: network/netconnect.pm:301
+#: network/netconnect.pm:325 network/netconnect.pm:366
+#: network/netconnect.pm:638 network/netconnect.pm:822 network/shorewall.pm:84
+#: standalone/drakconnect:643 standalone/drakgw:225 standalone/drakvpn:219
+#, c-format
+msgid "Net Device"
+msgstr "Võrguseade"
+
+#: network/netconnect.pm:326 network/netconnect.pm:334
 #, c-format
 msgid "External ISDN modem"
 msgstr "Väline ISDN modem"
 
-#: network/netconnect.pm:332
+#: network/netconnect.pm:365 standalone/harddrake2:115
+#, c-format
+msgid "Select a device !"
+msgstr "Valige seade!"
+
+#: network/netconnect.pm:374 network/netconnect.pm:384
+#: network/netconnect.pm:394 network/netconnect.pm:410
+#: network/netconnect.pm:421
+#, c-format
+msgid "ISDN Configuration"
+msgstr "ISDN seadistused"
+
+#: network/netconnect.pm:375
+#, c-format
+msgid "What kind of card do you have?"
+msgstr "Millist tüüpi kaart Teil on?"
+
+#: network/netconnect.pm:385
+#, c-format
+msgid ""
+"\n"
+"If you have an ISA card, the values on the next screen should be right.\n"
+"\n"
+"If you have a PCMCIA card, you have to know the \"irq\" and \"io\" of your "
+"card.\n"
+msgstr ""
+"\n"
+"Kui Teil on ISA kaart, siis peaks järgmised väärtused olema õiged.\n"
+"\n"
+"Kui Teil on PCMCIA kaart, peate ise teadma selle IRQ ning IO väärtusi.\n"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Continue"
+msgstr "Jätka"
+
+#: network/netconnect.pm:389
+#, c-format
+msgid "Abort"
+msgstr "Katkesta"
+
+#: network/netconnect.pm:395
+#, c-format
+msgid "Which of the following is your ISDN card?"
+msgstr "Milline on Teie ISDN kaart?"
+
+#: network/netconnect.pm:410
+#, c-format
+msgid "Which protocol do you want to use?"
+msgstr "Millist protokolli soovite kasutada?"
+
+#: network/netconnect.pm:412 standalone/drakconnect:116
+#: standalone/drakconnect:527 standalone/drakvpn:1140
 #, c-format
-msgid "Do you want to start a new configuration ?"
-msgstr "Kas soovite alustada uue seadistusega?"
+msgid "Protocol"
+msgstr "Protokoll"
 
-#: network/netconnect.pm:335
+#: network/netconnect.pm:421
 #, c-format
 msgid ""
-"I have detected an ISDN PCI card, but I don't know its type. Please select a "
-"PCI card on the next screen."
+"Select your provider.\n"
+"If it isn't listed, choose Unlisted."
 msgstr ""
-"Leiti küll PCI ISDN kaart, kuid selle tüüp on tundmatu. Palun valige PCI "
-"kaart järgmisel sammul."
+"Valige oma teenusepakkuja.\n"
+"Kui see ei ole nimekirjas, valige 'Tundmatu'."
 
-#: network/netconnect.pm:344
+#: network/netconnect.pm:423 network/netconnect.pm:529
+#: network/netconnect.pm:675
 #, c-format
-msgid "No ISDN PCI card found. Please select one on the next screen."
-msgstr "PCI ISDN kaarti ei leitud. Palun valige see järgmisel sammul."
+msgid "Provider:"
+msgstr "Teenusepakkuja:"
 
-#: network/netconnect.pm:353
+#: network/netconnect.pm:438
 #, c-format
 msgid ""
 "Your modem isn't supported by the system.\n"
@@ -9997,140 +10046,117 @@ msgstr ""
 "Teie modem ei ole toetatud.\n"
 "Ehk saate abi aadressilt http://www.linmodems.org"
 
-#: network/netconnect.pm:364
+#: network/netconnect.pm:450
 #, c-format
 msgid "Select the modem to configure:"
 msgstr "Valige seadistatav modem:"
 
-#: network/netconnect.pm:403
+#: network/netconnect.pm:498
 #, c-format
 msgid "Please choose which serial port your modem is connected to."
 msgstr "Millisesse jadaporti on Teie modem ühendatud?"
 
-#: network/netconnect.pm:427
+#: network/netconnect.pm:527
 #, c-format
 msgid "Select your provider:"
 msgstr "Valige teenusepakkuja:"
 
-#: network/netconnect.pm:429 network/netconnect.pm:599
-#, c-format
-msgid "Provider:"
-msgstr "Teenusepakkuja:"
-
-#: network/netconnect.pm:481 network/netconnect.pm:482
-#: network/netconnect.pm:483 network/netconnect.pm:508
-#: network/netconnect.pm:525 network/netconnect.pm:541
-#, c-format
-msgid "Manual"
-msgstr "käsitsi"
-
-#: network/netconnect.pm:485
+#: network/netconnect.pm:556
 #, c-format
 msgid "Dialup: account options"
 msgstr "Sissehelistamine (dial-up): konto valikud"
 
-#: network/netconnect.pm:488 standalone/drakconnect:913
+#: network/netconnect.pm:559
 #, c-format
 msgid "Connection name"
 msgstr "Ühenduse nimi"
 
-#: network/netconnect.pm:489 standalone/drakconnect:914
+#: network/netconnect.pm:560
 #, c-format
 msgid "Phone number"
 msgstr "Sissehelistamiskeskuse number"
 
-#: network/netconnect.pm:490 standalone/drakconnect:915
+#: network/netconnect.pm:561
 #, c-format
 msgid "Login ID"
 msgstr "Kasutajakonto"
 
-#: network/netconnect.pm:505 network/netconnect.pm:538
+#: network/netconnect.pm:576 network/netconnect.pm:609
 #, c-format
 msgid "Dialup: IP parameters"
 msgstr "Sissehelistamine (dial-up): IP parameetrid"
 
-#: network/netconnect.pm:508
+#: network/netconnect.pm:579
 #, c-format
 msgid "IP parameters"
 msgstr "IP parameetrid"
 
-#: network/netconnect.pm:509 network/netconnect.pm:829
-#: printer/printerdrake.pm:431 standalone/drakconnect:113
-#: standalone/drakconnect:306 standalone/drakconnect:764
+#: network/netconnect.pm:580 network/netconnect.pm:912
+#: printer/printerdrake.pm:431 standalone/drakconnect:116
+#: standalone/drakconnect:325 standalone/drakconnect:806
+#: standalone/drakups:266
 #, c-format
 msgid "IP address"
 msgstr "IP aadress"
 
-#: network/netconnect.pm:510
+#: network/netconnect.pm:581
 #, c-format
 msgid "Subnet mask"
 msgstr "Alamvõrgu mask"
 
-#: network/netconnect.pm:522
+#: network/netconnect.pm:593
 #, c-format
 msgid "Dialup: DNS parameters"
 msgstr "Sissehelistamine (dial-up): DNS parameetrid"
 
-#: network/netconnect.pm:525
+#: network/netconnect.pm:596
 #, c-format
 msgid "DNS"
 msgstr "DNS"
 
-#: network/netconnect.pm:526 standalone/drakconnect:918
+#: network/netconnect.pm:597
 #, c-format
 msgid "Domain name"
 msgstr "Domeeninimi"
 
-#: network/netconnect.pm:527 network/netconnect.pm:715
-#: standalone/drakconnect:919
+#: network/netconnect.pm:598 network/netconnect.pm:786
+#: standalone/drakconnect:924
 #, c-format
 msgid "First DNS Server (optional)"
 msgstr "Esimene nimeserver (pole kohustuslik)"
 
-#: network/netconnect.pm:528 network/netconnect.pm:716
-#: standalone/drakconnect:920
+#: network/netconnect.pm:599 network/netconnect.pm:787
+#: standalone/drakconnect:925
 #, c-format
 msgid "Second DNS Server (optional)"
 msgstr "Teine nimeserver (pole kohustuslik)"
 
-#: network/netconnect.pm:529
+#: network/netconnect.pm:600
 #, c-format
 msgid "Set hostname from IP"
 msgstr "Masinanimi IP järgi"
 
-#: network/netconnect.pm:541 standalone/drakconnect:317
-#: standalone/drakconnect:912
+#: network/netconnect.pm:612 standalone/drakconnect:336
 #, c-format
 msgid "Gateway"
 msgstr "Vaikelüüs"
 
-#: network/netconnect.pm:542
+#: network/netconnect.pm:613
 #, c-format
 msgid "Gateway IP address"
 msgstr "Lüüsi IP aadress"
 
-#: network/netconnect.pm:567
+#: network/netconnect.pm:637
 #, c-format
 msgid "ADSL configuration"
 msgstr "ADSL seadistused"
 
-#: network/netconnect.pm:567 network/netconnect.pm:746
-#, c-format
-msgid "Select the network interface to configure:"
-msgstr "Valige seadistatav võrguliides:"
-
-#: network/netconnect.pm:568 network/netconnect.pm:748 network/shorewall.pm:77
-#: standalone/drakconnect:602 standalone/drakgw:218 standalone/drakvpn:217
-#, c-format
-msgid "Net Device"
-msgstr "Võrguseade"
-
-#: network/netconnect.pm:597
+#: network/netconnect.pm:673
 #, c-format
 msgid "Please choose your ADSL provider"
 msgstr "Palun valige oma ADSL ühenduse pakkuja."
 
-#: network/netconnect.pm:616
+#: network/netconnect.pm:691
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10138,35 +10164,35 @@ msgid ""
 "or skip and do it later."
 msgstr ""
 "Teil läheb vaja Alcateli Microcode'i.\n"
-"Te võite nüüd selle paigaldada flopilt või Windowsi partitsiiinil\n"
+"Te võite nüüd selle paigaldada disketilt või Windowsi partitsioonilt\n"
 "või ka sammu vahele jätta ja hoopis hiljem paigaldamise ette võtta."
 
-#: network/netconnect.pm:620 network/netconnect.pm:625
+#: network/netconnect.pm:695 network/netconnect.pm:700
 #, c-format
 msgid "Use a floppy"
-msgstr "Flopi kasutamine"
+msgstr "Disketi kasutamine"
 
-#: network/netconnect.pm:620 network/netconnect.pm:629
+#: network/netconnect.pm:695 network/netconnect.pm:704
 #, c-format
 msgid "Use my Windows partition"
 msgstr "Windowsi partitsiooni kasutamine"
 
-#: network/netconnect.pm:620 network/netconnect.pm:633
+#: network/netconnect.pm:695 network/netconnect.pm:708
 #, c-format
 msgid "Do it later"
 msgstr "Tee seda hiljem"
 
-#: network/netconnect.pm:640
+#: network/netconnect.pm:715
 #, c-format
 msgid "Firmware copy failed, file %s not found"
 msgstr "Püsivara kopeerimine ebaõnnestus, faili %s ei leitud"
 
-#: network/netconnect.pm:647
+#: network/netconnect.pm:722
 #, c-format
 msgid "Firmware copy succeeded"
 msgstr "Püsivara kopeerimine õnnestus"
 
-#: network/netconnect.pm:662
+#: network/netconnect.pm:737
 #, c-format
 msgid ""
 "You need the Alcatel microcode.\n"
@@ -10179,22 +10205,22 @@ msgstr ""
 "%s\n"
 "ja saadud 'mgmt.o' kopeerige kataloogi /usr/share/speedtouch"
 
-#: network/netconnect.pm:719
+#: network/netconnect.pm:790
 #, c-format
 msgid "Virtual Path ID (VPI):"
 msgstr "Virtual Path ID (VPI):"
 
-#: network/netconnect.pm:720
+#: network/netconnect.pm:791
 #, c-format
 msgid "Virtual Circuit ID (VCI):"
 msgstr "Virtual Circuit ID (VCI):"
 
-#: network/netconnect.pm:721
+#: network/netconnect.pm:793
 #, c-format
 msgid "Encapsulation :"
 msgstr "Kapseldus: "
 
-#: network/netconnect.pm:736
+#: network/netconnect.pm:810
 #, c-format
 msgid ""
 "The ECI Hi-Focus modem cannot be supported due to binary driver distribution "
@@ -10207,17 +10233,7 @@ msgstr ""
 "\n"
 "Te leiate draiveri aadressil http://eciadsl.flashtux.org/"
 
-#: network/netconnect.pm:753
-#, fuzzy, c-format
-msgid "No wireless network adapter on your system!"
-msgstr "Teie süsteemis ei ole võrgukaarti!"
-
-#: network/netconnect.pm:754 standalone/drakgw:240 standalone/drakpxe:137
-#, c-format
-msgid "No network adapter on your system!"
-msgstr "Teie süsteemis ei ole võrgukaarti!"
-
-#: network/netconnect.pm:766
+#: network/netconnect.pm:837
 #, c-format
 msgid ""
 "WARNING: this device has been previously configured to connect to the "
@@ -10229,17 +10245,26 @@ msgstr ""
 "Valige lihtsalt 'Olgu', et seadistust mitte muuta.\n"
 "Allolevate väljade muutmine tühistab varasema seadistuse."
 
-#: network/netconnect.pm:784
+#: network/netconnect.pm:850 network/netconnect.pm:1222
+#, c-format
+msgid ""
+"Congratulations, the network and Internet configuration is finished.\n"
+"\n"
+msgstr ""
+"Õnnitleme, võrk ja Internetiühendus on seadistatud.\n"
+"\n"
+
+#: network/netconnect.pm:864
 #, c-format
 msgid "Zeroconf hostname resolution"
 msgstr "Zeroconf masina nimi"
 
-#: network/netconnect.pm:785 network/netconnect.pm:816
+#: network/netconnect.pm:865 network/netconnect.pm:899
 #, c-format
 msgid "Configuring network device %s (driver %s)"
 msgstr "Võrgukaardi %s (draiver %s) seadistamine"
 
-#: network/netconnect.pm:786
+#: network/netconnect.pm:866
 #, c-format
 msgid ""
 "The following protocols can be used to configure an ethernet connection. "
@@ -10248,7 +10273,7 @@ msgstr ""
 "Ethernet-ühenduse seadistamiseks saab kasutada järgmisi protokolle. Palun "
 "valige, millist soovite kasutada"
 
-#: network/netconnect.pm:817
+#: network/netconnect.pm:900
 #, c-format
 msgid ""
 "Please enter the IP configuration for this machine.\n"
@@ -10259,89 +10284,89 @@ msgstr ""
 "Kõik read tuleb sisestada IP-aadressi kujul\n"
 "(näiteks 12.34.56.78)"
 
-#: network/netconnect.pm:824
+#: network/netconnect.pm:907
 #, c-format
 msgid "Assign host name from DHCP address"
 msgstr "Masinanimi omistatakse DHCP aadressist"
 
-#: network/netconnect.pm:825
+#: network/netconnect.pm:908
 #, c-format
 msgid "DHCP host name"
 msgstr "DHCP masinanimi"
 
-#: network/netconnect.pm:830 standalone/drakconnect:311
-#: standalone/drakconnect:765 standalone/drakgw:313
+#: network/netconnect.pm:913 standalone/drakconnect:330
+#: standalone/drakconnect:807 standalone/drakgw:321
 #, c-format
 msgid "Netmask"
 msgstr "Võrgumask"
 
-#: network/netconnect.pm:832 standalone/drakconnect:389
+#: network/netconnect.pm:915 standalone/drakconnect:412
 #, c-format
 msgid "Track network card id (useful for laptops)"
 msgstr "Võrgukaadi ID tuvastus (kasulik sülearvutite puhul)"
 
-#: network/netconnect.pm:833 standalone/drakconnect:390
+#: network/netconnect.pm:916 standalone/drakconnect:413
 #, c-format
 msgid "Network Hotplugging"
 msgstr "Võrgu kohene valmidus (hotplugging)"
 
-#: network/netconnect.pm:834 standalone/drakconnect:384
+#: network/netconnect.pm:917 standalone/drakconnect:407
 #, c-format
 msgid "Start at boot"
 msgstr "Käivitub alglaadimisel"
 
-#: network/netconnect.pm:836 standalone/drakconnect:768
+#: network/netconnect.pm:919 standalone/drakconnect:810
 #, c-format
 msgid "DHCP client"
 msgstr "DHCP klient"
 
-#: network/netconnect.pm:846 printer/printerdrake.pm:1349
-#: standalone/drakconnect:569
+#: network/netconnect.pm:929 printer/printerdrake.pm:1383
+#: standalone/drakconnect:608
 #, c-format
 msgid "IP address should be in format 1.2.3.4"
 msgstr "IP aadress peab olema kujul 1.2.3.4"
 
-#: network/netconnect.pm:849
+#: network/netconnect.pm:932
 #, c-format
 msgid "Warning : IP address %s is usually reserved !"
 msgstr "Hoiatus : IP aadress %s on tavaliselt reserveeritud!"
 
-#: network/netconnect.pm:879 network/netconnect.pm:908
+#: network/netconnect.pm:962 network/netconnect.pm:991
 #, c-format
 msgid "Please enter the wireless parameters for this card:"
 msgstr "Palun sisestage selle traadita võrgu kaardi parameetrid:"
 
-#: network/netconnect.pm:882 standalone/drakconnect:355
+#: network/netconnect.pm:965 standalone/drakconnect:378
 #, c-format
 msgid "Operating Mode"
 msgstr "Tööresiim"
 
-#: network/netconnect.pm:884 standalone/drakconnect:356
+#: network/netconnect.pm:967 standalone/drakconnect:379
 #, c-format
 msgid "Network name (ESSID)"
 msgstr "Võrgu nimi (ESSID)"
 
-#: network/netconnect.pm:885 standalone/drakconnect:357
+#: network/netconnect.pm:968 standalone/drakconnect:380
 #, c-format
 msgid "Network ID"
 msgstr "Võrgu ID"
 
-#: network/netconnect.pm:886 standalone/drakconnect:358
+#: network/netconnect.pm:969 standalone/drakconnect:381
 #, c-format
 msgid "Operating frequency"
 msgstr "Töösagedus"
 
-#: network/netconnect.pm:887 standalone/drakconnect:359
+#: network/netconnect.pm:970 standalone/drakconnect:382
 #, c-format
 msgid "Sensitivity threshold"
 msgstr "Tundlikkuslävi"
 
-#: network/netconnect.pm:888 standalone/drakconnect:360
+#: network/netconnect.pm:971 standalone/drakconnect:383
 #, c-format
 msgid "Bitrate (in b/s)"
 msgstr "Bitikiirus (b/s)"
 
-#: network/netconnect.pm:894
+#: network/netconnect.pm:977
 #, c-format
 msgid ""
 "Freq should have the suffix k, M or G (for example, \"2.46G\" for 2.46 GHz "
@@ -10350,7 +10375,7 @@ msgstr ""
 "Sagedus peab sisaldama sufiksit k, M või G (näiteks \"2.46G\" - 2,46 GHz "
 "sagedusel) või tuleb lisada piisavalt nulle."
 
-#: network/netconnect.pm:898
+#: network/netconnect.pm:981
 #, c-format
 msgid ""
 "Rate should have the suffix k, M or G (for example, \"11M\" for 11M), or add "
@@ -10359,12 +10384,12 @@ msgstr ""
 "Kiirus peab sisaldama sufiksit k, M või G (näiteks \"11M\") või tuleb lisada "
 "piisavalt nulle."
 
-#: network/netconnect.pm:911 standalone/drakconnect:371
+#: network/netconnect.pm:994 standalone/drakconnect:394
 #, c-format
 msgid "RTS/CTS"
 msgstr "RTS/CTS"
 
-#: network/netconnect.pm:912
+#: network/netconnect.pm:995
 #, c-format
 msgid ""
 "RTS/CTS adds a handshake before each packet transmission to make sure that "
@@ -10384,17 +10409,17 @@ msgstr ""
 "võrdne väärtus tühistab võimaluse. Parameetri võib määrata ka automaatseks,\n"
 "fikseerituks või üldse välja lülitada."
 
-#: network/netconnect.pm:919 standalone/drakconnect:372
+#: network/netconnect.pm:1002 standalone/drakconnect:395
 #, c-format
 msgid "Fragmentation"
 msgstr "Killustus"
 
-#: network/netconnect.pm:920 standalone/drakconnect:373
+#: network/netconnect.pm:1003 standalone/drakconnect:396
 #, c-format
 msgid "Iwconfig command extra arguments"
 msgstr "Käsu iwconfig lisaargumendid"
 
-#: network/netconnect.pm:921
+#: network/netconnect.pm:1004
 #, c-format
 msgid ""
 "Here, one can configure some extra wireless parameters such as:\n"
@@ -10410,12 +10435,12 @@ msgstr ""
 "Täpsemat infot annab man-lehekülg iwpconfig(8)."
 
 #. -PO: split the "xyz command extra argument" translated string into two lines if it's bigger than the english one
-#: network/netconnect.pm:928 standalone/drakconnect:374
+#: network/netconnect.pm:1011 standalone/drakconnect:397
 #, c-format
 msgid "Iwspy command extra arguments"
 msgstr "Käsu iwspy lisaargumendid"
 
-#: network/netconnect.pm:929
+#: network/netconnect.pm:1012
 #, c-format
 msgid ""
 "Iwspy is used to set a list of addresses in a wireless network\n"
@@ -10434,12 +10459,12 @@ msgstr ""
 "\n"
 "Täpsemat infot annab man-lehekülg iwspy(8)."
 
-#: network/netconnect.pm:937 standalone/drakconnect:375
+#: network/netconnect.pm:1020 standalone/drakconnect:398
 #, c-format
 msgid "Iwpriv command extra arguments"
 msgstr "Käsu iwpriv lisaargumendid"
 
-#: network/netconnect.pm:938
+#: network/netconnect.pm:1021
 #, c-format
 msgid ""
 "Iwpriv enable to set up optionals (private) parameters of a wireless "
@@ -10466,7 +10491,7 @@ msgstr ""
 "\n"
 "Täpsemat infot annab man-lehekülg iwpriv(8)."
 
-#: network/netconnect.pm:965
+#: network/netconnect.pm:1048
 #, c-format
 msgid ""
 "No ethernet network adapter has been detected on your system.\n"
@@ -10475,19 +10500,19 @@ msgstr ""
 "Ühtegi võrgukaarti ei õnnestunud tuvastada.\n"
 "Seega ei saa ka sellist ühendust seadistada."
 
-#: network/netconnect.pm:969 standalone/drakgw:254 standalone/drakpxe:142
+#: network/netconnect.pm:1052 standalone/drakgw:261 standalone/drakpxe:142
 #, c-format
 msgid "Choose the network interface"
 msgstr "Valige võrgukaart"
 
-#: network/netconnect.pm:970
+#: network/netconnect.pm:1053
 #, c-format
 msgid ""
 "Please choose which network adapter you want to use to connect to Internet."
 msgstr ""
 "Palun valige, millist võrgukaarti soovite Internetiühenduse jaoks kasutada"
 
-#: network/netconnect.pm:991
+#: network/netconnect.pm:1074
 #, c-format
 msgid ""
 "Please enter your host name.\n"
@@ -10500,69 +10525,69 @@ msgstr ""
 "näiteks ``minumasin.minufirma.ee''.\n"
 "Kui Teil on vaikelüüs, siis sisestage ka selle IP aadress."
 
-#: network/netconnect.pm:995
+#: network/netconnect.pm:1078
 #, c-format
 msgid "Last but not least you can also type in your DNS server IP addresses."
-msgstr ""
+msgstr "Ja lõpuks tuleks määrata ka nimeserveri IP aadressid."
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080 standalone/drakconnect:923
 #, c-format
 msgid "Host name (optional)"
 msgstr "Masinanimi (pole kohustuslik)"
 
-#: network/netconnect.pm:997
+#: network/netconnect.pm:1080
 #, c-format
 msgid "Host name"
 msgstr "Masinanimi"
 
-#: network/netconnect.pm:998
+#: network/netconnect.pm:1082
 #, c-format
 msgid "DNS server 1"
 msgstr "Nimeserver 1"
 
-#: network/netconnect.pm:999
+#: network/netconnect.pm:1083
 #, c-format
 msgid "DNS server 2"
 msgstr "Nimeserver 2"
 
-#: network/netconnect.pm:1000
+#: network/netconnect.pm:1084
 #, c-format
 msgid "DNS server 3"
 msgstr "Nimeserver 3"
 
-#: network/netconnect.pm:1001
+#: network/netconnect.pm:1085
 #, c-format
 msgid "Search domain"
 msgstr "Otsingudomeen"
 
-#: network/netconnect.pm:1002
+#: network/netconnect.pm:1086
 #, c-format
 msgid "By default search domain will be set from the fully-qualified host name"
 msgstr ""
 "Otsingudomeen määratakse vaikimisi täielikult kvalifitseeritud masinanime "
 "põhjal"
 
-#: network/netconnect.pm:1003
+#: network/netconnect.pm:1087
 #, c-format
 msgid "Gateway (e.g. %s)"
 msgstr "Vaikelüüs (nt %s)"
 
-#: network/netconnect.pm:1005
+#: network/netconnect.pm:1089
 #, c-format
 msgid "Gateway device"
 msgstr "Lüüsipoolne seade"
 
-#: network/netconnect.pm:1014
+#: network/netconnect.pm:1098
 #, c-format
 msgid "DNS server address should be in format 1.2.3.4"
 msgstr "Nimeserveri aadress peab olema kujul 1.2.3.4"
 
-#: network/netconnect.pm:1019 standalone/drakconnect:571
+#: network/netconnect.pm:1103 standalone/drakconnect:611
 #, c-format
 msgid "Gateway address should be in format 1.2.3.4"
 msgstr "Lüüsi aadress peab olema kujul 1.2.3.4"
 
-#: network/netconnect.pm:1030
+#: network/netconnect.pm:1114
 #, c-format
 msgid ""
 "Enter a Zeroconf host name which will be the one that your machine will get "
@@ -10571,17 +10596,17 @@ msgstr ""
 "Sisestage Zeroconf-masina nimi, millega Teie masin annab endast teada "
 "teistele võrgus olevatele masinatele:"
 
-#: network/netconnect.pm:1031
+#: network/netconnect.pm:1115
 #, c-format
 msgid "Zeroconf Host name"
 msgstr "Zeroconf masina nimi"
 
-#: network/netconnect.pm:1034
+#: network/netconnect.pm:1118
 #, c-format
 msgid "Zeroconf host name must not contain a ."
 msgstr "Zeroconfi masina nimi ei tohi sisaldada punkti (.)"
 
-#: network/netconnect.pm:1044
+#: network/netconnect.pm:1128
 #, c-format
 msgid ""
 "You have configured multiple ways to connect to the Internet.\n"
@@ -10592,32 +10617,32 @@ msgstr ""
 "Valige palun see, mida soovite kasutada.\n"
 "\n"
 
-#: network/netconnect.pm:1046
+#: network/netconnect.pm:1130
 #, c-format
 msgid "Internet connection"
 msgstr "Internetiühendus"
 
-#: network/netconnect.pm:1054
+#: network/netconnect.pm:1144
 #, c-format
 msgid "Configuration is complete, do you want to apply settings ?"
 msgstr "Seadistamine on lõpetatud. Kas soovite seda nüüd rakendada?"
 
-#: network/netconnect.pm:1070
+#: network/netconnect.pm:1154
 #, c-format
 msgid "Do you want to start the connection at boot?"
 msgstr "Kas soovite luua ühenduse juba alglaadimisel?"
 
-#: network/netconnect.pm:1094
+#: network/netconnect.pm:1166
 #, c-format
 msgid "The network needs to be restarted. Do you want to restart it ?"
 msgstr "Võrk tuleb uuesti käivitada. Kas soovite seda teha?"
 
-#: network/netconnect.pm:1100 network/netconnect.pm:1165
+#: network/netconnect.pm:1173 network/netconnect.pm:1238
 #, c-format
 msgid "Network Configuration"
 msgstr "Võrgu seadistused"
 
-#: network/netconnect.pm:1101
+#: network/netconnect.pm:1174
 #, c-format
 msgid ""
 "A problem occured while restarting the network: \n"
@@ -10628,27 +10653,27 @@ msgstr ""
 "\n"
 "%s"
 
-#: network/netconnect.pm:1110
+#: network/netconnect.pm:1182
 #, c-format
 msgid "Do you want to try to connect to the Internet now?"
 msgstr "Kas soovite oma Internetiühendust proovida?"
 
-#: network/netconnect.pm:1118 standalone/drakconnect:958
+#: network/netconnect.pm:1190 standalone/drakconnect:955
 #, c-format
 msgid "Testing your connection..."
 msgstr "Testime Teie ühendust..."
 
-#: network/netconnect.pm:1134
+#: network/netconnect.pm:1206
 #, c-format
 msgid "The system is now connected to the Internet."
 msgstr "Süsteem on nüüd Internetti ühendatud."
 
-#: network/netconnect.pm:1135
+#: network/netconnect.pm:1207
 #, c-format
 msgid "For security reasons, it will be disconnected now."
 msgstr "Turvakaalutlusel katkestatakse nüüd ühendus."
 
-#: network/netconnect.pm:1136
+#: network/netconnect.pm:1208
 #, c-format
 msgid ""
 "The system doesn't seem to be connected to the Internet.\n"
@@ -10657,16 +10682,7 @@ msgstr ""
 "Paistab, et süsteem ei ole Internetti ühendatud.\n"
 "Palun seadistage ühendus uuesti."
 
-#: network/netconnect.pm:1150
-#, c-format
-msgid ""
-"Congratulations, the network and Internet configuration is finished.\n"
-"\n"
-msgstr ""
-"Õnnitleme, võrk ja Internetiühendus on seadistatud.\n"
-"\n"
-
-#: network/netconnect.pm:1153
+#: network/netconnect.pm:1225
 #, c-format
 msgid ""
 "After this is done, we recommend that you restart your X environment to "
@@ -10675,7 +10691,7 @@ msgstr ""
 "Soovitame uuesti käivitada ka X keskkonna, et vältida võimalikke\n"
 "masinanime muutmisest tingitud probleeme."
 
-#: network/netconnect.pm:1154
+#: network/netconnect.pm:1226
 #, c-format
 msgid ""
 "Problems occured during configuration.\n"
@@ -10686,7 +10702,7 @@ msgstr ""
 "Kontrollige oma ühendust net_monitor või mcc abil. Kui ühendus ei tööta, "
 "tuleks see uuesti seadistada."
 
-#: network/netconnect.pm:1166
+#: network/netconnect.pm:1239
 #, c-format
 msgid ""
 "Because you are doing a network installation, your network is already "
@@ -10698,38 +10714,47 @@ msgstr ""
 "Kui soovite neid seadistusi säilitada, valige 'Olgu', muidu loobuge ja saate "
 "seadistada uuesti.\n"
 
-#: network/network.pm:314
+#: network/netconnect.pm:1327
+#, c-format
+msgid ""
+"An unexpected error has happened:\n"
+"%s"
+msgstr ""
+"Tekkis ootamatu viga:\n"
+"%s"
+
+#: network/network.pm:315
 #, c-format
 msgid "Proxies configuration"
 msgstr "Vahendajate seadistused"
 
-#: network/network.pm:315
+#: network/network.pm:316
 #, c-format
 msgid "HTTP proxy"
 msgstr "HTTP vahendaja"
 
-#: network/network.pm:316
+#: network/network.pm:317
 #, c-format
 msgid "FTP proxy"
 msgstr "FTP vahendaja"
 
-#: network/network.pm:319
+#: network/network.pm:320
 #, c-format
 msgid "Proxy should be http://..."
 msgstr "Vahendaja peab olema kujul http://..."
 
-#: network/network.pm:320
+#: network/network.pm:321
 #, c-format
 msgid "URL should begin with 'ftp:' or 'http:'"
 msgstr "URLi alguses peab olema 'ftp:' või 'http:'"
 
 #
-#: network/shorewall.pm:26
+#: network/shorewall.pm:28
 #, c-format
 msgid "Firewalling configuration detected!"
 msgstr "Leiti tulemüüri seadistused!"
 
-#: network/shorewall.pm:27
+#: network/shorewall.pm:29
 #, c-format
 msgid ""
 "Warning! An existing firewalling configuration has been detected. You may "
@@ -10738,54 +10763,53 @@ msgstr ""
 "Hoiatus! Leiti olemasolevad tulemüüri seadistused. Tõenäoliselt peaksite "
 "need hiljem üle vaatama."
 
-#: network/shorewall.pm:70
+#: network/shorewall.pm:77 standalone/drakgw:218 standalone/drakvpn:212
 #, c-format
 msgid ""
-"Please enter the name of the interface connected to the "
-"internet.              \n"
-"                \n"
+"Please enter the name of the interface connected to the internet.\n"
+"\n"
 "Examples:\n"
-"                ppp+ for modem or DSL connections, \n"
-"                eth0, or eth1 for cable connection, \n"
-"                ippp+ for a isdn connection.\n"
+"\t\tppp+ for modem or DSL connections, \n"
+"\t\teth0, or eth1 for cable connection, \n"
+"\t\tippp+ for a isdn connection.\n"
 msgstr ""
 "Palun sisestage Internetiühenduseks kasutatava seadme nimi.\n"
-"                \n"
+"\n"
 "Näited:\n"
-"                ppp+ modemi- või DSL ühenduse korral. \n"
-"                eth0 või eth1 kaabliühenduse korral, \n"
-"                ippp+ ISDN ühenduse korral.\n"
+"\t\tppp+ modemi- või DSL ühenduse korral. \n"
+"\t\teth0 või eth1 kaabliühenduse korral, \n"
+"\t\tippp+ ISDN ühenduse korral.\n"
 
-#: network/tools.pm:207
+#: network/tools.pm:205
 #, c-format
 msgid "Insert floppy"
-msgstr "Sisestage flopi"
+msgstr "Sisestage diskett"
 
-#: network/tools.pm:208
+#: network/tools.pm:206
 #, c-format
 msgid ""
 "Insert a FAT formatted floppy in drive %s with %s in root directory and "
 "press %s"
 msgstr ""
-"Pange FAT-vormingus flopi seadmesse %s, nii et %s oleks juurkataloogis, ning "
-"vajutage %s"
+"Pange FAT-vormingus diskett seadmesse %s, nii et %s oleks juurkataloogis, "
+"ning vajutage %s"
 
-#: network/tools.pm:209
+#: network/tools.pm:207
 #, c-format
 msgid "Floppy access error, unable to mount device %s"
-msgstr "Flopile ei õnnestunud ligi pääseda ega haakida seadet %s"
+msgstr "Disketile ei õnnestunud ligi pääseda ega haakida seadet %s"
 
-#: partition_table.pm:642
+#: partition_table.pm:644
 #, c-format
 msgid "mount failed: "
 msgstr "haakimine ebaõnnestus: "
 
-#: partition_table.pm:747
+#: partition_table.pm:749
 #, c-format
 msgid "Extended partition not supported on this platform"
 msgstr "Sellel platvormil ei saa laiendatud partitsiooni luua"
 
-#: partition_table.pm:765
+#: partition_table.pm:767
 #, c-format
 msgid ""
 "You have a hole in your partition table but I can't use it.\n"
@@ -10796,22 +10820,22 @@ msgstr ""
 "Ainuke lahendus on nihutada primaarset partitsiooni, et \"auk\" satuks "
 "laiendatud partitsioonide kõrvale."
 
-#: partition_table.pm:852
+#: partition_table.pm:854
 #, c-format
 msgid "Restoring from file %s failed: %s"
 msgstr "Taastamine failist %s ebaõnnestus: %s"
 
-#: partition_table.pm:854
+#: partition_table.pm:856
 #, c-format
 msgid "Bad backup file"
 msgstr "Kõlbmatu varukoopia"
 
-#: partition_table.pm:874
+#: partition_table.pm:876
 #, c-format
 msgid "Error writing to file %s"
 msgstr "Viga faili %s kirjutamisel"
 
-#: partition_table/raw.pm:181
+#: partition_table/raw.pm:187
 #, c-format
 msgid ""
 "Something bad is happening on your drive. \n"
@@ -10848,70 +10872,70 @@ msgstr "kena"
 msgid "maybe"
 msgstr "võib olla"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on %s)"
 msgstr "(masinal %s)"
 
-#: printer/cups.pm:87
+#: printer/cups.pm:103
 #, c-format
 msgid "(on this machine)"
 msgstr "(sellel masinal)"
 
-#: printer/cups.pm:99 standalone/printerdrake:197
+#: printer/cups.pm:115 standalone/printerdrake:197
 #, c-format
 msgid "Configured on other machines"
 msgstr "Seadistatud muudel masinatel"
 
-#: printer/cups.pm:101
+#: printer/cups.pm:117
 #, c-format
 msgid "On CUPS server \"%s\""
 msgstr "CUPS serveril \"%s\""
 
-#: printer/cups.pm:101 printer/printerdrake.pm:3784
-#: printer/printerdrake.pm:3793 printer/printerdrake.pm:3934
-#: printer/printerdrake.pm:3945 printer/printerdrake.pm:4157
+#: printer/cups.pm:117 printer/printerdrake.pm:3989
+#: printer/printerdrake.pm:3998 printer/printerdrake.pm:4139
+#: printer/printerdrake.pm:4150 printer/printerdrake.pm:4362
 #, c-format
 msgid " (Default)"
 msgstr " (Vaikimisi)"
 
-#: printer/data.pm:21
+#: printer/data.pm:22
 #, c-format
 msgid "PDQ - Print, Don't Queue"
 msgstr "PDQ - Trüki kohe"
 
-#: printer/data.pm:22
+#: printer/data.pm:23
 #, c-format
 msgid "PDQ"
 msgstr "PDQ"
 
-#: printer/data.pm:33
+#: printer/data.pm:34
 #, c-format
 msgid "LPD - Line Printer Daemon"
 msgstr "LDP - Otsetrükkimisdeemon"
 
-#: printer/data.pm:34
+#: printer/data.pm:35
 #, c-format
 msgid "LPD"
 msgstr "LPD"
 
-#: printer/data.pm:55
+#: printer/data.pm:56
 #, c-format
 msgid "LPRng - LPR New Generation"
 msgstr "LPRng - LPR, uus põlvkond"
 
-#: printer/data.pm:56
+#: printer/data.pm:57
 #, c-format
 msgid "LPRng"
 msgstr "LPRng"
 
-#: printer/data.pm:81
+#: printer/data.pm:82
 #, c-format
 msgid "CUPS - Common Unix Printing System"
 msgstr "CUPS - Tavaline UNIXi trükkimissüsteem"
 
 #: printer/detect.pm:148 printer/detect.pm:226 printer/detect.pm:428
-#: printer/detect.pm:465 printer/printerdrake.pm:679
+#: printer/detect.pm:465 printer/printerdrake.pm:686
 #, c-format
 msgid "Unknown Model"
 msgstr "Tundmatu mudel"
@@ -10931,7 +10955,7 @@ msgstr "Võrguprinter"
 msgid "Printer on remote CUPS server"
 msgstr "CUPS printserver"
 
-#: printer/main.pm:31 printer/printerdrake.pm:1372
+#: printer/main.pm:31 printer/printerdrake.pm:1406
 #, c-format
 msgid "Printer on remote lpd server"
 msgstr "lpd printserver"
@@ -10951,7 +10975,7 @@ msgstr "SMB/Windows 95/98/NT printserver"
 msgid "Printer on NetWare server"
 msgstr "NetWare printserver"
 
-#: printer/main.pm:35 printer/printerdrake.pm:1376
+#: printer/main.pm:35 printer/printerdrake.pm:1410
 #, c-format
 msgid "Enter a printer device URI"
 msgstr "Printeri seadme URI"
@@ -10962,8 +10986,8 @@ msgid "Pipe job into a command"
 msgstr "Töö toru kaudu käsuks"
 
 #: printer/main.pm:306 printer/main.pm:574 printer/main.pm:1544
-#: printer/main.pm:2217 printer/printerdrake.pm:1781
-#: printer/printerdrake.pm:4191
+#: printer/main.pm:2228 printer/main.pm:2239 printer/printerdrake.pm:1866
+#: printer/printerdrake.pm:4396
 #, c-format
 msgid "Unknown model"
 msgstr "Tundmatu mudel"
@@ -10973,12 +10997,12 @@ msgstr "Tundmatu mudel"
 msgid "Configured on this machine"
 msgstr "Seadistatud sellel masinal"
 
-#: printer/main.pm:337 printer/printerdrake.pm:948
+#: printer/main.pm:337 printer/printerdrake.pm:963
 #, c-format
 msgid " on parallel port #%s"
 msgstr " paralleelpordis #%s"
 
-#: printer/main.pm:340 printer/printerdrake.pm:950
+#: printer/main.pm:340 printer/printerdrake.pm:965
 #, c-format
 msgid ", USB printer #%s"
 msgstr ", USB printer #%s"
@@ -11048,8 +11072,8 @@ msgstr ", kasutades käsku %s"
 msgid "Parallel port #%s"
 msgstr "Paralleelpordis #%s"
 
-#: printer/main.pm:391 printer/printerdrake.pm:964 printer/printerdrake.pm:987
-#: printer/printerdrake.pm:1005
+#: printer/main.pm:391 printer/printerdrake.pm:979
+#: printer/printerdrake.pm:1002 printer/printerdrake.pm:1020
 #, c-format
 msgid "USB printer #%s"
 msgstr "USB printer #%s"
@@ -11119,8 +11143,8 @@ msgstr "Kasutades käsku %s"
 msgid "URI: %s"
 msgstr "URI: %s"
 
-#: printer/main.pm:571 printer/printerdrake.pm:725
-#: printer/printerdrake.pm:2331
+#: printer/main.pm:571 printer/printerdrake.pm:732
+#: printer/printerdrake.pm:2463
 #, c-format
 msgid "Raw printer (No driver)"
 msgstr "Toorprinter (draiverita)"
@@ -11178,7 +11202,7 @@ msgstr "CUPS printeri seadistused"
 #, c-format
 msgid ""
 "Here you can choose whether the printers connected to this machine should be "
-"accessable by remote machines and by which remote machines."
+"accessible by remote machines and by which remote machines."
 msgstr ""
 "Siin saate valida, millised selle arvuti külge kinnitatud printerid peaksid "
 "olema kättesaadavad ka teistele kohtvõrgu arvutitele ja millistele nende "
@@ -11213,8 +11237,8 @@ msgstr "Printeri jagamine masinal/võrgus:"
 msgid "Custom configuration"
 msgstr "Kohandatud seadistused"
 
-#: printer/printerdrake.pm:78 standalone/scannerdrake:554
-#: standalone/scannerdrake:571
+#: printer/printerdrake.pm:78 standalone/scannerdrake:561
+#: standalone/scannerdrake:578
 #, c-format
 msgid "No remote machines"
 msgstr "Ainult sellel masinal"
@@ -11425,7 +11449,7 @@ msgstr "Serveri IP puudub!"
 msgid "The entered IP is not correct.\n"
 msgstr "Sisestatud IP aadress ei ole korrektne.\n"
 
-#: printer/printerdrake.pm:411 printer/printerdrake.pm:1582
+#: printer/printerdrake.pm:411 printer/printerdrake.pm:1629
 #, c-format
 msgid "The port number should be an integer!"
 msgstr "Pordi number peab olema täisarv!"
@@ -11435,36 +11459,37 @@ msgstr "Pordi number peab olema täisarv!"
 msgid "This server is already in the list, it cannot be added again.\n"
 msgstr "See server on juba nimekirjas ja seda ei ole võimalik uuesti lisada.\n"
 
-#: printer/printerdrake.pm:433 printer/printerdrake.pm:1603
-#: standalone/harddrake2:64
+#: printer/printerdrake.pm:433 printer/printerdrake.pm:1650
+#: standalone/drakups:233 standalone/harddrake2:64
 #, c-format
 msgid "Port"
 msgstr "Port"
 
 #: printer/printerdrake.pm:478 printer/printerdrake.pm:545
-#: printer/printerdrake.pm:605 printer/printerdrake.pm:621
-#: printer/printerdrake.pm:704 printer/printerdrake.pm:761
-#: printer/printerdrake.pm:787 printer/printerdrake.pm:1800
-#: printer/printerdrake.pm:1808 printer/printerdrake.pm:1830
-#: printer/printerdrake.pm:1857 printer/printerdrake.pm:1892
-#: printer/printerdrake.pm:1929 printer/printerdrake.pm:1939
-#: printer/printerdrake.pm:2182 printer/printerdrake.pm:2187
-#: printer/printerdrake.pm:2326 printer/printerdrake.pm:2436
-#: printer/printerdrake.pm:2901 printer/printerdrake.pm:2966
-#: printer/printerdrake.pm:3000 printer/printerdrake.pm:3003
-#: printer/printerdrake.pm:3122 printer/printerdrake.pm:3184
-#: printer/printerdrake.pm:3256 printer/printerdrake.pm:3277
-#: printer/printerdrake.pm:3286 printer/printerdrake.pm:3377
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3481
-#: printer/printerdrake.pm:3488 printer/printerdrake.pm:3534
-#: printer/printerdrake.pm:3574 printer/printerdrake.pm:3586
-#: printer/printerdrake.pm:3597 printer/printerdrake.pm:3606
-#: printer/printerdrake.pm:3619 printer/printerdrake.pm:3689
-#: printer/printerdrake.pm:3740 printer/printerdrake.pm:3805
-#: printer/printerdrake.pm:4065 printer/printerdrake.pm:4108
-#: printer/printerdrake.pm:4254 printer/printerdrake.pm:4312
-#: printer/printerdrake.pm:4341 standalone/printerdrake:65
-#: standalone/printerdrake:85 standalone/printerdrake:515
+#: printer/printerdrake.pm:610 printer/printerdrake.pm:628
+#: printer/printerdrake.pm:711 printer/printerdrake.pm:768
+#: printer/printerdrake.pm:794 printer/printerdrake.pm:1703
+#: printer/printerdrake.pm:1886 printer/printerdrake.pm:1902
+#: printer/printerdrake.pm:1945 printer/printerdrake.pm:1982
+#: printer/printerdrake.pm:2024 printer/printerdrake.pm:2061
+#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2314
+#: printer/printerdrake.pm:2319 printer/printerdrake.pm:2458
+#: printer/printerdrake.pm:2568 printer/printerdrake.pm:3069
+#: printer/printerdrake.pm:3134 printer/printerdrake.pm:3177
+#: printer/printerdrake.pm:3180 printer/printerdrake.pm:3299
+#: printer/printerdrake.pm:3364 printer/printerdrake.pm:3436
+#: printer/printerdrake.pm:3457 printer/printerdrake.pm:3466
+#: printer/printerdrake.pm:3557 printer/printerdrake.pm:3655
+#: printer/printerdrake.pm:3661 printer/printerdrake.pm:3674
+#: printer/printerdrake.pm:3726 printer/printerdrake.pm:3766
+#: printer/printerdrake.pm:3778 printer/printerdrake.pm:3789
+#: printer/printerdrake.pm:3798 printer/printerdrake.pm:3811
+#: printer/printerdrake.pm:3888 printer/printerdrake.pm:3945
+#: printer/printerdrake.pm:4010 printer/printerdrake.pm:4270
+#: printer/printerdrake.pm:4313 printer/printerdrake.pm:4459
+#: printer/printerdrake.pm:4517 printer/printerdrake.pm:4546
+#: standalone/printerdrake:65 standalone/printerdrake:85
+#: standalone/printerdrake:515
 #, c-format
 msgid "Printerdrake"
 msgstr "Printerdrake"
@@ -11495,35 +11520,41 @@ msgstr ""
 "Kui võrgus on CUPS server, siis ei ole Teil vaja siin printereid seadistada, "
 "need leitakse automaatselt."
 
-#: printer/printerdrake.pm:508 printer/printerdrake.pm:3807
+#: printer/printerdrake.pm:508 printer/printerdrake.pm:4012
 #, c-format
 msgid ""
 "\n"
 "WARNING: No local network connection active, remote printers can neither be "
 "detected nor tested!"
 msgstr ""
+"\n"
+"HOIATUS: kohtvõrk pole käivitatud, võrguprintereid ei saa seepärast ei "
+"tuvastada ega testida!"
 
 #: printer/printerdrake.pm:515
 #, c-format
-msgid "Printer auto-detection (Local, TCP/Socket, and SMB printers)"
-msgstr "Printeri automaattuvastus (kohalikud, TCP/Socketi ja SMB printerid)"
+msgid ""
+"Printer auto-detection (Local, TCP/Socket, SMB printers, and device URI)"
+msgstr ""
+"Printeri automaattuvastus (kohalikud, TCP/Socketi, SMB printerid ja seadme "
+"URI)"
 
 #: printer/printerdrake.pm:545
 #, c-format
 msgid "Checking your system..."
 msgstr "Süsteemi kontrollimine..."
 
-#: printer/printerdrake.pm:560
+#: printer/printerdrake.pm:561
 #, c-format
 msgid "and one unknown printer"
 msgstr "ja üks tundmatu printer"
 
-#: printer/printerdrake.pm:562
+#: printer/printerdrake.pm:563
 #, c-format
 msgid "and %d unknown printers"
 msgstr "ja %d tundmatut printerit"
 
-#: printer/printerdrake.pm:566
+#: printer/printerdrake.pm:567
 #, c-format
 msgid ""
 "The following printers\n"
@@ -11536,7 +11567,7 @@ msgstr ""
 "%s%s\n"
 "printerid"
 
-#: printer/printerdrake.pm:568
+#: printer/printerdrake.pm:569
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11549,7 +11580,7 @@ msgstr ""
 "%s%s\n"
 "printer(id)"
 
-#: printer/printerdrake.pm:569
+#: printer/printerdrake.pm:570
 #, c-format
 msgid ""
 "The following printer\n"
@@ -11562,7 +11593,7 @@ msgstr ""
 "%s%s\n"
 "printer"
 
-#: printer/printerdrake.pm:573
+#: printer/printerdrake.pm:574
 #, c-format
 msgid ""
 "\n"
@@ -11571,7 +11602,7 @@ msgstr ""
 "\n"
 "Üks tundmatu printer on Teie süsteemi otse ühendatud"
 
-#: printer/printerdrake.pm:574
+#: printer/printerdrake.pm:575
 #, c-format
 msgid ""
 "\n"
@@ -11580,18 +11611,18 @@ msgstr ""
 "\n"
 "%d tundmatut printerit on Teie süsteemi otse ühendatud"
 
-#: printer/printerdrake.pm:577
+#: printer/printerdrake.pm:578
 #, c-format
 msgid ""
 "There are no printers found which are directly connected to your machine"
 msgstr "Ei leitud ühtegi printerit, mis oleks masinaga otse ühendatud"
 
-#: printer/printerdrake.pm:580
+#: printer/printerdrake.pm:581
 #, c-format
 msgid " (Make sure that all your printers are connected and turned on).\n"
 msgstr " (Kontrollige, et kõik printerid on ühendatud ja sisse lülitatud).\n"
 
-#: printer/printerdrake.pm:593
+#: printer/printerdrake.pm:594
 #, c-format
 msgid ""
 "Do you want to enable printing on the printers mentioned above or on "
@@ -11600,23 +11631,23 @@ msgstr ""
 "Kas soovite trükkimist lubada ülalmainitud printeritel või printeritel Teie "
 "kohtvõrgus?\n"
 
-#: printer/printerdrake.pm:594
+#: printer/printerdrake.pm:595
 #, c-format
 msgid "Do you want to enable printing on printers in the local network?\n"
 msgstr "Kas soovite trükkimist lubada printeritel Teie kohtvõrgus?\n"
 
-#: printer/printerdrake.pm:596
+#: printer/printerdrake.pm:597
 #, c-format
 msgid "Do you want to enable printing on the printers mentioned above?\n"
 msgstr "Kas soovite trükkimist lubada ülalmainitud printeritel?\n"
 
-#: printer/printerdrake.pm:597
+#: printer/printerdrake.pm:598
 #, c-format
 msgid "Are you sure that you want to set up printing on this machine?\n"
 msgstr ""
 "Kas olete ikka kindel, et soovite seadistada trükkimist sellel masinal?\n"
 
-#: printer/printerdrake.pm:598
+#: printer/printerdrake.pm:599
 #, c-format
 msgid ""
 "NOTE: Depending on the printer model and the printing system up to %d MB of "
@@ -11625,48 +11656,48 @@ msgstr ""
 "MÄRKUS: Sõltuvalt printeri mudelist ja trükkimissüsteemist paigaldatakse "
 "kuni %d MB lisatarkvara."
 
-#: printer/printerdrake.pm:622
+#: printer/printerdrake.pm:629
 #, c-format
 msgid "Searching for new printers..."
 msgstr "Uute printerite otsimine..."
 
-#: printer/printerdrake.pm:706
+#: printer/printerdrake.pm:713
 #, c-format
 msgid "Configuring printer ..."
 msgstr "Printeri seadistamine..."
 
-#: printer/printerdrake.pm:707 printer/printerdrake.pm:762
-#: printer/printerdrake.pm:3598
+#: printer/printerdrake.pm:714 printer/printerdrake.pm:769
+#: printer/printerdrake.pm:3790
 #, c-format
 msgid "Configuring printer \"%s\"..."
 msgstr "Printeri \"%s\" seadistamine..."
 
-#: printer/printerdrake.pm:727
+#: printer/printerdrake.pm:734
 #, c-format
 msgid "("
 msgstr "("
 
-#: printer/printerdrake.pm:728
+#: printer/printerdrake.pm:735
 #, c-format
 msgid " on "
 msgstr " masinal "
 
-#: printer/printerdrake.pm:729 standalone/scannerdrake:130
+#: printer/printerdrake.pm:736 standalone/scannerdrake:136
 #, c-format
 msgid ")"
 msgstr ")"
 
-#: printer/printerdrake.pm:734 printer/printerdrake.pm:2338
+#: printer/printerdrake.pm:741 printer/printerdrake.pm:2470
 #, c-format
 msgid "Printer model selection"
 msgstr "Printeri mudeli valik"
 
-#: printer/printerdrake.pm:735 printer/printerdrake.pm:2339
+#: printer/printerdrake.pm:742 printer/printerdrake.pm:2471
 #, c-format
 msgid "Which printer model do you have?"
 msgstr "Milline on Teie printeri mudel?"
 
-#: printer/printerdrake.pm:736
+#: printer/printerdrake.pm:743
 #, c-format
 msgid ""
 "\n"
@@ -11679,7 +11710,7 @@ msgstr ""
 "Printerdrake ei suutnud määrata Teie printeri %s mudelit. Valige palun õige "
 "mudel nimekirjast."
 
-#: printer/printerdrake.pm:739 printer/printerdrake.pm:2344
+#: printer/printerdrake.pm:746 printer/printerdrake.pm:2476
 #, c-format
 msgid ""
 "If your printer is not listed, choose a compatible (see printer manual) or a "
@@ -11688,21 +11719,21 @@ msgstr ""
 "Kui Teie printerit loendis ei leidu, valige mõni ühilduv (vaadake printeri "
 "käsiraamatust) või sarnane."
 
-#: printer/printerdrake.pm:788 printer/printerdrake.pm:3587
-#: printer/printerdrake.pm:3741 printer/printerdrake.pm:4066
-#: printer/printerdrake.pm:4109 printer/printerdrake.pm:4313
+#: printer/printerdrake.pm:795 printer/printerdrake.pm:3779
+#: printer/printerdrake.pm:3946 printer/printerdrake.pm:4271
+#: printer/printerdrake.pm:4314 printer/printerdrake.pm:4518
 #, c-format
 msgid "Configuring applications..."
 msgstr "Rakenduste seadistamine..."
 
-#: printer/printerdrake.pm:824 printer/printerdrake.pm:836
-#: printer/printerdrake.pm:894 printer/printerdrake.pm:1787
-#: printer/printerdrake.pm:3823 printer/printerdrake.pm:4006
+#: printer/printerdrake.pm:831 printer/printerdrake.pm:843
+#: printer/printerdrake.pm:901 printer/printerdrake.pm:1872
+#: printer/printerdrake.pm:4028 printer/printerdrake.pm:4211
 #, c-format
 msgid "Add a new printer"
 msgstr "Lisa uus printer"
 
-#: printer/printerdrake.pm:825
+#: printer/printerdrake.pm:832
 #, c-format
 msgid ""
 "\n"
@@ -11725,7 +11756,7 @@ msgstr ""
 "tähendab olemasolevad printeridraiverid, draiveri valikud ja printeri "
 "ühendusviis."
 
-#: printer/printerdrake.pm:838
+#: printer/printerdrake.pm:845
 #, c-format
 msgid ""
 "\n"
@@ -11765,7 +11796,7 @@ msgstr ""
 "Kui olete valmis, vajutage \"Järgmine\", või \"Loobu\", kui Te ei soovi "
 "printeri(te) seadistamisega praegu tegelda."
 
-#: printer/printerdrake.pm:847
+#: printer/printerdrake.pm:854
 #, c-format
 msgid ""
 "\n"
@@ -11793,7 +11824,7 @@ msgstr ""
 "Kui olete valmis, vajutage \"Järgmine\", või \"Loobu\", kui Te ei soovi "
 "praegu printeri(te) seadistamisega tegelda."
 
-#: printer/printerdrake.pm:855
+#: printer/printerdrake.pm:862
 #, c-format
 msgid ""
 "\n"
@@ -11830,7 +11861,7 @@ msgstr ""
 "Kui olete valmis, vajutage \"Järgmine\", või \"Loobu\", kui Te ei soovi "
 "praegu printeri(te) seadistamisega tegelda."
 
-#: printer/printerdrake.pm:864
+#: printer/printerdrake.pm:871
 #, c-format
 msgid ""
 "\n"
@@ -11858,22 +11889,22 @@ msgstr ""
 "Kui olete valmis, vajutage \"Järgmine\", või \"Loobu\", kui Te ei soovi "
 "praegu printeri(te) seadistamisega tegelda."
 
-#: printer/printerdrake.pm:873
+#: printer/printerdrake.pm:880
 #, c-format
 msgid "Auto-detect printers connected to this machine"
 msgstr "Selle masinaga ühendatud printerite automaattuvastus"
 
-#: printer/printerdrake.pm:876
+#: printer/printerdrake.pm:883
 #, c-format
 msgid "Auto-detect printers connected directly to the local network"
 msgstr "Kohtvõrku ühendatud printerite automaattuvastus"
 
-#: printer/printerdrake.pm:879
+#: printer/printerdrake.pm:886
 #, c-format
 msgid "Auto-detect printers connected to machines running Microsoft Windows"
 msgstr "Microsoft Windowsi masinatega ühendatud printerite automaattuvastus"
 
-#: printer/printerdrake.pm:895
+#: printer/printerdrake.pm:902
 #, c-format
 msgid ""
 "\n"
@@ -11896,54 +11927,70 @@ msgstr ""
 "muuta vaikeseadistusi (trükikvaliteet, paberisalv,...), valige %s "
 "juhtimiskeskuse \"Riistvara\" sektsioonis \"Printer\"."
 
-#: printer/printerdrake.pm:930 printer/printerdrake.pm:1060
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:937 printer/printerdrake.pm:1152
+#: printer/printerdrake.pm:1214 printer/printerdrake.pm:1304
+#: printer/printerdrake.pm:1441 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1667 printer/printerdrake.pm:1750
+#: printer/printerdrake.pm:1759 printer/printerdrake.pm:1768
+#: printer/printerdrake.pm:1779 printer/printerdrake.pm:1892
+#: printer/printerdrake.pm:1954 printer/printerdrake.pm:1988
+#, c-format
+msgid "Could not install the %s packages!"
+msgstr "Ei õnnestunud paigaldada %s paketti!"
+
+#: printer/printerdrake.pm:939
+#, c-format
+msgid "Skipping Windows/SMB server auto-detection"
+msgstr "Windows/SMB serveri automaattuvastus jäetakse vahele"
+
+#: printer/printerdrake.pm:945 printer/printerdrake.pm:1075
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Printer auto-detection"
 msgstr "Printeri automaattuvastus"
 
-#: printer/printerdrake.pm:930
+#: printer/printerdrake.pm:945
 #, c-format
 msgid "Detecting devices..."
 msgstr "Seadmete otsimine..."
 
-#: printer/printerdrake.pm:952
+#: printer/printerdrake.pm:967
 #, c-format
 msgid ", network printer \"%s\", port %s"
 msgstr ", võrguprinter \"%s\", port %s"
 
-#: printer/printerdrake.pm:954
+#: printer/printerdrake.pm:969
 #, c-format
 msgid ", printer \"%s\" on SMB/Windows server \"%s\""
 msgstr ", printer \"%s\" SMB/Windows serveril \"%s\""
 
-#: printer/printerdrake.pm:958
+#: printer/printerdrake.pm:973
 #, c-format
 msgid "Detected %s"
 msgstr "Tuvastati %s"
 
-#: printer/printerdrake.pm:962 printer/printerdrake.pm:985
-#: printer/printerdrake.pm:1002
+#: printer/printerdrake.pm:977 printer/printerdrake.pm:1000
+#: printer/printerdrake.pm:1017
 #, c-format
 msgid "Printer on parallel port #%s"
 msgstr "Printer paralleelpordis #%s"
 
-#: printer/printerdrake.pm:966
+#: printer/printerdrake.pm:981
 #, c-format
 msgid "Network printer \"%s\", port %s"
 msgstr "Võrguprinter \"%s\", port %s"
 
-#: printer/printerdrake.pm:968
+#: printer/printerdrake.pm:983
 #, c-format
 msgid "Printer \"%s\" on SMB/Windows server \"%s\""
 msgstr "Printer \"%s\" SMB/Windows serveril \"%s\""
 
-#: printer/printerdrake.pm:1047
+#: printer/printerdrake.pm:1062
 #, c-format
 msgid "Local Printer"
 msgstr "Kohalik printer"
 
-#: printer/printerdrake.pm:1048
+#: printer/printerdrake.pm:1063
 #, c-format
 msgid ""
 "No local printer found! To manually install a printer enter a device name/"
@@ -11956,32 +12003,32 @@ msgstr ""
 "mille vasteks teistes süsteemides on LPT1, LPT2...; esimene USB printer: /"
 "dev/usb/lp0, teine USB printer: /dev/usb/lp1...)"
 
-#: printer/printerdrake.pm:1052
+#: printer/printerdrake.pm:1067
 #, c-format
 msgid "You must enter a device or file name!"
 msgstr "Seadme- või failinime sisestamine on kohustuslik!"
 
-#: printer/printerdrake.pm:1061
+#: printer/printerdrake.pm:1076
 #, c-format
 msgid "No printer found!"
 msgstr "Printerit ei leitud!"
 
-#: printer/printerdrake.pm:1069
+#: printer/printerdrake.pm:1084
 #, c-format
 msgid "Local Printers"
 msgstr "Kohalikud printerid"
 
-#: printer/printerdrake.pm:1070
+#: printer/printerdrake.pm:1085
 #, c-format
 msgid "Available printers"
 msgstr "Saadaolevad printerid"
 
-#: printer/printerdrake.pm:1074 printer/printerdrake.pm:1083
+#: printer/printerdrake.pm:1089 printer/printerdrake.pm:1098
 #, c-format
 msgid "The following printer was auto-detected. "
 msgstr "See printer tuvastati automaatselt. "
 
-#: printer/printerdrake.pm:1076
+#: printer/printerdrake.pm:1091
 #, c-format
 msgid ""
 "If it is not the one you want to configure, enter a device name/file name in "
@@ -11990,18 +12037,18 @@ msgstr ""
 "Kui see ei ole printer, mida soovite seadistada, kirjutage sisendireale "
 "seadmenimi/failinimi"
 
-#: printer/printerdrake.pm:1077
+#: printer/printerdrake.pm:1092
 #, c-format
 msgid ""
 "Alternatively, you can specify a device name/file name in the input line"
 msgstr "Soovi korral võite ka sisendireal määrata seadmenime/failinime"
 
-#: printer/printerdrake.pm:1078 printer/printerdrake.pm:1087
+#: printer/printerdrake.pm:1093 printer/printerdrake.pm:1102
 #, c-format
 msgid "Here is a list of all auto-detected printers. "
 msgstr "Nimekiri kõigist automaatselt tuvastatud printeritest. "
 
-#: printer/printerdrake.pm:1080
+#: printer/printerdrake.pm:1095
 #, c-format
 msgid ""
 "Please choose the printer you want to set up or enter a device name/file "
@@ -12010,7 +12057,7 @@ msgstr ""
 "Valige palun printer, mida soovite seadistada, või kirjutage sisendireale "
 "seadmenimi/failinimi"
 
-#: printer/printerdrake.pm:1081
+#: printer/printerdrake.pm:1096
 #, c-format
 msgid ""
 "Please choose the printer to which the print jobs should go or enter a "
@@ -12019,7 +12066,7 @@ msgstr ""
 "Valige palun printer, kuhu trükitööd tuleks saata, või kirjutage "
 "sisendireale seadmenimi/failinimi"
 
-#: printer/printerdrake.pm:1085
+#: printer/printerdrake.pm:1100
 #, c-format
 msgid ""
 "The configuration of the printer will work fully automatically. If your "
@@ -12030,12 +12077,12 @@ msgstr ""
 "tuvastati valesti või Te eelistate seadistusi korrigeerida, lülitage sisse "
 "\"Käsitsiseadistamine\"."
 
-#: printer/printerdrake.pm:1086
+#: printer/printerdrake.pm:1101
 #, c-format
 msgid "Currently, no alternative possibility is available"
 msgstr "Praegu ei ole ühtegi teist võimalust"
 
-#: printer/printerdrake.pm:1089
+#: printer/printerdrake.pm:1104
 #, c-format
 msgid ""
 "Please choose the printer you want to set up. The configuration of the "
@@ -12047,12 +12094,12 @@ msgstr ""
 "toimima täiesti automaatselt. Kui printer tuvastati valesti või Te eelistate "
 "selle seadistusi korrigeerida, lülitage sisse \"Käsitsiseadistamine\"."
 
-#: printer/printerdrake.pm:1090
+#: printer/printerdrake.pm:1105
 #, c-format
 msgid "Please choose the printer to which the print jobs should go."
 msgstr "Valige palun printer, kuhu tuleks saata trükitööd."
 
-#: printer/printerdrake.pm:1092
+#: printer/printerdrake.pm:1107
 #, c-format
 msgid ""
 "Please choose the port that your printer is connected to or enter a device "
@@ -12061,12 +12108,12 @@ msgstr ""
 "Valige palun port, kuhu printer on ühendatud, või kirjutage sisendireale "
 "seadmenimi/failinimi"
 
-#: printer/printerdrake.pm:1093
+#: printer/printerdrake.pm:1108
 #, c-format
 msgid "Please choose the port that your printer is connected to."
 msgstr "Valige palun port, kuhu Teie printer on ühendatud."
 
-#: printer/printerdrake.pm:1095
+#: printer/printerdrake.pm:1110
 #, c-format
 msgid ""
 " (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., "
@@ -12076,17 +12123,26 @@ msgstr ""
 "LPT1:, LPT2:...; esimene USB printer: /dev/usb/lp0, teine USB printer: /dev/"
 "usb/lp1...)"
 
-#: printer/printerdrake.pm:1099
+#: printer/printerdrake.pm:1114
 #, c-format
 msgid "You must choose/enter a printer/device!"
 msgstr "Printeri/seadme valimine/sisestamine on kohustuslik!"
 
-#: printer/printerdrake.pm:1168
+#: printer/printerdrake.pm:1154 printer/printerdrake.pm:1216
+#: printer/printerdrake.pm:1306 printer/printerdrake.pm:1443
+#: printer/printerdrake.pm:1518 printer/printerdrake.pm:1669
+#: printer/printerdrake.pm:1752 printer/printerdrake.pm:1761
+#: printer/printerdrake.pm:1770 printer/printerdrake.pm:1781
+#, c-format
+msgid "Aborting"
+msgstr "Katkestamine"
+
+#: printer/printerdrake.pm:1189
 #, c-format
 msgid "Remote lpd Printer Options"
 msgstr "Võrguprinteri (lpd) seadistused"
 
-#: printer/printerdrake.pm:1169
+#: printer/printerdrake.pm:1190
 #, c-format
 msgid ""
 "To use a remote lpd printer, you need to supply the hostname of the printer "
@@ -12095,66 +12151,65 @@ msgstr ""
 "Et kasutada teise masina lpd printerit, peate sisestama printserveri nime ja "
 "serveril kasutatava printeri nime."
 
-#: printer/printerdrake.pm:1170
+#: printer/printerdrake.pm:1191
 #, c-format
 msgid "Remote host name"
 msgstr "Kaugarvuti nimi"
 
-#: printer/printerdrake.pm:1171
+#: printer/printerdrake.pm:1192
 #, c-format
 msgid "Remote printer name"
 msgstr "Võrguprinteri nimi"
 
-#: printer/printerdrake.pm:1174
+#: printer/printerdrake.pm:1195
 #, c-format
 msgid "Remote host name missing!"
 msgstr "Kaugarvuti nimi puudub!"
 
-#: printer/printerdrake.pm:1178
+#: printer/printerdrake.pm:1199
 #, c-format
 msgid "Remote printer name missing!"
 msgstr "Võrguprinteri nimi puudub!"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
-#: standalone/drakTermServ:442 standalone/drakTermServ:725
-#: standalone/drakTermServ:741 standalone/drakTermServ:1332
-#: standalone/drakTermServ:1340 standalone/drakTermServ:1351
-#: standalone/drakbackup:767 standalone/drakbackup:874
-#: standalone/drakbackup:908 standalone/drakbackup:1027
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#: standalone/drakconnect:254 standalone/drakconnect:283
-#: standalone/drakconnect:512 standalone/drakconnect:516
-#: standalone/drakconnect:540 standalone/harddrake2:159
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
+#: standalone/drakTermServ:465 standalone/drakTermServ:763
+#: standalone/drakTermServ:779 standalone/drakTermServ:1417
+#: standalone/drakTermServ:1425 standalone/drakTermServ:1436
+#: standalone/drakbackup:582 standalone/drakbackup:687
+#: standalone/drakbackup:722 standalone/drakbackup:840
+#: standalone/drakconnect:263 standalone/drakconnect:298
+#: standalone/drakconnect:542 standalone/drakconnect:552
+#: standalone/drakconnect:576 standalone/harddrake2:160
 #, c-format
 msgid "Information"
 msgstr "Info"
 
-#: printer/printerdrake.pm:1200 printer/printerdrake.pm:1714
+#: printer/printerdrake.pm:1228 printer/printerdrake.pm:1799
 #, c-format
 msgid "Detected model: %s %s"
 msgstr "Tuvastati mudel: %s %s"
 
-#: printer/printerdrake.pm:1276 printer/printerdrake.pm:1516
+#: printer/printerdrake.pm:1310 printer/printerdrake.pm:1563
 #, c-format
 msgid "Scanning network..."
 msgstr "Võrgu uurimine..."
 
-#: printer/printerdrake.pm:1287 printer/printerdrake.pm:1308
+#: printer/printerdrake.pm:1321 printer/printerdrake.pm:1342
 #, c-format
 msgid ", printer \"%s\" on server \"%s\""
 msgstr ", printer \"%s\" serveril \"%s\""
 
-#: printer/printerdrake.pm:1290 printer/printerdrake.pm:1311
+#: printer/printerdrake.pm:1324 printer/printerdrake.pm:1345
 #, c-format
 msgid "Printer \"%s\" on server \"%s\""
 msgstr "Printer \"%s\" serveril \"%s\""
 
-#: printer/printerdrake.pm:1332
+#: printer/printerdrake.pm:1366
 #, c-format
 msgid "SMB (Windows 9x/NT) Printer Options"
 msgstr "SMB (Windows 9x/NT) printeri seadistused"
 
-#: printer/printerdrake.pm:1333
+#: printer/printerdrake.pm:1367
 #, c-format
 msgid ""
 "To print to a SMB printer, you need to provide the SMB host name (Note! It "
@@ -12167,7 +12222,7 @@ msgstr ""
 "printserveri IP-aadressi, samuti ka serveri poolt jagatava printeri\n"
 "nime ning serveri poolt aktsepteeritud kasutajatunnuse, salasõna ja töögrupi."
 
-#: printer/printerdrake.pm:1334
+#: printer/printerdrake.pm:1368
 #, c-format
 msgid ""
 " If the desired printer was auto-detected, simply choose it from the list "
@@ -12176,47 +12231,47 @@ msgstr ""
 " Kui soovitud printer tuvastati automaatselt, valige see loendist ning "
 "lisage siis vajadusel kasutajatunnus, parool ja/või töögrupp."
 
-#: printer/printerdrake.pm:1336
+#: printer/printerdrake.pm:1370
 #, c-format
 msgid "SMB server host"
 msgstr "SMB serveri nimi"
 
-#: printer/printerdrake.pm:1337
+#: printer/printerdrake.pm:1371
 #, c-format
 msgid "SMB server IP"
 msgstr "SMB serveri IP"
 
-#: printer/printerdrake.pm:1338
+#: printer/printerdrake.pm:1372
 #, c-format
 msgid "Share name"
 msgstr "Jagatav printer"
 
-#: printer/printerdrake.pm:1341
+#: printer/printerdrake.pm:1375
 #, c-format
 msgid "Workgroup"
 msgstr "Töögrupp"
 
-#: printer/printerdrake.pm:1343
+#: printer/printerdrake.pm:1377
 #, c-format
 msgid "Auto-detected"
 msgstr "Automaatselt tuvastatud"
 
-#: printer/printerdrake.pm:1353
+#: printer/printerdrake.pm:1387
 #, c-format
 msgid "Either the server name or the server's IP must be given!"
 msgstr "Andma peab kas serveri nime või serveri IP!"
 
-#: printer/printerdrake.pm:1357
+#: printer/printerdrake.pm:1391
 #, c-format
 msgid "Samba share name missing!"
 msgstr "Samba jagatava printeri nimi puudub!"
 
-#: printer/printerdrake.pm:1363
+#: printer/printerdrake.pm:1397
 #, c-format
 msgid "SECURITY WARNING!"
 msgstr "TURVAHOIATUS!"
 
-#: printer/printerdrake.pm:1364
+#: printer/printerdrake.pm:1398
 #, c-format
 msgid ""
 "You are about to set up printing to a Windows account with password. Due to "
@@ -12258,7 +12313,7 @@ msgstr ""
 "\".\n"
 "\n"
 
-#: printer/printerdrake.pm:1374
+#: printer/printerdrake.pm:1408
 #, c-format
 msgid ""
 "Set up your Windows server to make the printer available under the IPP "
@@ -12271,7 +12326,7 @@ msgstr ""
 "ühendustüübiga Printerdrakes.\n"
 "\n"
 
-#: printer/printerdrake.pm:1377
+#: printer/printerdrake.pm:1411
 #, c-format
 msgid ""
 "Connect your printer to a Linux server and let your Windows machine(s) "
@@ -12284,12 +12339,12 @@ msgstr ""
 "\n"
 "Kas soovite tõesti jätkata selle printeri seadistamist?"
 
-#: printer/printerdrake.pm:1449
+#: printer/printerdrake.pm:1489
 #, c-format
 msgid "NetWare Printer Options"
 msgstr "NetWare printeri seadistused"
 
-#: printer/printerdrake.pm:1450
+#: printer/printerdrake.pm:1490
 #, c-format
 msgid ""
 "To print on a NetWare printer, you need to provide the NetWare print server "
@@ -12301,42 +12356,42 @@ msgstr ""
 "(NB! See võib olla erinev tema TCP/IP nimest!), samuti trükijärjekorra nime "
 "serveril ning kasutajatunnuse ja salasõna."
 
-#: printer/printerdrake.pm:1451
+#: printer/printerdrake.pm:1491
 #, c-format
 msgid "Printer Server"
 msgstr "Printserver"
 
-#: printer/printerdrake.pm:1452
+#: printer/printerdrake.pm:1492
 #, c-format
 msgid "Print Queue Name"
 msgstr "Trükijärjekorra nimi"
 
-#: printer/printerdrake.pm:1457
+#: printer/printerdrake.pm:1497
 #, c-format
 msgid "NCP server name missing!"
 msgstr "NCP serveri nimi puudub!"
 
-#: printer/printerdrake.pm:1461
+#: printer/printerdrake.pm:1501
 #, c-format
 msgid "NCP queue name missing!"
 msgstr "NCP järjekorra nimi puudub!"
 
-#: printer/printerdrake.pm:1527 printer/printerdrake.pm:1547
+#: printer/printerdrake.pm:1574 printer/printerdrake.pm:1594
 #, c-format
 msgid ", host \"%s\", port %s"
 msgstr ", masin \"%s\", port %s"
 
-#: printer/printerdrake.pm:1530 printer/printerdrake.pm:1550
+#: printer/printerdrake.pm:1577 printer/printerdrake.pm:1597
 #, c-format
 msgid "Host \"%s\", port %s"
 msgstr "Masin \"%s\", port %s"
 
-#: printer/printerdrake.pm:1571
+#: printer/printerdrake.pm:1618
 #, c-format
 msgid "TCP/Socket Printer Options"
 msgstr "TCP/Socket printeri seadistused"
 
-#: printer/printerdrake.pm:1573
+#: printer/printerdrake.pm:1620
 #, c-format
 msgid ""
 "Choose one of the auto-detected printers from the list or enter the hostname "
@@ -12346,7 +12401,7 @@ msgstr ""
 "sisendiväljale masinanimi või IP ja kui teate, ka pordi number (vaikimisi on "
 "see 9100)."
 
-#: printer/printerdrake.pm:1574
+#: printer/printerdrake.pm:1621
 #, c-format
 msgid ""
 "To print to a TCP or socket printer, you need to provide the host name or IP "
@@ -12359,22 +12414,27 @@ msgstr ""
 "serveritel on pordi number tavaliselt 9100, teistel serveritel võib see olla "
 "teistsugune. Kontrollige seda oma riistvara käsiraamatust."
 
-#: printer/printerdrake.pm:1578
+#: printer/printerdrake.pm:1625
 #, c-format
 msgid "Printer host name or IP missing!"
 msgstr "Printeri masinanimi või IP puudub!"
 
-#: printer/printerdrake.pm:1601
+#: printer/printerdrake.pm:1648
 #, c-format
 msgid "Printer host name or IP"
 msgstr "Printeri masinanimi või IP"
 
-#: printer/printerdrake.pm:1649 printer/printerdrake.pm:1651
+#: printer/printerdrake.pm:1704
+#, c-format
+msgid "Refreshing Device URI list..."
+msgstr "Printeri andmete värskendamine..."
+
+#: printer/printerdrake.pm:1707 printer/printerdrake.pm:1709
 #, c-format
 msgid "Printer Device URI"
 msgstr "Printeri seadme URI"
 
-#: printer/printerdrake.pm:1650
+#: printer/printerdrake.pm:1708
 #, c-format
 msgid ""
 "You can specify directly the URI to access the printer. The URI must fulfill "
@@ -12385,34 +12445,34 @@ msgstr ""
 "CUPSi või Foomaticu spetsifikatsiooni. Pange tähele, et mitte kõik spuulerid "
 "ei toeta kõiki URI tüüpe."
 
-#: printer/printerdrake.pm:1668
+#: printer/printerdrake.pm:1731
 #, c-format
 msgid "A valid URI must be entered!"
 msgstr "Sisestama peab sobiva URI!"
 
-#: printer/printerdrake.pm:1749
+#: printer/printerdrake.pm:1834
 #, c-format
 msgid "Pipe into command"
 msgstr "Töö toru kaudu käsuks"
 
-#: printer/printerdrake.pm:1750
+#: printer/printerdrake.pm:1835
 #, c-format
 msgid ""
 "Here you can specify any arbitrary command line into which the job should be "
 "piped instead of being sent directly to a printer."
 msgstr "Siin saate määrata printeri asemele suvalise käsurea."
 
-#: printer/printerdrake.pm:1751
+#: printer/printerdrake.pm:1836
 #, c-format
 msgid "Command line"
 msgstr "Käsurida"
 
-#: printer/printerdrake.pm:1755
+#: printer/printerdrake.pm:1840
 #, c-format
 msgid "A command line must be entered!"
 msgstr "Sisestama peab käsurea!"
 
-#: printer/printerdrake.pm:1788
+#: printer/printerdrake.pm:1873
 #, c-format
 msgid ""
 "Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, "
@@ -12423,58 +12483,73 @@ msgstr ""
 "LaserJet 1100/1200/1220/3200/3300 skänneriga, DeskJet 450, Sony IJP-V100) "
 "või vahest HP PhotoSmart ehk siis HP LaserJet 2200?"
 
-#: printer/printerdrake.pm:1801
+#: printer/printerdrake.pm:1887
 #, c-format
 msgid "Installing HPOJ package..."
 msgstr "HPOJ pakettide paigaldamine..."
 
-#: printer/printerdrake.pm:1809 printer/printerdrake.pm:1893
+#: printer/printerdrake.pm:1894
+#, c-format
+msgid "Only printing will be possible on the %s."
+msgstr "%s korral on võimalik ainult trükkimine."
+
+#: printer/printerdrake.pm:1903 printer/printerdrake.pm:2025
 #, c-format
 msgid "Checking device and configuring HPOJ..."
 msgstr "HPOJ kontrollimine ja seadistamine..."
 
-#: printer/printerdrake.pm:1831
+#: printer/printerdrake.pm:1946
 #, c-format
 msgid "Installing SANE packages..."
 msgstr "SANE pakettide paigaldamine..."
 
-#: printer/printerdrake.pm:1858
+#: printer/printerdrake.pm:1956
+#, c-format
+msgid "Scanning on the %s will not be possible."
+msgstr "%s korral ei ole skaneerimine võimalik."
+
+#: printer/printerdrake.pm:1983
 #, c-format
 msgid "Installing mtools packages..."
 msgstr "Paketi \"mtools\" paigaldamine..."
 
-#: printer/printerdrake.pm:1873
+#: printer/printerdrake.pm:1990
+#, c-format
+msgid "Photo memory card access on the %s will not be possible."
+msgstr "%s ei võimalda foto mälukaardi lugemist."
+
+#: printer/printerdrake.pm:2005
 #, c-format
 msgid "Scanning on your HP multi-function device"
 msgstr "Skaneerimine Teie HP mitme funktsiooniga seadmel"
 
-#: printer/printerdrake.pm:1881
+#: printer/printerdrake.pm:2013
 #, c-format
 msgid "Photo memory card access on your HP multi-function device"
 msgstr "Digifoto mälukaardi lugeja Teie HP mitme funktsiooniga seadmel"
 
-#: printer/printerdrake.pm:1930
+#: printer/printerdrake.pm:2062
 #, c-format
 msgid "Making printer port available for CUPS..."
 msgstr "Printer tehakse CUPS-ile kättesaadavaks"
 
-#: printer/printerdrake.pm:1939 printer/printerdrake.pm:2183
-#: printer/printerdrake.pm:2327
+#: printer/printerdrake.pm:2071 printer/printerdrake.pm:2315
+#: printer/printerdrake.pm:2459
 #, c-format
 msgid "Reading printer database..."
 msgstr "Printerite andmebaasi lugemine..."
 
-#: printer/printerdrake.pm:2149
+#: printer/printerdrake.pm:2281
 #, c-format
 msgid "Enter Printer Name and Comments"
 msgstr "Sisestage printeri nimi ja kommentaar"
 
-#: printer/printerdrake.pm:2153 printer/printerdrake.pm:3241
+#: printer/printerdrake.pm:2285 printer/printerdrake.pm:3421
 #, c-format
 msgid "Name of printer should contain only letters, numbers and the underscore"
 msgstr "Printeri nimi tohib sisaldada vaid tähti, numbreid ja alakriipsu"
 
-#: printer/printerdrake.pm:2159 printer/printerdrake.pm:3246
+#: printer/printerdrake.pm:2291 printer/printerdrake.pm:3426
 #, c-format
 msgid ""
 "The printer \"%s\" already exists,\n"
@@ -12483,7 +12558,7 @@ msgstr ""
 "Printer \"%s\" on juba olemas,\n"
 "kas tõesti kirjutada selle seadistused üle?"
 
-#: printer/printerdrake.pm:2168
+#: printer/printerdrake.pm:2300
 #, c-format
 msgid ""
 "Every printer needs a name (for example \"printer\"). The Description and "
@@ -12492,35 +12567,35 @@ msgstr ""
 "Iga printer vajab nime (näiteks \"printer\"). Kirjelduse ja asukoha välja ei "
 "ole vaja tingimata täita, need on vaid kommentaarid kasutajatele."
 
-#: printer/printerdrake.pm:2169
+#: printer/printerdrake.pm:2301
 #, c-format
 msgid "Name of printer"
 msgstr "Printeri nimi"
 
-#: printer/printerdrake.pm:2170 standalone/drakconnect:521
+#: printer/printerdrake.pm:2302 standalone/drakconnect:557
 #: standalone/harddrake2:40 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Description"
 msgstr "Kirjeldus"
 
-#: printer/printerdrake.pm:2171 standalone/printerdrake:212
+#: printer/printerdrake.pm:2303 standalone/printerdrake:212
 #: standalone/printerdrake:219
 #, c-format
 msgid "Location"
 msgstr "Asukoht"
 
-#: printer/printerdrake.pm:2188
+#: printer/printerdrake.pm:2320
 #, c-format
 msgid "Preparing printer database..."
 msgstr "Printerite andmebaasi ettevalmistamine..."
 
-#: printer/printerdrake.pm:2306
+#: printer/printerdrake.pm:2438
 #, c-format
 msgid "Your printer model"
 msgstr "Teie printeri mudel"
 
-#: printer/printerdrake.pm:2307
+#: printer/printerdrake.pm:2439
 #, c-format
 msgid ""
 "Printerdrake has compared the model name resulting from the printer auto-"
@@ -12546,18 +12621,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: printer/printerdrake.pm:2312 printer/printerdrake.pm:2315
+#: printer/printerdrake.pm:2444 printer/printerdrake.pm:2447
 #, c-format
 msgid "The model is correct"
 msgstr "Mudel õige"
 
-#: printer/printerdrake.pm:2313 printer/printerdrake.pm:2314
-#: printer/printerdrake.pm:2317
+#: printer/printerdrake.pm:2445 printer/printerdrake.pm:2446
+#: printer/printerdrake.pm:2449
 #, c-format
 msgid "Select model manually"
 msgstr "Mudeli valik käsitsi"
 
-#: printer/printerdrake.pm:2340
+#: printer/printerdrake.pm:2472
 #, c-format
 msgid ""
 "\n"
@@ -12572,12 +12647,12 @@ msgstr ""
 "mudeli õigesti. Valige loendist õige mudel, kui kursor seisab vale mudeli "
 "või \"toorprinteri\" kohal."
 
-#: printer/printerdrake.pm:2359
+#: printer/printerdrake.pm:2491
 #, c-format
 msgid "Install a manufacturer-supplied PPD file"
 msgstr "Tootja PPD-faili paigaldamine"
 
-#: printer/printerdrake.pm:2390
+#: printer/printerdrake.pm:2522
 #, c-format
 msgid ""
 "Every PostScript printer is delivered with a PPD file which describes the "
@@ -12586,7 +12661,7 @@ msgstr ""
 "Iga PostScript printeriga on kaasas PPD-fail, mis kirjeldab printeri "
 "võimalusi ja omadusi."
 
-#: printer/printerdrake.pm:2391
+#: printer/printerdrake.pm:2523
 #, c-format
 msgid ""
 "This file is usually somewhere on the CD with the Windows and Mac drivers "
@@ -12594,12 +12669,12 @@ msgid ""
 msgstr ""
 "Tavaliselt leidub see CD-l kõrvuti printeri Windowsi ja Mac draiveritega."
 
-#: printer/printerdrake.pm:2392
+#: printer/printerdrake.pm:2524
 #, c-format
 msgid "You can find the PPD files also on the manufacturer's web sites."
 msgstr "PPD-faile võib leida ka tootja veebileheküljelt."
 
-#: printer/printerdrake.pm:2393
+#: printer/printerdrake.pm:2525
 #, c-format
 msgid ""
 "If you have Windows installed on your machine, you can find the PPD file on "
@@ -12608,7 +12683,7 @@ msgstr ""
 "Kui arvutile on paigaldatud Windows, võib PPD-faili leida ka Windowsi "
 "partitsioonilt."
 
-#: printer/printerdrake.pm:2394
+#: printer/printerdrake.pm:2526
 #, c-format
 msgid ""
 "Installing the printer's PPD file and using it when setting up the printer "
@@ -12618,7 +12693,7 @@ msgstr ""
 "Printeri PPD-faili paigaldamine ja selle kasutamine printeri seadistamisel "
 "muudab kättesaadavaks kõik võimalused, mida tootja on printerile ette näinud."
 
-#: printer/printerdrake.pm:2395
+#: printer/printerdrake.pm:2527
 #, c-format
 msgid ""
 "Here you can choose the PPD file to be installed on your machine, it will "
@@ -12627,58 +12702,58 @@ msgstr ""
 "Siin saate valida, milline PPD-fail Teie masinale paigaldada. Seda "
 "kasutatakse seejärel printeri seadistamisel."
 
-#: printer/printerdrake.pm:2397
+#: printer/printerdrake.pm:2529
 #, c-format
 msgid "Install PPD file from"
 msgstr "PPD-faili paigaldamine asukohast"
 
-#: printer/printerdrake.pm:2399 printer/printerdrake.pm:2406
-#: standalone/scannerdrake:174 standalone/scannerdrake:182
-#: standalone/scannerdrake:233 standalone/scannerdrake:240
+#: printer/printerdrake.pm:2531 printer/printerdrake.pm:2538
+#: standalone/scannerdrake:180 standalone/scannerdrake:188
+#: standalone/scannerdrake:239 standalone/scannerdrake:246
 #, c-format
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: printer/printerdrake.pm:2400 printer/printerdrake.pm:2408
-#: standalone/scannerdrake:175 standalone/scannerdrake:184
-#: standalone/scannerdrake:234 standalone/scannerdrake:242
+#: printer/printerdrake.pm:2532 printer/printerdrake.pm:2540
+#: standalone/scannerdrake:181 standalone/scannerdrake:190
+#: standalone/scannerdrake:240 standalone/scannerdrake:248
 #, c-format
 msgid "Floppy Disk"
-msgstr "Flopi"
+msgstr "Diskett"
 
-#: printer/printerdrake.pm:2401 printer/printerdrake.pm:2410
-#: standalone/scannerdrake:176 standalone/scannerdrake:186
-#: standalone/scannerdrake:235 standalone/scannerdrake:244
+#: printer/printerdrake.pm:2533 printer/printerdrake.pm:2542
+#: standalone/scannerdrake:182 standalone/scannerdrake:192
+#: standalone/scannerdrake:241 standalone/scannerdrake:250
 #, c-format
 msgid "Other place"
 msgstr "Muu koht"
 
-#: printer/printerdrake.pm:2416
+#: printer/printerdrake.pm:2548
 #, c-format
 msgid "Select PPD file"
 msgstr "Valige PPD-fail"
 
-#: printer/printerdrake.pm:2420
+#: printer/printerdrake.pm:2552
 #, c-format
 msgid "The PPD file %s does not exist or is unreadable!"
 msgstr "PPD-faili %s ei ole olemas või ei ole see loetav!"
 
-#: printer/printerdrake.pm:2426
+#: printer/printerdrake.pm:2558
 #, c-format
 msgid "The PPD file %s does not conform with the PPD specifications!"
 msgstr "PPD-fail %s ei vasta PPD spetsifikatsioonile!"
 
-#: printer/printerdrake.pm:2437
+#: printer/printerdrake.pm:2569
 #, c-format
 msgid "Installing PPD file..."
 msgstr "PPD-faili paigaldamine..."
 
-#: printer/printerdrake.pm:2539
+#: printer/printerdrake.pm:2682
 #, c-format
 msgid "OKI winprinter configuration"
 msgstr "OKI winprinteri seadistused"
 
-#: printer/printerdrake.pm:2540
+#: printer/printerdrake.pm:2683
 #, c-format
 msgid ""
 "You are configuring an OKI laser winprinter. These printers\n"
@@ -12695,12 +12770,12 @@ msgstr ""
 "trükite testlehekülje. Vastasel juhul printer lihtsalt ei tööta ja draiver "
 "eirab Teie määratud ühendusviisi."
 
-#: printer/printerdrake.pm:2564 printer/printerdrake.pm:2593
+#: printer/printerdrake.pm:2707 printer/printerdrake.pm:2736
 #, c-format
 msgid "Lexmark inkjet configuration"
 msgstr "Lexmark inkjeti seadistused"
 
-#: printer/printerdrake.pm:2565
+#: printer/printerdrake.pm:2708
 #, c-format
 msgid ""
 "The inkjet printer drivers provided by Lexmark only support local printers, "
@@ -12713,7 +12788,7 @@ msgstr ""
 "palun oma printer kohalikku porti või seadistage see masinal, millega "
 "printer on ühendatud."
 
-#: printer/printerdrake.pm:2594
+#: printer/printerdrake.pm:2737
 #, c-format
 msgid ""
 "To be able to print with your Lexmark inkjet and this configuration, you "
@@ -12735,12 +12810,30 @@ msgstr ""
 "abil printeripea joondamise leheküljed ning kohandage selle rakenduse abil "
 "pea joondamise seadistust."
 
-#: printer/printerdrake.pm:2597
+#: printer/printerdrake.pm:2746
+#, c-format
+msgid "Lexmark X125 configuration"
+msgstr "Lexmark X125 seadistused"
+
+#: printer/printerdrake.pm:2747
+#, c-format
+msgid ""
+"The driver for this printer only supports printers locally connected via "
+"USB, no printers on remote machines or print server boxes. Please connect "
+"your printer to a local USB port or configure it on the machine where it is "
+"connected to."
+msgstr ""
+"Selle printeri draiver toetab ainult kohalikke USB ühendusega printereid, "
+"mitte aga printereid kaugarvutitel või printserveritel. Ühendage palun oma "
+"printer kohalikku USB porti või seadistage see masinal, millega printer on "
+"ühendatud."
+
+#: printer/printerdrake.pm:2765
 #, c-format
 msgid "Firmware-Upload for HP LaserJet 1000"
 msgstr "HP LaserJet 1000 püsivara laadimine"
 
-#: printer/printerdrake.pm:2710
+#: printer/printerdrake.pm:2878
 #, c-format
 msgid ""
 "Printer default settings\n"
@@ -12758,27 +12851,27 @@ msgstr ""
 "väga suure trükikvaliteedi või lahutusvõime puhul muutub trükkimine "
 "märgatavalt aeglasemaks."
 
-#: printer/printerdrake.pm:2835
+#: printer/printerdrake.pm:3003
 #, c-format
 msgid "Printer default settings"
 msgstr "Printeri vaikeseadistused"
 
-#: printer/printerdrake.pm:2842
+#: printer/printerdrake.pm:3010
 #, c-format
 msgid "Option %s must be an integer number!"
 msgstr "Võti %s peab olema täisarv!"
 
-#: printer/printerdrake.pm:2846
+#: printer/printerdrake.pm:3014
 #, c-format
 msgid "Option %s must be a number!"
 msgstr "Võti %s peab olema arv!"
 
-#: printer/printerdrake.pm:2850
+#: printer/printerdrake.pm:3018
 #, c-format
 msgid "Option %s out of range!"
 msgstr "Võti %s väljub piiridest!"
 
-#: printer/printerdrake.pm:2901
+#: printer/printerdrake.pm:3069
 #, c-format
 msgid ""
 "Do you want to set this printer (\"%s\")\n"
@@ -12787,12 +12880,12 @@ msgstr ""
 "Kas soovite määrata selle printeri (\"%s\")\n"
 "vaikeprinteriks?"
 
-#: printer/printerdrake.pm:2916
+#: printer/printerdrake.pm:3084
 #, c-format
 msgid "Test pages"
 msgstr "Testleheküljed"
 
-#: printer/printerdrake.pm:2917
+#: printer/printerdrake.pm:3085
 #, c-format
 msgid ""
 "Please select the test pages you want to print.\n"
@@ -12805,47 +12898,57 @@ msgstr ""
 "mäluga laserprinteritel ei pruugi see üldse õnnestuda. Enamasti peaks "
 "piisama tavalise testlehekülje trükkimisest."
 
-#: printer/printerdrake.pm:2921
+#: printer/printerdrake.pm:3089
 #, c-format
 msgid "No test pages"
 msgstr "Ära trüki"
 
-#: printer/printerdrake.pm:2922
+#: printer/printerdrake.pm:3090
 #, c-format
 msgid "Print"
 msgstr "Trüki"
 
-#: printer/printerdrake.pm:2947
+#: printer/printerdrake.pm:3115
 #, c-format
 msgid "Standard test page"
 msgstr "Tavaline testlehekülg"
 
-#: printer/printerdrake.pm:2950
+#: printer/printerdrake.pm:3118
 #, c-format
 msgid "Alternative test page (Letter)"
 msgstr "Alternatiivne testlehekülg (Letter)"
 
-#: printer/printerdrake.pm:2953
+#: printer/printerdrake.pm:3121
 #, c-format
 msgid "Alternative test page (A4)"
 msgstr "Alternatiivne testlehekülg (A4)"
 
-#: printer/printerdrake.pm:2955
+#: printer/printerdrake.pm:3123
 #, c-format
 msgid "Photo test page"
 msgstr "Fototestlehekülg"
 
-#: printer/printerdrake.pm:2959
+#: printer/printerdrake.pm:3127
 #, c-format
 msgid "Do not print any test page"
 msgstr "Ära trüki testlehekülge"
 
-#: printer/printerdrake.pm:2967 printer/printerdrake.pm:3123
+#: printer/printerdrake.pm:3135 printer/printerdrake.pm:3300
 #, c-format
 msgid "Printing test page(s)..."
 msgstr "Trükitakse testlehekülg(i)..."
 
-#: printer/printerdrake.pm:2992
+#: printer/printerdrake.pm:3150
+#, c-format
+msgid "Could not install the %s package!"
+msgstr "Ei õnnestunud paigaldada %s paketti!"
+
+#: printer/printerdrake.pm:3152
+#, c-format
+msgid "Skipping photo test page."
+msgstr "Fototestlehekülg jäetakse vahele."
+
+#: printer/printerdrake.pm:3169
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12860,7 +12963,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: printer/printerdrake.pm:2996
+#: printer/printerdrake.pm:3173
 #, c-format
 msgid ""
 "Test page(s) have been sent to the printer.\n"
@@ -12869,17 +12972,17 @@ msgstr ""
 "Testlehekülg on saadetud printerile.\n"
 "Nüüd võib minna natuke aega, enne kui printer alustab.\n"
 
-#: printer/printerdrake.pm:3003
+#: printer/printerdrake.pm:3180
 #, c-format
 msgid "Did it work properly?"
 msgstr "Kas kõik oli korras?"
 
-#: printer/printerdrake.pm:3024 printer/printerdrake.pm:4192
+#: printer/printerdrake.pm:3201 printer/printerdrake.pm:4397
 #, c-format
 msgid "Raw printer"
 msgstr "Toorprinter"
 
-#: printer/printerdrake.pm:3054
+#: printer/printerdrake.pm:3231
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) you can either use "
@@ -12892,7 +12995,7 @@ msgstr ""
 "<fail>\". Graafilised vahendid võimaldavad hõlpsamalt valida printerit ja "
 "muuta valikuid.\n"
 
-#: printer/printerdrake.pm:3056
+#: printer/printerdrake.pm:3233
 #, c-format
 msgid ""
 "These commands you can also use in the \"Printing command\" field of the "
@@ -12903,8 +13006,8 @@ msgstr ""
 "\"Trükkimiskäsk\", kuid seal pole vaja kirjutada failinime, sest selle annab "
 "rakendus ise.\n"
 
-#: printer/printerdrake.pm:3059 printer/printerdrake.pm:3076
-#: printer/printerdrake.pm:3086
+#: printer/printerdrake.pm:3236 printer/printerdrake.pm:3253
+#: printer/printerdrake.pm:3263
 #, c-format
 msgid ""
 "\n"
@@ -12916,7 +13019,7 @@ msgstr ""
 "Käsk \"%s\" võimaldab muuta ka konkreetse trükkimistöö valikuid. Selleks "
 "lisage vaid soovitud valik käsureale, nt \"%s <fail>\". "
 
-#: printer/printerdrake.pm:3062 printer/printerdrake.pm:3102
+#: printer/printerdrake.pm:3239 printer/printerdrake.pm:3279
 #, c-format
 msgid ""
 "To know about the options available for the current printer read either the "
@@ -12928,7 +13031,7 @@ msgstr ""
 "\".%s%s%s\n"
 "\n"
 
-#: printer/printerdrake.pm:3066
+#: printer/printerdrake.pm:3243
 #, c-format
 msgid ""
 "Here is a list of the available printing options for the current printer:\n"
@@ -12937,7 +13040,7 @@ msgstr ""
 "See on loend praegusel printeril kasutamiskõlblike trükkimisvalikutega:\n"
 "\n"
 
-#: printer/printerdrake.pm:3071 printer/printerdrake.pm:3081
+#: printer/printerdrake.pm:3248 printer/printerdrake.pm:3258
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -12945,8 +13048,8 @@ msgid ""
 msgstr ""
 "Faili trükkimiseks käsurealt (terminaliaken) kasutage käsku \"%s <fail>\".\n"
 
-#: printer/printerdrake.pm:3073 printer/printerdrake.pm:3083
-#: printer/printerdrake.pm:3093
+#: printer/printerdrake.pm:3250 printer/printerdrake.pm:3260
+#: printer/printerdrake.pm:3270
 #, c-format
 msgid ""
 "This command you can also use in the \"Printing command\" field of the "
@@ -12957,7 +13060,7 @@ msgstr ""
 "\"Trükkimiskäsk\". Kuid seal ei ole vaja kirjutada failinime, sest selle "
 "annab rakendus ise.\n"
 
-#: printer/printerdrake.pm:3078 printer/printerdrake.pm:3088
+#: printer/printerdrake.pm:3255 printer/printerdrake.pm:3265
 #, c-format
 msgid ""
 "To get a list of the options available for the current printer click on the "
@@ -12966,7 +13069,7 @@ msgstr ""
 "Praeguse printeri puhul kasutuskõlblike valikute loendi vaatamiseks vajutage "
 "nupule \"Trükkimisvalikute loend\"."
 
-#: printer/printerdrake.pm:3091
+#: printer/printerdrake.pm:3268
 #, c-format
 msgid ""
 "To print a file from the command line (terminal window) use the command \"%s "
@@ -12975,7 +13078,7 @@ msgstr ""
 "Faili trükkimiseks käsurealt (terminaliaken) kasutage käsku \"%s <fail>\" "
 "või \"%s <fail>\".\n"
 
-#: printer/printerdrake.pm:3095
+#: printer/printerdrake.pm:3272
 #, c-format
 msgid ""
 "You can also use the graphical interface \"xpdq\" for setting options and "
@@ -12991,7 +13094,7 @@ msgstr ""
 "nimetusega \"PEATA printer!\", millele klõpsates peatatakse otsekohe kõik "
 "trükkimistööd. See on kasulik näiteks paberiummistuste esinemisel.\n"
 
-#: printer/printerdrake.pm:3099
+#: printer/printerdrake.pm:3276
 #, c-format
 msgid ""
 "\n"
@@ -13004,42 +13107,42 @@ msgstr ""
 "valikuid. Selleks tuleb vaid lisada soovitud valikud käsureale, näiteks \"%s "
 "<fail>\".\n"
 
-#: printer/printerdrake.pm:3109
+#: printer/printerdrake.pm:3286
 #, c-format
 msgid "Printing/Scanning/Photo Cards on \"%s\""
 msgstr "Trükkimine/skaneerimine/fotokaardid seadmel \"%s\""
 
-#: printer/printerdrake.pm:3110
+#: printer/printerdrake.pm:3287
 #, c-format
 msgid "Printing/Scanning on \"%s\""
 msgstr "Trükkimine/skaneerimine seadmel \"%s\""
 
-#: printer/printerdrake.pm:3112
+#: printer/printerdrake.pm:3289
 #, c-format
 msgid "Printing/Photo Card Access on \"%s\""
 msgstr "Trükkimine/fotokaartide kasutamine seadmel \"%s\""
 
-#: printer/printerdrake.pm:3113
+#: printer/printerdrake.pm:3290
 #, c-format
 msgid "Printing on the printer \"%s\""
 msgstr "Trükkimine printeril \"%s\""
 
-#: printer/printerdrake.pm:3116 printer/printerdrake.pm:3119
-#: printer/printerdrake.pm:3120 printer/printerdrake.pm:3121
-#: printer/printerdrake.pm:4179 standalone/drakTermServ:321
-#: standalone/drakbackup:4583 standalone/drakbug:177 standalone/drakfont:497
-#: standalone/drakfont:588 standalone/net_monitor:106
+#: printer/printerdrake.pm:3293 printer/printerdrake.pm:3296
+#: printer/printerdrake.pm:3297 printer/printerdrake.pm:3298
+#: printer/printerdrake.pm:4384 standalone/drakTermServ:324
+#: standalone/drakbackup:4265 standalone/drakbug:177 standalone/drakfont:500
+#: standalone/drakfont:591 standalone/net_monitor:106
 #: standalone/printerdrake:508
 #, c-format
 msgid "Close"
 msgstr "Sulge"
 
-#: printer/printerdrake.pm:3119
+#: printer/printerdrake.pm:3296
 #, c-format
 msgid "Print option list"
 msgstr "Trükkimisvalikute loend"
 
-#: printer/printerdrake.pm:3140
+#: printer/printerdrake.pm:3317
 #, c-format
 msgid ""
 "Your multi-function device was configured automatically to be able to scan. "
@@ -13061,7 +13164,7 @@ msgstr ""
 "\n"
 "Ärge selle seadme puhul \"scannerdraket\" kasutage!"
 
-#: printer/printerdrake.pm:3163
+#: printer/printerdrake.pm:3343
 #, c-format
 msgid ""
 "Your printer was configured automatically to give you access to the photo "
@@ -13084,18 +13187,18 @@ msgstr ""
 "võite liikuda ketaste vahel faililoendi ülal paremas nurgas asuval väljal "
 "leiduvaid tähti vahetades."
 
-#: printer/printerdrake.pm:3185 printer/printerdrake.pm:3575
+#: printer/printerdrake.pm:3365 printer/printerdrake.pm:3767
 #, c-format
 msgid "Reading printer data..."
 msgstr "Printeri andmete lugemine..."
 
-#: printer/printerdrake.pm:3205 printer/printerdrake.pm:3232
-#: printer/printerdrake.pm:3267
+#: printer/printerdrake.pm:3385 printer/printerdrake.pm:3412
+#: printer/printerdrake.pm:3447
 #, c-format
 msgid "Transfer printer configuration"
 msgstr "Printeri seadistuste ülekandmine"
 
-#: printer/printerdrake.pm:3206
+#: printer/printerdrake.pm:3386
 #, c-format
 msgid ""
 "You can copy the printer configuration which you have done for the spooler %"
@@ -13109,7 +13212,7 @@ msgstr ""
 "nimi, kirjeldus, asukoht, ühendusviis, vaikevalikud), aga mitte tööd.\n"
 "Kõiki järjekordi ei saa üle kanda järgmistel põhjustel:\n"
 
-#: printer/printerdrake.pm:3209
+#: printer/printerdrake.pm:3389
 #, c-format
 msgid ""
 "CUPS does not support printers on Novell servers or printers sending the "
@@ -13118,7 +13221,7 @@ msgstr ""
 "CUPS ei toeta printereid Novelli serveritel ega printereid, mis saadavad "
 "andmeid suvalise vormiga käskudena.\n"
 
-#: printer/printerdrake.pm:3211
+#: printer/printerdrake.pm:3391
 #, c-format
 msgid ""
 "PDQ only supports local printers, remote LPD printers, and Socket/TCP "
@@ -13127,12 +13230,12 @@ msgstr ""
 "PDQ toetab ainult kohalikke printereid, võrguprintereid (LPD) ning Socket/"
 "TCP printereid.\n"
 
-#: printer/printerdrake.pm:3213
+#: printer/printerdrake.pm:3393
 #, c-format
 msgid "LPD and LPRng do not support IPP printers.\n"
 msgstr "LPD ja LPRng ei toeta IPP printereid.\n"
 
-#: printer/printerdrake.pm:3215
+#: printer/printerdrake.pm:3395
 #, c-format
 msgid ""
 "In addition, queues not created with this program or \"foomatic-configure\" "
@@ -13141,7 +13244,7 @@ msgstr ""
 "Lisaks sellele ei saa üle kanda järjekordi, mis on loodud käesoleva "
 "programmi või \"foomatic-configure\" poolt."
 
-#: printer/printerdrake.pm:3216
+#: printer/printerdrake.pm:3396
 #, c-format
 msgid ""
 "\n"
@@ -13152,7 +13255,7 @@ msgstr ""
 "Üle kanda ei saa ka printereid, mis on seadistatud nende tootjate pakutud "
 "PPD failidega või loomupäraste CUPS draiveritega."
 
-#: printer/printerdrake.pm:3217
+#: printer/printerdrake.pm:3397
 #, c-format
 msgid ""
 "\n"
@@ -13163,17 +13266,17 @@ msgstr ""
 "Märkige printer(id), mida soovite üle kanda, ning vajutage \n"
 "\"Kanna üle\"."
 
-#: printer/printerdrake.pm:3220
+#: printer/printerdrake.pm:3400
 #, c-format
 msgid "Do not transfer printers"
 msgstr "Ära kanna printereid üle"
 
-#: printer/printerdrake.pm:3221 printer/printerdrake.pm:3237
+#: printer/printerdrake.pm:3401 printer/printerdrake.pm:3417
 #, c-format
 msgid "Transfer"
 msgstr "Kanna üle"
 
-#: printer/printerdrake.pm:3233
+#: printer/printerdrake.pm:3413
 #, c-format
 msgid ""
 "A printer named \"%s\" already exists under %s. \n"
@@ -13184,17 +13287,17 @@ msgstr ""
 "Vajutage \"Kanna üle\" selle ülekirjutamiseks.\n"
 "Te võite küll ka sisestada uue nime või selle printeri vahele jätta."
 
-#: printer/printerdrake.pm:3254
+#: printer/printerdrake.pm:3434
 #, c-format
 msgid "New printer name"
 msgstr "Uus printeri nimi"
 
-#: printer/printerdrake.pm:3257
+#: printer/printerdrake.pm:3437
 #, c-format
 msgid "Transferring %s..."
 msgstr "%s ülekandmine..."
 
-#: printer/printerdrake.pm:3268
+#: printer/printerdrake.pm:3448
 #, c-format
 msgid ""
 "You have transferred your former default printer (\"%s\"), Should it be also "
@@ -13203,28 +13306,28 @@ msgstr ""
 "Kandsite üle oma senise vaikeprinteri (\"%s\"). Kas see peaks olema "
 "vaikeprinter ka uue trükkimissüsteemi %s puhul?"
 
-#: printer/printerdrake.pm:3278
+#: printer/printerdrake.pm:3458
 #, c-format
 msgid "Refreshing printer data..."
 msgstr "Printeri andmete värskendamine..."
 
-#: printer/printerdrake.pm:3287
+#: printer/printerdrake.pm:3467
 #, c-format
 msgid "Starting network..."
 msgstr "Võrgu käivitamine..."
 
-#: printer/printerdrake.pm:3328 printer/printerdrake.pm:3332
-#: printer/printerdrake.pm:3334
+#: printer/printerdrake.pm:3508 printer/printerdrake.pm:3512
+#: printer/printerdrake.pm:3514
 #, c-format
 msgid "Configure the network now"
 msgstr "Seadistada võrk otsekohe"
 
-#: printer/printerdrake.pm:3329
+#: printer/printerdrake.pm:3509
 #, c-format
 msgid "Network functionality not configured"
 msgstr "Võrguvalmidus on seadistamata"
 
-#: printer/printerdrake.pm:3330
+#: printer/printerdrake.pm:3510
 #, c-format
 msgid ""
 "You are going to configure a remote printer. This needs working network "
@@ -13237,16 +13340,16 @@ msgstr ""
 "seadistamata, et ole Teil võimalik kasutada printerit, mida te tahate "
 "seadistada. Kuidas peaks nüüd edasi talitama?"
 
-#: printer/printerdrake.pm:3333
+#: printer/printerdrake.pm:3513
 #, c-format
 msgid "Go on without configuring the network"
 msgstr "Jätkata ilma võrku seadistamata"
 
-#: printer/printerdrake.pm:3367
+#: printer/printerdrake.pm:3547
 #, c-format
 msgid ""
 "The network configuration done during the installation cannot be started "
-"now. Please check whether the network is accessable after booting your "
+"now. Please check whether the network is accessible after booting your "
 "system and correct the configuration using the %s Control Center, section "
 "\"Network & Internet\"/\"Connection\", and afterwards set up the printer, "
 "also using the %s Control Center, section \"Hardware\"/\"Printer\""
@@ -13257,7 +13360,7 @@ msgstr ""
 "\"/\"Ühendus\", misjärel seadistage printer samuti %s juhtimiskeskuses, aga "
 "sektsioonis \"Riistvara\"/\"Printer\". "
 
-#: printer/printerdrake.pm:3368
+#: printer/printerdrake.pm:3548
 #, c-format
 msgid ""
 "The network access was not running and could not be started. Please check "
@@ -13267,34 +13370,34 @@ msgstr ""
 "Võrguühendus ei töötanud ja seda ei saa ka käivitada. Kontrollige palun oma "
 "seadistusi ja riistvara. Seejärel proovige uuesti seadistada võrguprinterit."
 
-#: printer/printerdrake.pm:3378
+#: printer/printerdrake.pm:3558
 #, c-format
 msgid "Restarting printing system..."
 msgstr "Trükkimissüsteemi taaskäivitamine..."
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "high"
 msgstr "kõrge"
 
-#: printer/printerdrake.pm:3417
+#: printer/printerdrake.pm:3597
 #, c-format
 msgid "paranoid"
 msgstr "paranoiline"
 
-#: printer/printerdrake.pm:3418
+#: printer/printerdrake.pm:3598
 #, c-format
 msgid "Installing a printing system in the %s security level"
 msgstr "Trükkimissüsteemi paigaldamine turvatasemel '%s'"
 
-#: printer/printerdrake.pm:3419
+#: printer/printerdrake.pm:3599
 #, c-format
 msgid ""
 "You are about to install the printing system %s on a system running in the %"
 "s security level.\n"
 "\n"
 "This printing system runs a daemon (background process) which waits for "
-"print jobs and handles them. This daemon is also accessable by remote "
+"print jobs and handles them. This daemon is also accessible by remote "
 "machines through the network and so it is a possible point for attacks. "
 "Therefore only a few selected daemons are started by default in this "
 "security level.\n"
@@ -13312,12 +13415,12 @@ msgstr ""
 "\n"
 "Kas soovite tõesti seadistada trükkimist sellel masinal?"
 
-#: printer/printerdrake.pm:3453
+#: printer/printerdrake.pm:3633
 #, c-format
 msgid "Starting the printing system at boot time"
 msgstr "Trükkimissüsteem käivitatakse alglaadimisel"
 
-#: printer/printerdrake.pm:3454
+#: printer/printerdrake.pm:3634
 #, c-format
 msgid ""
 "The printing system (%s) will not be started automatically when the machine "
@@ -13337,48 +13440,69 @@ msgstr ""
 "\n"
 "Kas soovite trükkimissüsteemi automaatkäivituse taas sisse lülitada?"
 
-#: printer/printerdrake.pm:3475 printer/printerdrake.pm:3690
+#: printer/printerdrake.pm:3655 printer/printerdrake.pm:3889
 #, c-format
 msgid "Checking installed software..."
 msgstr "Paigaldatud tarkvara kontroll..."
 
-#: printer/printerdrake.pm:3481
+#: printer/printerdrake.pm:3661
 #, c-format
 msgid "Removing %s ..."
 msgstr "%s eemaldamine..."
 
-#: printer/printerdrake.pm:3488
+#: printer/printerdrake.pm:3665
+#, c-format
+msgid "Could not remove the %s printing system!"
+msgstr "%s trükkimissüsteemi ei õnnestunud eemaldada!"
+
+#: printer/printerdrake.pm:3674
 #, c-format
 msgid "Installing %s ..."
 msgstr "%s paigaldamine..."
 
-#: printer/printerdrake.pm:3535
+#: printer/printerdrake.pm:3678
+#, c-format
+msgid "Could not install the %s printing system!"
+msgstr "%s trükkimissüsteemi ei õnnestunud paigaldada!"
+
+#: printer/printerdrake.pm:3727
 #, c-format
 msgid "Setting Default Printer..."
 msgstr "Vaikeprinteri seadmine..."
 
-#: printer/printerdrake.pm:3555
+#: printer/printerdrake.pm:3747
 #, c-format
 msgid "Select Printer Spooler"
 msgstr "Printeri spuuleri valik"
 
-#: printer/printerdrake.pm:3556
+#: printer/printerdrake.pm:3748
 #, c-format
 msgid "Which printing system (spooler) do you want to use?"
 msgstr "Millist trükkimissüsteemi (spuulerit) soovite kasutada?"
 
-#: printer/printerdrake.pm:3607
+#: printer/printerdrake.pm:3799
 #, c-format
 msgid "Failed to configure printer \"%s\"!"
 msgstr "Printeri \"%s\" seadistamine ebaõnnestus!"
 
-#: printer/printerdrake.pm:3620
+#: printer/printerdrake.pm:3812
 #, c-format
 msgid "Installing Foomatic..."
 msgstr "Foomaticu paigaldamine..."
 
-#: printer/printerdrake.pm:3806
-#, fuzzy, c-format
+#: printer/printerdrake.pm:3818
+#, c-format
+msgid "Could not install %s packages, %s cannot be started!"
+msgstr "Ei õnnestunud paigaldada %s paketti, %s käivitamine ei ole võimalik!"
+
+#: printer/printerdrake.pm:3910
+#, c-format
+msgid "Could not install necessary packages, %s cannot be started!"
+msgstr ""
+"Ei õnnestunud paigaldada vajalikke pakette, %s käivitamine ei ole võimalik!"
+
+#: printer/printerdrake.pm:4011
+#, c-format
 msgid ""
 "The following printers are configured. Double-click on a printer to change "
 "its settings; to make it the default printer; or to view information about "
@@ -13387,50 +13511,50 @@ msgstr ""
 "Seadistatud on järgmised printerid. Topeltklõps printeril võimaldab muuta "
 "selle seadistusi, teha see vaikeprinteriks või vaadata selle infot."
 
-#: printer/printerdrake.pm:3834
+#: printer/printerdrake.pm:4039
 #, c-format
 msgid "Display all available remote CUPS printers"
 msgstr "Näita kõiki saadaolevaid CUPS printserveri printereid"
 
-#: printer/printerdrake.pm:3835
+#: printer/printerdrake.pm:4040
 #, c-format
 msgid "Refresh printer list (to display all available remote CUPS printers)"
 msgstr ""
 "Värskenda printeriloendit (näitamaks kõiki saadaolevaid CUPS printserveri "
 "printereid)"
 
-#: printer/printerdrake.pm:3845
+#: printer/printerdrake.pm:4050
 #, c-format
 msgid "CUPS configuration"
 msgstr "CUPSi seadistused"
 
-#: printer/printerdrake.pm:3857
+#: printer/printerdrake.pm:4062
 #, c-format
 msgid "Change the printing system"
 msgstr "Trükkimissüsteemi muutmine"
 
-#: printer/printerdrake.pm:3866
+#: printer/printerdrake.pm:4071
 #, c-format
 msgid "Normal Mode"
 msgstr "Tavakasutus"
 
-#: printer/printerdrake.pm:3867
+#: printer/printerdrake.pm:4072
 #, c-format
 msgid "Expert Mode"
 msgstr "Ekspertresiim"
 
-#: printer/printerdrake.pm:4138 printer/printerdrake.pm:4193
-#: printer/printerdrake.pm:4274 printer/printerdrake.pm:4284
+#: printer/printerdrake.pm:4343 printer/printerdrake.pm:4398
+#: printer/printerdrake.pm:4479 printer/printerdrake.pm:4489
 #, c-format
 msgid "Printer options"
 msgstr "Printeri valikud"
 
-#: printer/printerdrake.pm:4174
+#: printer/printerdrake.pm:4379
 #, c-format
 msgid "Modify printer configuration"
 msgstr "Printeri seadistuste muutmine"
 
-#: printer/printerdrake.pm:4176
+#: printer/printerdrake.pm:4381
 #, c-format
 msgid ""
 "Printer %s\n"
@@ -13439,118 +13563,118 @@ msgstr ""
 "Printer %s\n"
 "Mida soovite muuta?"
 
-#: printer/printerdrake.pm:4180
+#: printer/printerdrake.pm:4385
 #, c-format
 msgid "Do it!"
 msgstr "Nüüd!"
 
-#: printer/printerdrake.pm:4185 printer/printerdrake.pm:4243
+#: printer/printerdrake.pm:4390 printer/printerdrake.pm:4448
 #, c-format
 msgid "Printer connection type"
 msgstr "Printeri ühendusviis"
 
-#: printer/printerdrake.pm:4186 printer/printerdrake.pm:4247
+#: printer/printerdrake.pm:4391 printer/printerdrake.pm:4452
 #, c-format
 msgid "Printer name, description, location"
 msgstr "Printeri nimi, kirjeldus, asukoht"
 
-#: printer/printerdrake.pm:4188 printer/printerdrake.pm:4266
+#: printer/printerdrake.pm:4393 printer/printerdrake.pm:4471
 #, c-format
 msgid "Printer manufacturer, model, driver"
 msgstr "Printeri tootja, mudel, draiver"
 
-#: printer/printerdrake.pm:4189 printer/printerdrake.pm:4267
+#: printer/printerdrake.pm:4394 printer/printerdrake.pm:4472
 #, c-format
 msgid "Printer manufacturer, model"
 msgstr "Printeri tootja, mudel"
 
-#: printer/printerdrake.pm:4195 printer/printerdrake.pm:4278
+#: printer/printerdrake.pm:4400 printer/printerdrake.pm:4483
 #, c-format
 msgid "Set this printer as the default"
 msgstr "Määra vaikeprinteriks"
 
-#: printer/printerdrake.pm:4197 printer/printerdrake.pm:4285
+#: printer/printerdrake.pm:4402 printer/printerdrake.pm:4490
 #, c-format
 msgid "Add this printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Lisa printer StarOffice/OpenOffice.org/GIMP-ile"
 
-#: printer/printerdrake.pm:4198 printer/printerdrake.pm:4290
+#: printer/printerdrake.pm:4403 printer/printerdrake.pm:4495
 #, c-format
 msgid "Remove this printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Eemalda StarOffice/OpenOffice.org/GIMP-ilt"
 
-#: printer/printerdrake.pm:4199 printer/printerdrake.pm:4295
+#: printer/printerdrake.pm:4404 printer/printerdrake.pm:4500
 #, c-format
 msgid "Print test pages"
 msgstr "Trüki testlehekülg(i)"
 
-#: printer/printerdrake.pm:4200 printer/printerdrake.pm:4297
+#: printer/printerdrake.pm:4405 printer/printerdrake.pm:4502
 #, c-format
 msgid "Learn how to use this printer"
 msgstr "Printeri kasutama õppimine"
 
-#: printer/printerdrake.pm:4201 printer/printerdrake.pm:4299
+#: printer/printerdrake.pm:4406 printer/printerdrake.pm:4504
 #, c-format
 msgid "Remove printer"
 msgstr "Eemalda printer"
 
-#: printer/printerdrake.pm:4255
+#: printer/printerdrake.pm:4460
 #, c-format
 msgid "Removing old printer \"%s\"..."
 msgstr "Vana printeri \"%s\" eemaldamine..."
 
-#: printer/printerdrake.pm:4286
+#: printer/printerdrake.pm:4491
 #, c-format
 msgid "Adding printer to Star Office/OpenOffice.org/GIMP"
 msgstr "Printeri lisamine StarOffice/OpenOffice.org/GIMP-ile"
 
-#: printer/printerdrake.pm:4288
+#: printer/printerdrake.pm:4493
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully added to Star Office/OpenOffice.org/GIMP."
 msgstr "Printer \"%s\" lisati edukalt StarOffice/OpenOffice.org/GIMP-ile."
 
-#: printer/printerdrake.pm:4289
+#: printer/printerdrake.pm:4494
 #, 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."
 
-#: printer/printerdrake.pm:4291
+#: printer/printerdrake.pm:4496
 #, c-format
 msgid "Removing printer from Star Office/OpenOffice.org/GIMP"
 msgstr "Printeri eemaldamine StarOffice/OpenOffice.org/GIMP-ilt"
 
-#: printer/printerdrake.pm:4293
+#: printer/printerdrake.pm:4498
 #, c-format
 msgid ""
 "The printer \"%s\" was successfully removed from Star Office/OpenOffice.org/"
 "GIMP."
 msgstr "Printer \"%s\" eemaldati edukalt StarOffice/OpenOffice.org/GIMP-ilt."
 
-#: printer/printerdrake.pm:4294
+#: printer/printerdrake.pm:4499
 #, 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."
 
-#: printer/printerdrake.pm:4338
+#: printer/printerdrake.pm:4543
 #, c-format
 msgid "Do you really want to remove the printer \"%s\"?"
 msgstr "Kas tõesti eemaldada printer \"%s\"?"
 
-#: printer/printerdrake.pm:4342
+#: printer/printerdrake.pm:4547
 #, c-format
 msgid "Removing printer \"%s\"..."
 msgstr "Printeri \"%s\" eemaldamine..."
 
-#: printer/printerdrake.pm:4366
+#: printer/printerdrake.pm:4571
 #, c-format
 msgid "Default printer"
 msgstr "Vaikeprinter"
 
-#: printer/printerdrake.pm:4367
+#: printer/printerdrake.pm:4572
 #, c-format
 msgid "The printer \"%s\" is set as the default printer now."
 msgstr "Printer \"%s\" on määratud vaikeprinteriks."
@@ -13580,34 +13704,39 @@ msgstr "Ei ole piisavalt partitsioone RAID-%d jaoks\n"
 msgid "Could not create directory /usr/share/sane/firmware!"
 msgstr "Ei õnnestunud luua kataloogi /usr/share/sane/firmware!"
 
-#: scanner.pm:102
+#: scanner.pm:107
+#, c-format
+msgid "Could not create link /usr/share/sane/%s!"
+msgstr "Ei õnnestunud luua viita /usr/share/sane/%s!"
+
+#: scanner.pm:114
 #, c-format
 msgid "Could not copy firmware file %s to /usr/share/sane/firmware!"
 msgstr ""
 "Ei õnnestunud kopeerida püsivarafaili %s asukohta /usr/share/sane/firmware!"
 
-#: scanner.pm:109
+#: scanner.pm:121
 #, c-format
 msgid "Could not set permissions of firmware file %s!"
 msgstr "Ei õnnestunud seada õigusi püsivarafailile %s!"
 
-#: scanner.pm:188 standalone/scannerdrake:59 standalone/scannerdrake:63
-#: standalone/scannerdrake:71 standalone/scannerdrake:333
-#: standalone/scannerdrake:407 standalone/scannerdrake:451
-#: standalone/scannerdrake:455 standalone/scannerdrake:477
-#: standalone/scannerdrake:542
+#: scanner.pm:200 standalone/scannerdrake:65 standalone/scannerdrake:69
+#: standalone/scannerdrake:77 standalone/scannerdrake:339
+#: standalone/scannerdrake:414 standalone/scannerdrake:458
+#: standalone/scannerdrake:462 standalone/scannerdrake:484
+#: standalone/scannerdrake:549
 #, c-format
 msgid "Scannerdrake"
 msgstr "Scannerdrake"
 
-#: scanner.pm:189 standalone/scannerdrake:903
+#: scanner.pm:201 standalone/scannerdrake:915
 #, c-format
 msgid "Could not install the packages needed to share your scanner(s)."
 msgstr ""
 "Pakettide paigaldamine, mis on vajalikud Teie skänneri(te) jagamiseks, ei "
 "õnnestunud."
 
-#: scanner.pm:190
+#: scanner.pm:202
 #, c-format
 msgid "Your scanner(s) will not be available for non-root users."
 msgstr "Teie skänner(id) ei ole tavakasutajale kättesaadavad."
@@ -14723,7 +14852,7 @@ msgstr ""
 "Selle teenuse kohta\n"
 "ei oska lisainfot anda."
 
-#: services.pm:226 ugtk2.pm:1139
+#: services.pm:226 ugtk2.pm:1167
 #, c-format
 msgid "Info"
 msgstr "Info"
@@ -14751,8 +14880,8 @@ msgstr "Peata"
 #: share/advertising/dis-01.pl:13 share/advertising/dwd-01.pl:13
 #: share/advertising/ppp-01.pl:13 share/advertising/pwp-01.pl:13
 #, c-format
-msgid "<b>Congratulations for choosing Mandrake Linux!</b>"
-msgstr "<b>Täname, et valisite Mandrake Linuxi!</b>"
+msgid "<b>Congratulations for choosing Mandrakelinux!</b>"
+msgstr "<b>Täname, et valisite Mandrakelinuxi!</b>"
 
 #: share/advertising/dis-01.pl:15 share/advertising/dwd-01.pl:15
 #: share/advertising/ppp-01.pl:15 share/advertising/pwp-01.pl:15
@@ -14763,12 +14892,12 @@ msgstr "Tere tulemast avatud tarkvara maailma!"
 #: share/advertising/dis-01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrake Linux operating system and its many applications is the "
-"result of collaborative efforts between MandrakeSoft developers and Mandrake "
-"Linux contributors throughout the world."
+"Your new Mandrakelinux operating system and its many applications is the "
+"result of collaborative efforts between MandrakeSoft developers and "
+"Mandrakelinux contributors throughout the world."
 msgstr ""
-"Teie uus operatsioonisüsteem Mandrake Linux ja selle arvukad rakendused on "
-"firma MandrakeSoft arendajate ning kogu maailmas tegutsevate Mandrake Linuxi "
+"Teie uus operatsioonisüsteem Mandrakelinux ja selle arvukad rakendused on "
+"firma MandrakeSoft arendajate ning kogu maailmas tegutsevate Mandrakelinuxi "
 "kaasautorite ühise koostöö vili."
 
 #: share/advertising/dis-01.pl:19 share/advertising/dwd-01.pl:19
@@ -15015,8 +15144,8 @@ msgstr ""
 #: share/advertising/dis-10.pl:18 share/advertising/dwd-07.pl:18
 #: share/advertising/ppp-10.pl:19 share/advertising/pwp-09.pl:18
 #, c-format
-msgid "\t- Voting for software to put in Mandrake Linux"
-msgstr "\t- Võimalus hääletada, millist tarkvara Mandrake Linux peaks pakkuma"
+msgid "\t- Voting for software to put in Mandrakelinux"
+msgstr "\t- Võimalus hääletada, millist tarkvara Mandrakelinux peaks pakkuma"
 
 #: share/advertising/dis-10.pl:19 share/advertising/dwd-07.pl:19
 #: share/advertising/ppp-10.pl:20 share/advertising/pwp-09.pl:19
@@ -15062,19 +15191,19 @@ msgstr ""
 #: share/advertising/dwd-01.pl:17
 #, c-format
 msgid ""
-"Mandrake Linux is committed to the Open Source Model and fully respects the "
+"Mandrakelinux is committed to the Open Source Model and fully respects the "
 "General Public License. This new release is the result of collaboration "
 "between MandrakeSoft's team of developers and the worldwide community of "
-"Mandrake Linux contributors."
+"Mandrakelinux contributors."
 msgstr ""
-"Mandrake Linux toetab kõigiti vaba tarkvara ning peab au sees GNU Üldist "
+"Mandrakelinux toetab kõigiti vaba tarkvara ning peab au sees GNU Üldist "
 "Avalikku Litsentsi. Ka praegune väljalase on MandrakeSofti arendajate "
-"meeskonna ja Mandrake Linuxi üleilmse kaasautorite ühise koostöö vili."
+"meeskonna ja Mandrakelinuxi üleilmse kaasautorite ühise koostöö vili."
 
 #: share/advertising/dwd-02.pl:13
 #, c-format
-msgid "<b>Join the Mandrake Linux community!</b>"
-msgstr "<b>Liituge Mandrake Linuxi kogukonnaga!</b>"
+msgid "<b>Join the Mandrakelinux community!</b>"
+msgstr "<b>Liituge Mandrakelinuxi kogukonnaga!</b>"
 
 #: share/advertising/dwd-02.pl:15
 #, c-format
@@ -15096,36 +15225,36 @@ msgstr ""
 
 #: share/advertising/dwd-03.pl:13
 #, c-format
-msgid "<b>What is Mandrake Linux?</b>"
-msgstr "<b>Mis on Mandrake Linux?</b>"
+msgid "<b>What is Mandrakelinux?</b>"
+msgstr "<b>Mis on Mandrakelinux?</b>"
 
 #: share/advertising/dwd-03.pl:15
 #, c-format
 msgid ""
-"Mandrake Linux is an Open Source distribution created with thousands of the "
-"choicest applications from the Free Software world. Mandrake Linux is one of "
+"Mandrakelinux is an Open Source distribution created with thousands of the "
+"choicest applications from the Free Software world. Mandrakelinux is one of "
 "the most widely used Linux distributions worldwide!"
 msgstr ""
-"Mandrake Linux on vaba tarkvara distributsioon, mis pakub tuhandeid parimaid "
-"vaba tarkvarana loodud rakendusi. Mandrake Linux on üks maailma kõige "
+"Mandrakelinux on vaba tarkvara distributsioon, mis pakub tuhandeid parimaid "
+"vaba tarkvarana loodud rakendusi. Mandrakelinux on üks maailma kõige "
 "kasutatavamaid Linuxi distributsioone!"
 
 #: share/advertising/dwd-03.pl:17
 #, c-format
 msgid ""
-"Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus "
-"the latest versions of the most popular Open Source applications."
+"Mandrakelinux includes the famous graphical desktops KDE and GNOME, plus the "
+"latest versions of the most popular Open Source applications."
 msgstr ""
-"Mandrake Linux pakub kuulsaid graafilisi töökeskkondi KDE ja GNOME, samuti "
+"Mandrakelinux pakub kuulsaid graafilisi töökeskkondi KDE ja GNOME, samuti "
 "muid äärmiselt populaarsete rakenduste uusimaid versioone."
 
 #: share/advertising/dwd-04.pl:13
 #, c-format
 msgid ""
-"Mandrake Linux is widely known as the most user-friendly and the easiest to "
+"Mandrakelinux is widely known as the most user-friendly and the easiest to "
 "install and easy to use Linux distribution."
 msgstr ""
-"Mandrake Linuxit peetakse üldiselt kõige kasutajasõbralikumaks ning kõige "
+"Mandrakelinuxit peetakse üldiselt kõige kasutajasõbralikumaks ning kõige "
 "hõlpsamini paigaldatavaks ja kasutatavaks Linuxi distributsiooniks."
 
 #: share/advertising/dwd-04.pl:15
@@ -15135,8 +15264,8 @@ msgstr "Meie <b>pakkumised eraisikutele</b>:"
 
 #: share/advertising/dwd-04.pl:16
 #, c-format
-msgid "\t- Find out Mandrake Linux on a bootable CD with <b>MandrakeMove</b>"
-msgstr "\t- Mandrake Linux alglaaditaval CD-l ehk <b>MandrakeMove</b>"
+msgid "\t- Find out Mandrakelinux on a bootable CD with <b>MandrakeMove</b>"
+msgstr "\t- Mandrakelinux alglaaditaval CD-l ehk <b>MandrakeMove</b>"
 
 #: share/advertising/dwd-04.pl:17
 #, c-format
@@ -15197,13 +15326,12 @@ msgstr ""
 #, c-format
 msgid ""
 "<b>MandrakeClustering</b>: the power and speed of a Linux cluster combined "
-"with the stability and easy-of-use of the world-famous Mandrake Linux "
+"with the stability and easy-of-use of the world-famous Mandrakelinux "
 "distribution. A unique blend for incomparable HPC performance."
 msgstr ""
 "<b>MandrakeClustering</b>: Linuxi klastri võimsus ja kiirus pluss "
-"maailmakuulsa Mandrake Linuxi distributsiooni stabiilsus ja "
-"kasutamislihtsus. Unikaalne kombinatsioon, mis tagab võrreldamatu HPC "
-"jõudluse."
+"maailmakuulsa Mandrakelinuxi distributsiooni stabiilsus ja kasutamislihtsus. "
+"Unikaalne kombinatsioon, mis tagab võrreldamatu HPC jõudluse."
 
 #: share/advertising/dwd-06.pl:15
 #, c-format
@@ -15252,12 +15380,12 @@ msgstr "<b>Märkus</b>"
 
 #: share/advertising/dwd-09.pl:18
 #, c-format
-msgid "This is the Mandrake Linux <b>Download version</b>."
+msgid "This is the Mandrakelinux <b>Download version</b>."
 msgstr ""
-"See on Mandrake Linuxi <b>allatõmmatav versioon</b> (\"Download version\")."
+"See on Mandrakelinuxi <b>allatõmmatav versioon</b> (\"Download version\")."
 
 #: share/advertising/dwd-09.pl:20
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The free download version does not include commercial software, and "
 "therefore may not work with certain modems (such as some ADSL and RTC) and "
@@ -15270,12 +15398,12 @@ msgstr ""
 #: share/advertising/ppp-01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrake Linux distribution and its many applications are the "
-"result of collaborative efforts between MandrakeSoft developers and Mandrake "
-"Linux contributors throughout the world."
+"Your new Mandrakelinux distribution and its many applications are the result "
+"of collaborative efforts between MandrakeSoft developers and Mandrakelinux "
+"contributors throughout the world."
 msgstr ""
-"Teie uus operatsioonisüsteem Mandrake Linux ja selle arvukad rakendused on "
-"firma MandrakeSoft arendajate ja kogu maailmas tegutsevate Mandrake Linuxi "
+"Teie uus operatsioonisüsteem Mandrakelinux ja selle arvukad rakendused on "
+"firma MandrakeSoft arendajate ja kogu maailmas tegutsevate Mandrakelinuxi "
 "kaasautorite ühise koostöö vili."
 
 #: share/advertising/ppp-02.pl:13
@@ -15297,10 +15425,9 @@ msgstr ""
 #: share/advertising/ppp-02.pl:17
 #, c-format
 msgid ""
-"It is the only Mandrake Linux product that includes the groupware solution."
+"It is the only Mandrakelinux product that includes the groupware solution."
 msgstr ""
-"See on ainus Mandrake Linuxi toode, mis sisaldab täielikke grupitöö "
-"võimalusi."
+"See on ainus Mandrakelinuxi toode, mis sisaldab täielikke grupitöö võimalusi."
 
 #: share/advertising/ppp-03.pl:13 share/advertising/pwp-03.pl:13
 #, c-format
@@ -15310,21 +15437,21 @@ msgstr "<b>Valige graafiline töökeskkond!</b>"
 #: share/advertising/ppp-03.pl:15 share/advertising/pwp-03.pl:15
 #, c-format
 msgid ""
-"When you log into your Mandrake Linux system for the first time, you can "
+"When you log into your Mandrakelinux system for the first time, you can "
 "choose between several popular graphical desktops environments, including: "
 "KDE, GNOME, WindowMaker, IceWM, and others."
 msgstr ""
-"Kui Te esimest korda Mandrake Linuxi süsteemi sisse logite, võite valida "
+"Kui Te esimest korda Mandrakelinuxi süsteemi sisse logite, võite valida "
 "mitme populaarse graafilise töökeskkonna vahel, sealhulgas KDE, GNOME, "
 "WindowMaker, IceWM ja nii edasi."
 
 #: share/advertising/ppp-04.pl:13
 #, c-format
 msgid ""
-"In the Mandrake Linux menu you will find easy-to-use applications for all "
+"In the Mandrakelinux menu you will find easy-to-use applications for all "
 "tasks:"
 msgstr ""
-"Mandrake Linuxi menüüst leiab hõlpsasti kasutatavad rakendused igaks "
+"Mandrakelinuxi menüüst leiab hõlpsasti kasutatavad rakendused igaks "
 "vajaduseks:"
 
 #: share/advertising/ppp-04.pl:15 share/advertising/pwp-04.pl:15
@@ -15448,7 +15575,7 @@ msgstr "\t- Aadressiraamat (server ja klient)"
 msgid ""
 "Empower your business network with <b>premier server solutions</b> including:"
 msgstr ""
-"Tugevda oma firma võrku <b>parimate serverilahendustega</b>, sealhulgas:"
+"Tugevdage oma firma võrku <b>parimate serverilahendustega</b>, sealhulgas:"
 
 #: share/advertising/ppp-07.pl:15
 #, c-format
@@ -15488,12 +15615,12 @@ msgstr "\t- Ja palju muud"
 #: share/advertising/pwp-01.pl:17
 #, c-format
 msgid ""
-"Your new Mandrake Linux distribution is the result of collaborative efforts "
-"between MandrakeSoft developers and Mandrake Linux contributors throughout "
+"Your new Mandrakelinux distribution is the result of collaborative efforts "
+"between MandrakeSoft developers and Mandrakelinux contributors throughout "
 "the world."
 msgstr ""
-"Teie uus operatsioonisüsteem Mandrake Linux on MandrakeSofti arendajate ja "
-"kogu maailmas tegutsevate Mandrake Linuxi kaasautorite ühise koostöö vili."
+"Teie uus operatsioonisüsteem Mandrakelinux on MandrakeSofti arendajate ja "
+"kogu maailmas tegutsevate Mandrakelinuxi kaasautorite ühise koostöö vili."
 
 #: share/advertising/pwp-01.pl:19
 #, c-format
@@ -15517,17 +15644,17 @@ msgid ""
 "most technical."
 msgstr ""
 "PowerPack on MandrakeSofti tipptasemega Linuxi töölaua lahendus. Lisaks "
-"sellele, et Mandrake Linuxi näol on niigi tegemist kõige lihtsama ja "
+"sellele, et Mandrakelinuxi näol on niigi tegemist kõige lihtsama ja "
 "kasutajasõbralikuma Linuxi distributsiooniga, pakub PowerPack veel tuhandeid "
 "rakendusi alates kõige populaarsematest kuni kõige spetsiifilisemateni."
 
 #: share/advertising/pwp-04.pl:13
 #, c-format
 msgid ""
-"In the Mandrake Linux menu you will find easy-to-use applications for all of "
+"In the Mandrakelinux menu you will find easy-to-use applications for all of "
 "your tasks:"
 msgstr ""
-"Mandrake Linuxi menüüst leiab hõlpsasti kasutatavad rakendused igaks "
+"Mandrakelinuxi menüüst leiab hõlpsasti kasutatavad rakendused igaks "
 "vajaduseks:"
 
 #: share/advertising/pwp-04.pl:16
@@ -15856,17 +15983,17 @@ msgstr "Palun väljuge ja vajutage siis Ctrl+Alt+BackSpace"
 msgid "You need to log out and back in again for changes to take effect"
 msgstr "Muudatuste rakendamiseks tuleb end uuesti sisse logida"
 
-#: standalone/drakTermServ:71
+#: standalone/drakTermServ:77
 #, c-format
 msgid "Useless without Terminal Server"
 msgstr "Kasutu ilma terminaliserverita"
 
-#: standalone/drakTermServ:101 standalone/drakTermServ:108
+#: standalone/drakTermServ:114 standalone/drakTermServ:121
 #, c-format
 msgid "%s: %s requires a username...\n"
 msgstr "%s: %s nõuab kasutajatunnust...\n"
 
-#: standalone/drakTermServ:121
+#: standalone/drakTermServ:134
 #, c-format
 msgid ""
 "%s: %s requires hostname, MAC address, IP, nbi-image, 0/1 for THIN_CLIENT, "
@@ -15875,78 +16002,80 @@ msgstr ""
 "%s: %s nõuab masina nime, MAC aadressi, IP-d, nbi-laadepilti, 0/1 "
 "THIN_CLIENT puhul, 0/1 kohaliku seadistuse puhul...\n"
 
-#: standalone/drakTermServ:128
+#: standalone/drakTermServ:141
 #, c-format
 msgid "%s: %s requires hostname...\n"
 msgstr "%s: %s nõuab masina nime...\n"
 
-#: standalone/drakTermServ:140
+#: standalone/drakTermServ:153
 #, c-format
 msgid "You must be root to read configuration file. \n"
 msgstr "Seadistustefaili saab lugeda ainult administraator. \n"
 
-#: standalone/drakTermServ:219 standalone/drakTermServ:488
-#: standalone/drakfont:572
+#: standalone/drakTermServ:238 standalone/drakTermServ:511
+#: standalone/drakfont:575
 #, c-format
 msgid "OK"
 msgstr "Olgu"
 
-#: standalone/drakTermServ:235
+#: standalone/drakTermServ:249 standalone/drakTermServ:252
 #, c-format
 msgid "Terminal Server Configuration"
-msgstr "Terminaliserveri seadistused"
-
-#: standalone/drakTermServ:240
-#, c-format
-msgid "DrakTermServ"
-msgstr "DrakTermServ"
+msgstr "Terminaliserveri seadistus"
 
-#: standalone/drakTermServ:264
+#: standalone/drakTermServ:267
 #, c-format
 msgid "Enable Server"
 msgstr "Serveri lubamine"
 
-#: standalone/drakTermServ:270
+#: standalone/drakTermServ:273
 #, c-format
 msgid "Disable Server"
 msgstr "Serveri keelamine"
 
-#: standalone/drakTermServ:278
+#: standalone/drakTermServ:281
 #, c-format
 msgid "Start Server"
 msgstr "Serveri käivitamine"
 
-#: standalone/drakTermServ:284
+#: standalone/drakTermServ:287
 #, c-format
 msgid "Stop Server"
 msgstr "Serveri peatamine"
 
-#: standalone/drakTermServ:292
+#: standalone/drakTermServ:295
 #, c-format
 msgid "Etherboot Floppy/ISO"
-msgstr "Etherboot flopi/ISO"
+msgstr "Etherboot diskett/ISO"
 
-#: standalone/drakTermServ:296
+#: standalone/drakTermServ:299
 #, c-format
 msgid "Net Boot Images"
 msgstr "Võrgu alglaadefailid"
 
-#: standalone/drakTermServ:302
+#: standalone/drakTermServ:305
 #, c-format
 msgid "Add/Del Users"
 msgstr "Lisa/kustuta kasutaja"
 
-#: standalone/drakTermServ:306
+#: standalone/drakTermServ:309
 #, c-format
 msgid "Add/Del Clients"
 msgstr "Lisa/kustuta klient"
 
-#: standalone/drakTermServ:317 standalone/drakbug:54
+#: standalone/drakTermServ:320 standalone/drakbug:54
 #, c-format
 msgid "First Time Wizard"
 msgstr "Esimese korra nõustaja"
 
-#: standalone/drakTermServ:342
+#: standalone/drakTermServ:351 standalone/drakTermServ:352
+#, c-format
+msgid "%s defined as dm, adding gdm user to /etc/passwd$$CLIENT$$"
+msgstr ""
+"%s on määratud aknahalduriks, GDM kasutaja lisatakse faili /etc/passwd$"
+"$CLIENT$$"
+
+#: standalone/drakTermServ:358
 #, c-format
 msgid ""
 "\n"
@@ -15984,24 +16113,29 @@ msgstr ""
 "    d) Sünkroniseerib varifailid, mis lisab kõik kasutajad, sealhugas \n"
 "       administraatori faili shadow$$CLIENT$"
 "$.                                              \n"
-"    e) Palub Teil luua algkäivitusflopi.\n"
+"    e) Palub Teil luua algkäivitusdisketi.\n"
 "    f) Kui tegemist on õhukese kliendiga, küsib, kas soovite taaskävitada "
 "KDM-i.\n"
 
-#: standalone/drakTermServ:387
+#: standalone/drakTermServ:403
 #, c-format
 msgid "Cancel Wizard"
 msgstr "Välju nõustajast"
 
-#: standalone/drakTermServ:399
+#: standalone/drakTermServ:415
 #, c-format
 msgid "Please save dhcpd config!"
 msgstr "Palun salvestage dhcpd seadistus!"
 
-#: standalone/drakTermServ:427
+#: standalone/drakTermServ:443
+#, c-format
+msgid "Use thin clients."
+msgstr "Õhukeste klientide lubamine."
+
+#: standalone/drakTermServ:445
 #, c-format
 msgid ""
-"Please select client type.\n"
+"Please select default client type.\n"
 "    'Thin' clients run everything off the server's CPU/RAM, using the client "
 "display.\n"
 "    'Fat' clients use their own CPU/RAM but the server's filesystem."
@@ -16012,35 +16146,35 @@ msgstr ""
 "    'Paks' klient kasutab enda protsessorit/RAM-i, kuid serveri "
 "failisüsteemi."
 
-#: standalone/drakTermServ:433
+#: standalone/drakTermServ:457 standalone/drakTermServ:1071
 #, c-format
-msgid "Allow thin clients."
-msgstr "Õhukeste klientide lubamine"
+msgid "Sync client X keyboard settings with server."
+msgstr "Kliendi X'i klaviatuuri seadistused sünkroniseeritakse serveriga."
 
-#: standalone/drakTermServ:441
+#: standalone/drakTermServ:464
 #, c-format
 msgid "Creating net boot images for all kernels"
 msgstr "Võrgulaadepiltide loomine kõigile kernelitele"
 
-#: standalone/drakTermServ:442 standalone/drakTermServ:725
-#: standalone/drakTermServ:741
+#: standalone/drakTermServ:465 standalone/drakTermServ:763
+#: standalone/drakTermServ:779
 #, c-format
 msgid "This will take a few minutes."
 msgstr "Selleks kulub päris mitu minutit."
 
-#: standalone/drakTermServ:446 standalone/drakTermServ:466
+#: standalone/drakTermServ:469 standalone/drakTermServ:489
 #, c-format
 msgid "Done!"
 msgstr "Tehtud!"
 
-#: standalone/drakTermServ:452
+#: standalone/drakTermServ:475
 #, c-format
 msgid "Syncing server user list with client list, including root."
 msgstr ""
 "Serveri kasutajate nimekirja sünkroniseerimine kliendi nimekirjaga "
 "(sealhulgas administraator)"
 
-#: standalone/drakTermServ:472
+#: standalone/drakTermServ:495
 #, c-format
 msgid ""
 "In order to enable changes made for thin clients, the display manager must "
@@ -16049,12 +16183,12 @@ msgstr ""
 "Õhukese kliendi muudatuste rakendamiseks tuleb kuvahaldur uuesti käivitada. "
 "Kas teha taaskäivitus nüüd?"
 
-#: standalone/drakTermServ:507
+#: standalone/drakTermServ:530
 #, c-format
-msgid "drakTermServ Overview"
-msgstr "drakTermServi ülevaade"
+msgid "Terminal Server Overview"
+msgstr "Terminaliserveri ülevaade"
 
-#: standalone/drakTermServ:508
+#: standalone/drakTermServ:531
 #, c-format
 msgid ""
 "        - Create Etherboot Enabled Boot Images:\n"
@@ -16079,7 +16213,7 @@ msgstr ""
 "        \tmis kaasatakse faili dhcpd.conf, tuleb luua etherboot-laadepildid "
 "vähemalt ühele kernelile."
 
-#: standalone/drakTermServ:514
+#: standalone/drakTermServ:537
 #, c-format
 msgid ""
 "        - Maintain /etc/dhcpd.conf:\n"
@@ -16114,7 +16248,7 @@ msgstr ""
 "        \t\tTüüpiline dhcpd.conf-i lõik, mis toetab kettata tööjaama, näeb "
 "välja selline:"
 
-#: standalone/drakTermServ:532
+#: standalone/drakTermServ:555
 #, c-format
 msgid ""
 "        While you can use a pool of IP addresses, rather than setup a "
@@ -16188,7 +16322,7 @@ msgstr ""
 "\t\t\tMärkus: server tuleb peatada/käivitada pärast kliendi lisamist või "
 "muutmist."
 
-#: standalone/drakTermServ:552
+#: standalone/drakTermServ:575
 #, c-format
 msgid ""
 "        - Maintain /etc/exports:\n"
@@ -16219,7 +16353,7 @@ msgstr ""
 "\t\t\t\n"
 "\t\t\tkus SUBNET/MASK määrab Teie võrku."
 
-#: standalone/drakTermServ:564
+#: standalone/drakTermServ:587
 #, c-format
 msgid ""
 "        - Maintain %s:\n"
@@ -16236,7 +16370,7 @@ msgstr ""
 "        \t\tdrakTermServ aitab süsteemi kasutajaid faili lisada või sealt "
 "eemaldada."
 
-#: standalone/drakTermServ:568
+#: standalone/drakTermServ:591
 #, c-format
 msgid ""
 "        - Per client %s:\n"
@@ -16252,7 +16386,7 @@ msgstr ""
 "        \t\tserveri juurfailisüsteemis. Kliendi kohalikku riistvara "
 "seadistamist lubades aitab drakTermServ neid luua."
 
-#: standalone/drakTermServ:573
+#: standalone/drakTermServ:596
 #, c-format
 msgid ""
 "        - Per client system configuration files:\n"
@@ -16286,7 +16420,7 @@ msgstr ""
 "        tagasi muuta, hankides seadistustefailid uuesti, kui klientmasin on "
 "seadistatud."
 
-#: standalone/drakTermServ:582
+#: standalone/drakTermServ:605
 #, c-format
 msgid ""
 "        - /etc/xinetd.d/tftp:\n"
@@ -16341,7 +16475,7 @@ msgstr ""
 "tftpboot, kuhu mkinitrd\n"
 "        \t\tsalvestab oma laadepildid."
 
-#: standalone/drakTermServ:603
+#: standalone/drakTermServ:626
 #, c-format
 msgid ""
 "        - Create etherboot floppies/CDs:\n"
@@ -16358,70 +16492,76 @@ msgid ""
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 msgstr ""
-"        - Etherbooti flopide/CD-de loomine:\n"
+"        - Etherbooti diskettide/CD-de loomine:\n"
 "        \tKettata tööjaamad vajavad kas ROM-laadepilti võrguliidesel või "
-"alglaadimisflopit\n"
+"alglaadimisdisketti\n"
 "        \tvõi -CD-d alglaadimise käivitamiseks.  drakTermServ aitab neid "
 "laadepilte luua,\n"
 "        \ttuginedes kliendi masina võrguliidesele.\n"
 "        \t\t\n"
-"        \tLihtne näide alglaadimisflopi loomisest käsitsi 3com 3c509 jaoks:\n"
+"        \tLihtne näide alglaadimisdisketi loomisest käsitsi 3com 3c509 "
+"jaoks:\n"
 "        \t\t\n"
 "        \tcat /usr/lib/etherboot/floppyload.bin \\\n"
 "        \t\t/usr/share/etherboot/start16.bin \\\t\t\t\n"
 "        \t\t/usr/lib/etherboot/zimg/3c509.zimg > /dev/fd0"
 
-#: standalone/drakTermServ:638
+#: standalone/drakTermServ:661
 #, c-format
 msgid "Boot Floppy"
-msgstr "Alglaadimisflopi"
+msgstr "Alglaadimisdiskett"
 
-#: standalone/drakTermServ:640
+#: standalone/drakTermServ:663
 #, c-format
 msgid "Boot ISO"
 msgstr "Alglaadimis-ISO"
 
-#: standalone/drakTermServ:642
+#: standalone/drakTermServ:665
 #, c-format
 msgid "PXE Image"
 msgstr "PXE laadefail"
 
-#: standalone/drakTermServ:723
+#: standalone/drakTermServ:734
+#, c-format
+msgid "Default kernel version"
+msgstr "Kerneli vaikeversioon"
+
+#: standalone/drakTermServ:761
 #, c-format
 msgid "Build Whole Kernel -->"
 msgstr "Loo terve kernel -->"
 
-#: standalone/drakTermServ:730
+#: standalone/drakTermServ:768
 #, c-format
 msgid "No kernel selected!"
 msgstr "Kernelit pole valitud!"
 
-#: standalone/drakTermServ:733
+#: standalone/drakTermServ:771
 #, c-format
 msgid "Build Single NIC -->"
 msgstr "Loo ainus võrgukaart -->"
 
-#: standalone/drakTermServ:737
+#: standalone/drakTermServ:775
 #, c-format
 msgid "No NIC selected!"
 msgstr "Võrgukaarti pole valitud!"
 
-#: standalone/drakTermServ:740
+#: standalone/drakTermServ:778
 #, c-format
 msgid "Build All Kernels -->"
 msgstr "Loo kõik kernelid -->"
 
-#: standalone/drakTermServ:747
+#: standalone/drakTermServ:786
 #, c-format
 msgid "<-- Delete"
 msgstr "<-- Kustuta"
 
-#: standalone/drakTermServ:754
+#: standalone/drakTermServ:793
 #, c-format
 msgid "Delete All NBIs"
 msgstr "Kustuta kõik võrgu alglaadefailid"
 
-#: standalone/drakTermServ:841
+#: standalone/drakTermServ:880
 #, c-format
 msgid ""
 "!!! Indicates the password in the system database is different than\n"
@@ -16434,27 +16574,27 @@ msgstr ""
 "võimaldada\n"
 "sisselogimist."
 
-#: standalone/drakTermServ:846
+#: standalone/drakTermServ:885
 #, c-format
 msgid "Add User -->"
 msgstr "Lisa kasutaja -->"
 
-#: standalone/drakTermServ:852
+#: standalone/drakTermServ:891
 #, c-format
 msgid "<-- Del User"
 msgstr "<-- Kustuta kasutaja"
 
-#: standalone/drakTermServ:888
+#: standalone/drakTermServ:927
 #, c-format
 msgid "type: %s"
 msgstr "tüüp: %s"
 
-#: standalone/drakTermServ:892
+#: standalone/drakTermServ:931
 #, c-format
 msgid "local config: %s"
 msgstr "kohalik seadistus: %s"
 
-#: standalone/drakTermServ:922
+#: standalone/drakTermServ:961
 #, c-format
 msgid ""
 "Allow local hardware\n"
@@ -16463,67 +16603,67 @@ msgstr ""
 "Kohalik riistvara\n"
 "seadistus on lubatud."
 
-#: standalone/drakTermServ:931
+#: standalone/drakTermServ:970
 #, c-format
 msgid "No net boot images created!"
 msgstr "Võrgu alglaadefaile pole loodud!"
 
-#: standalone/drakTermServ:949
+#: standalone/drakTermServ:988
 #, c-format
 msgid "Thin Client"
 msgstr "Õhuke klient"
 
-#: standalone/drakTermServ:953
+#: standalone/drakTermServ:992
 #, c-format
 msgid "Allow Thin Clients"
 msgstr "Luba õhukesi kliente"
 
-#: standalone/drakTermServ:954
+#: standalone/drakTermServ:993
 #, c-format
 msgid "Add Client -->"
 msgstr "Lisa klient -->"
 
-#: standalone/drakTermServ:968
+#: standalone/drakTermServ:1007
 #, c-format
 msgid "type: fat"
 msgstr "tüüp: paks (fat)"
 
-#: standalone/drakTermServ:969
+#: standalone/drakTermServ:1008
 #, c-format
 msgid "type: thin"
 msgstr "tüüp: õhuke (thin)"
 
-#: standalone/drakTermServ:976
+#: standalone/drakTermServ:1015
 #, c-format
 msgid "local config: false"
 msgstr "kohalik seadistus: false"
 
-#: standalone/drakTermServ:977
+#: standalone/drakTermServ:1016
 #, c-format
 msgid "local config: true"
 msgstr "kohalik seadistus: true"
 
-#: standalone/drakTermServ:985
+#: standalone/drakTermServ:1024
 #, c-format
 msgid "<-- Edit Client"
 msgstr "<-- Muuda klienti"
 
-#: standalone/drakTermServ:1011
+#: standalone/drakTermServ:1050
 #, c-format
 msgid "Disable Local Config"
 msgstr "Kohalik seadistus on keelatud"
 
-#: standalone/drakTermServ:1018
+#: standalone/drakTermServ:1057
 #, c-format
 msgid "Delete Client"
 msgstr "Kustuta klient"
 
-#: standalone/drakTermServ:1027
+#: standalone/drakTermServ:1066
 #, c-format
 msgid "dhcpd Config..."
 msgstr "Dhcpd seadistamine..."
 
-#: standalone/drakTermServ:1040
+#: standalone/drakTermServ:1082
 #, c-format
 msgid ""
 "Need to restart the Display Manager for full changes to take effect. \n"
@@ -16532,57 +16672,68 @@ msgstr ""
 "Muutuste täielikuks jõustamiseks tuleb kuvahaldur taaskäivitada.\n"
 "(käsurealt: service dm restart)"
 
-#: standalone/drakTermServ:1084
+#: standalone/drakTermServ:1122
+#, c-format
+msgid "Thin clients won't work with autologin. Disable autologin?"
+msgstr ""
+"Automaatne sisselogimine õhukestel klientidel ei toimi. Kas see keelata?"
+
+#: standalone/drakTermServ:1138
+#, c-format
+msgid "All clients will use %s"
+msgstr "%s kõigile klientidele"
+
+#: standalone/drakTermServ:1168
 #, c-format
 msgid "Subnet:"
 msgstr "Alamvõrk:"
 
-#: standalone/drakTermServ:1091
+#: standalone/drakTermServ:1175
 #, c-format
 msgid "Netmask:"
 msgstr "Võrgumask:"
 
-#: standalone/drakTermServ:1098
+#: standalone/drakTermServ:1182
 #, c-format
 msgid "Routers:"
 msgstr "Ruuterid:"
 
-#: standalone/drakTermServ:1105
+#: standalone/drakTermServ:1189
 #, c-format
 msgid "Subnet Mask:"
 msgstr "Alamvõrgu mask:"
 
-#: standalone/drakTermServ:1112
+#: standalone/drakTermServ:1196
 #, c-format
 msgid "Broadcast Address:"
 msgstr "Üldlevi aadress:"
 
-#: standalone/drakTermServ:1119
+#: standalone/drakTermServ:1203
 #, c-format
 msgid "Domain Name:"
 msgstr "Domeeninimi:"
 
-#: standalone/drakTermServ:1127
+#: standalone/drakTermServ:1211
 #, c-format
 msgid "Name Servers:"
 msgstr "Nimeserverid:"
 
-#: standalone/drakTermServ:1138
+#: standalone/drakTermServ:1222
 #, c-format
 msgid "IP Range Start:"
 msgstr "IP vahemiku algus:"
 
-#: standalone/drakTermServ:1139
+#: standalone/drakTermServ:1223
 #, c-format
 msgid "IP Range End:"
 msgstr "IP vahemiku lõpp:"
 
-#: standalone/drakTermServ:1191
+#: standalone/drakTermServ:1275
 #, c-format
 msgid "dhcpd Server Configuration"
 msgstr "Dhcpd serveri seadistamine"
 
-#: standalone/drakTermServ:1192
+#: standalone/drakTermServ:1276
 #, c-format
 msgid ""
 "Most of these values were extracted\n"
@@ -16592,133 +16743,133 @@ msgstr ""
 "Enamik väärtusi on võetud Teie töötavast\n"
 "süsteemist. Võite neid vajadusel muuta."
 
-#: standalone/drakTermServ:1195
+#: standalone/drakTermServ:1279
 #, c-format
 msgid "Dynamic IP Address Pool:"
 msgstr "Dünaamiline IP-aadresside vahemik:"
 
-#: standalone/drakTermServ:1208
+#: standalone/drakTermServ:1292
 #, c-format
 msgid "Write Config"
 msgstr "Salvesta seadistus"
 
-#: standalone/drakTermServ:1326
+#: standalone/drakTermServ:1411
 #, c-format
 msgid "Please insert floppy disk:"
-msgstr "Sisestage palun flopi:"
+msgstr "Sisestage palun diskett:"
 
-#: standalone/drakTermServ:1330
+#: standalone/drakTermServ:1415
 #, c-format
 msgid "Couldn't access the floppy!"
-msgstr "Flopit ei õnnestunud leida!"
+msgstr "Disketti ei õnnestunud leida!"
 
-#: standalone/drakTermServ:1332
+#: standalone/drakTermServ:1417
 #, c-format
 msgid "Floppy can be removed now"
-msgstr "Flopi võib nüüd välja võtta"
+msgstr "Disketi võib nüüd välja võtta"
 
-#: standalone/drakTermServ:1335
+#: standalone/drakTermServ:1420
 #, c-format
 msgid "No floppy drive available!"
-msgstr "Flopiseade ei ole kättesaadav!"
+msgstr "Disketiseade ei ole kättesaadav!"
 
-#: standalone/drakTermServ:1340
+#: standalone/drakTermServ:1425
 #, c-format
 msgid "PXE image is %s/%s"
 msgstr "PXE laadefail on %s/%s"
 
-#: standalone/drakTermServ:1342
+#: standalone/drakTermServ:1427
 #, c-format
 msgid "Error writing %s/%s"
 msgstr "Viga faili %s/%s kirjutamisel"
 
-#: standalone/drakTermServ:1351
+#: standalone/drakTermServ:1436
 #, c-format
 msgid "Etherboot ISO image is %s"
 msgstr "Etherboot ISO-laadefail on %s"
 
-#: standalone/drakTermServ:1353
+#: standalone/drakTermServ:1438
 #, c-format
 msgid "Something went wrong! - Is mkisofs installed?"
 msgstr "Midagi läks valesti! - Kas mkisofs on ikka paigaldatud?"
 
-#: standalone/drakTermServ:1372
+#: standalone/drakTermServ:1458
 #, c-format
 msgid "Need to create /etc/dhcpd.conf first!"
 msgstr "Esmalt tuleb luua /etc/dhcpd.conf!"
 
-#: standalone/drakTermServ:1533
+#: standalone/drakTermServ:1619
 #, c-format
 msgid "%s passwd bad in Terminal Server - rewriting...\n"
 msgstr "%s salasõna terminaliserveris ei sobi - kirjutatakse uuesti...\n"
 
-#: standalone/drakTermServ:1551
+#: standalone/drakTermServ:1637
 #, c-format
 msgid "%s is not a user..\n"
 msgstr "%s ei ole kasutaja...\n"
 
-#: standalone/drakTermServ:1552
+#: standalone/drakTermServ:1638
 #, c-format
 msgid "%s is already a Terminal Server user\n"
 msgstr "%s on juba terminaliserveri kasutaja\n"
 
-#: standalone/drakTermServ:1554
+#: standalone/drakTermServ:1640
 #, c-format
 msgid "Addition of %s to Terminal Server failed!\n"
 msgstr "%s lisamine terminaliserverile ebaõnnestus!\n"
 
-#: standalone/drakTermServ:1556
+#: standalone/drakTermServ:1642
 #, c-format
 msgid "%s added to Terminal Server\n"
 msgstr "%s lisati terminaliserverile\n"
 
-#: standalone/drakTermServ:1608
+#: standalone/drakTermServ:1694
 #, c-format
 msgid "Deleted %s...\n"
 msgstr "Kustutati %s...\n"
 
-#: standalone/drakTermServ:1610 standalone/drakTermServ:1687
+#: standalone/drakTermServ:1696 standalone/drakTermServ:1773
 #, c-format
 msgid "%s not found...\n"
 msgstr "%s jäi leidmata...\n"
 
-#: standalone/drakTermServ:1632 standalone/drakTermServ:1633
-#: standalone/drakTermServ:1634
+#: standalone/drakTermServ:1718 standalone/drakTermServ:1719
+#: standalone/drakTermServ:1720
 #, c-format
 msgid "%s already in use\n"
 msgstr "%s on juba kasutusel\n"
 
-#: standalone/drakTermServ:1658
+#: standalone/drakTermServ:1744
 #, c-format
 msgid "Can't open %s!"
 msgstr "%s avamine ebaõnnestus!"
 
-#: standalone/drakTermServ:1715
+#: standalone/drakTermServ:1801
 #, c-format
 msgid "/etc/hosts.allow and /etc/hosts.deny already configured - not changed"
 msgstr "/etc/hosts.allow ja /etc/hosts.deny on juba seadistatud - ei muudeta"
 
-#: standalone/drakTermServ:1872
+#: standalone/drakTermServ:1958
 #, c-format
 msgid "Configuration changed - restart clusternfs/dhcpd?"
 msgstr "Seadistust on muudetud - kas käivitada clusternfs/dhcpd uuesti?"
 
-#: standalone/drakautoinst:37
+#: standalone/drakautoinst:38
 #, c-format
 msgid "Error!"
 msgstr "Viga!"
 
-#: standalone/drakautoinst:38
+#: standalone/drakautoinst:39
 #, c-format
 msgid "I can't find needed image file `%s'."
 msgstr "Ei suudetud leida laadefaili '%s'."
 
-#: standalone/drakautoinst:40
+#: standalone/drakautoinst:41
 #, c-format
 msgid "Auto Install Configurator"
 msgstr "Automaatpaigalduse seadistaja"
 
-#: standalone/drakautoinst:41
+#: standalone/drakautoinst:42
 #, c-format
 msgid ""
 "You are about to configure an Auto Install floppy. This feature is somewhat "
@@ -16733,7 +16884,7 @@ msgid ""
 "\n"
 "Press ok to continue."
 msgstr ""
-"Püüate hakata seadistama automaatpaigalduse flopit. See on natuke ohtlik "
+"Püüate hakata seadistama automaatpaigalduse disketti. See on natuke ohtlik "
 "tegevus, mida tuleb teha väga ettevaatlikult.\n"
 "\n"
 "Seda võimalust kasutades saate korrata arvutile tehtud paigaldust ning mõne "
@@ -16745,22 +16896,22 @@ msgstr ""
 "\n"
 "Vajutage jätkamiseks 'Olgu'."
 
-#: standalone/drakautoinst:59
+#: standalone/drakautoinst:60
 #, c-format
 msgid "replay"
 msgstr "kordamine"
 
-#: standalone/drakautoinst:59 standalone/drakautoinst:68
+#: standalone/drakautoinst:60 standalone/drakautoinst:69
 #, c-format
 msgid "manual"
 msgstr "käsitsi"
 
-#: standalone/drakautoinst:63
+#: standalone/drakautoinst:64
 #, c-format
 msgid "Automatic Steps Configuration"
 msgstr "Automaatsete sammude seadistamine"
 
-#: standalone/drakautoinst:64
+#: standalone/drakautoinst:65
 #, c-format
 msgid ""
 "Please choose for each step whether it will replay like your install, or it "
@@ -16769,12 +16920,23 @@ 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:76 standalone/drakautoinst:77
+#: standalone/drakautoinst:77 standalone/drakautoinst:78
+#: standalone/drakautoinst:92
 #, c-format
 msgid "Creating auto install floppy"
-msgstr "Automaatpaigaldusflopi loomine"
+msgstr "Automaatpaigaldusdisketi loomine"
+
+#: standalone/drakautoinst:90
+#, c-format
+msgid "Insert another blank floppy in drive %s (for drivers disk)"
+msgstr "Pange palun draiverite jaoks tühi diskett seadmesse %s"
+
+#: standalone/drakautoinst:91
+#, c-format
+msgid "Creating auto install floppy (drivers disk)"
+msgstr "Automaatpaigaldusdisketi (draiverid) loomine"
 
-#: standalone/drakautoinst:141
+#: standalone/drakautoinst:158
 #, c-format
 msgid ""
 "\n"
@@ -16787,52 +16949,52 @@ msgstr ""
 "\n"
 "Automaatpaigalduse parameetrid on näha vasakul"
 
-#: standalone/drakautoinst:235 standalone/drakgw:583 standalone/drakvpn:898
-#: standalone/scannerdrake:367
+#: standalone/drakautoinst:252 standalone/drakgw:594 standalone/drakvpn:900
+#: standalone/scannerdrake:374
 #, c-format
 msgid "Congratulations!"
 msgstr "Õnnitleme!"
 
-#: standalone/drakautoinst:236
+#: standalone/drakautoinst:253
 #, c-format
 msgid ""
 "The floppy has been successfully generated.\n"
 "You may now replay your installation."
 msgstr ""
-"Flopi on edukalt loodud.\n"
+"Diskett on edukalt loodud.\n"
 "Nüüd võite vajadusel paigaldust korrata."
 
-#: standalone/drakautoinst:272
+#: standalone/drakautoinst:289
 #, c-format
 msgid "Auto Install"
 msgstr "Automaatpaigaldus"
 
-#: standalone/drakautoinst:341
+#: standalone/drakautoinst:358
 #, c-format
 msgid "Add an item"
 msgstr "Lisa element"
 
-#: standalone/drakautoinst:348
+#: standalone/drakautoinst:365
 #, c-format
 msgid "Remove the last item"
 msgstr "Eemalda viimane element"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "hd"
 msgstr "hd"
 
-#: standalone/drakbackup:87
+#: standalone/drakbackup:88
 #, c-format
 msgid "tape"
 msgstr "lint"
 
-#: standalone/drakbackup:158
+#: standalone/drakbackup:112
 #, c-format
 msgid "No devices found"
 msgstr "Ühtegi seadet ei leitud!"
 
-#: standalone/drakbackup:196
+#: standalone/drakbackup:154
 #, c-format
 msgid ""
 "Expect is an extension to the Tcl scripting language that allows interactive "
@@ -16841,12 +17003,12 @@ msgstr ""
 "Expect on skriptikeele Tcl laiend, mis võimaldab interaktiivseid seansse "
 "ilma kasutaja sekkumiseta."
 
-#: standalone/drakbackup:197
+#: standalone/drakbackup:155
 #, c-format
 msgid "Store the password for this system in drakbackup configuration."
 msgstr "Parool salvestatakse selle süsteemi tarbeks drakbackupi seadistustes."
 
-#: standalone/drakbackup:198
+#: standalone/drakbackup:156
 #, c-format
 msgid ""
 "For a multisession CD, only the first session will erase the cdrw. Otherwise "
@@ -16855,16 +17017,7 @@ msgstr ""
 "Mitmeseansilise CD korral puhastatakse CD-RW ainult esimesel seansil. "
 "Märkimatajätmisel puhastatakse CD-RW enne iga varundamist."
 
-#: standalone/drakbackup:199
-#, c-format
-msgid ""
-"This uses the same syntax as the command line program 'cdrecord'. 'cdrecord -"
-"scanbus' would also show you the device number."
-msgstr ""
-"Kasutatakse samasugust süntaksit, nagu tarvitab käsurearakendus 'cdrecord'. "
-"'cdrecord -scanbus' näitab ka seadme numbrit."
-
-#: standalone/drakbackup:200
+#: standalone/drakbackup:157
 #, c-format
 msgid ""
 "This option will save files that have changed.  Exact behavior depends on "
@@ -16873,7 +17026,7 @@ msgstr ""
 "Selle märkimine võimaldab salvestada muudetud failid. Täpne viis sõltub "
 "sellest, kas valida muut- või diferentsvarundus."
 
-#: standalone/drakbackup:201
+#: standalone/drakbackup:158
 #, c-format
 msgid ""
 "Incremental backups only save files that have changed or are new since the "
@@ -16882,7 +17035,7 @@ msgstr ""
 "Muutvarundus salvestab ainult pärast viimast varundamist muudetud või loodud "
 "failid."
 
-#: standalone/drakbackup:202
+#: standalone/drakbackup:159
 #, c-format
 msgid ""
 "Differential backups only save files that have changed or are new since the "
@@ -16891,7 +17044,7 @@ msgstr ""
 "Diferentsvarundus salvestab ainult pärast 'baasvarunduse' loomist muudetud "
 "või loodud failid."
 
-#: standalone/drakbackup:203
+#: standalone/drakbackup:160
 #, c-format
 msgid ""
 "This should be a local user or email addresse that you want the backup "
@@ -16901,7 +17054,7 @@ msgstr ""
 "posti aadressid, kellele/kuhu antakse teada varunduse tulemustest. Selleks "
 "läheb vaja toimivat meiliedastusagenti."
 
-#: standalone/drakbackup:204
+#: standalone/drakbackup:161
 #, c-format
 msgid ""
 "Files or wildcards listed in a .backupignore file at the top of a directory "
@@ -16910,7 +17063,7 @@ msgstr ""
 "Kataloogipuu tipus failis .backupignore loetletud faile või metamärkidega "
 "tähistatud faile ei varundata."
 
-#: standalone/drakbackup:205
+#: standalone/drakbackup:162
 #, c-format
 msgid ""
 "For backups to other media, files are still created on the hard drive, then "
@@ -16921,7 +17074,7 @@ msgstr ""
 "seejärel liigutatakse muule andmekandjale. Selle valiku märkimine eemaldab "
 "pärast varundamist kõvakettalt tar-failid."
 
-#: standalone/drakbackup:206
+#: standalone/drakbackup:163
 #, c-format
 msgid ""
 "Some protocols, like rsync, may be configured at the server end.  Rather "
@@ -16931,7 +17084,7 @@ msgstr ""
 "Mõningad protokollid, näiteks rsync, seadistatakse serveril ning nende puhul "
 "tuleks kataloogi otsingutee asemel kasutada teenuse 'mooduli' nime."
 
-#: standalone/drakbackup:207
+#: standalone/drakbackup:164
 #, c-format
 msgid ""
 "Custom allows you to specify your own day and time.  The other options use "
@@ -16940,18 +17093,28 @@ msgstr ""
 "Isetehtud võimaldab Teil määrata päeva ja aja oma tahtmist mööda. Muude "
 "võimaluste puhul kasutatakse /etc/crontab-is leiduvat run-parts'i."
 
-#: standalone/drakbackup:604
+#: standalone/drakbackup:396
+#, c-format
+msgid "No media selected for cron operation."
+msgstr "Cron-i operatsiooniks pole andmekandjat valitud."
+
+#: standalone/drakbackup:400
+#, c-format
+msgid "No interval selected for cron operation."
+msgstr "Cron-i operatsiooniks pole intervalli valitud."
+
+#: standalone/drakbackup:447
 #, c-format
 msgid "Interval cron not available as non-root"
 msgstr "Intervalliga cron-i saab tarvitada ainult administraator"
 
-#: standalone/drakbackup:715 standalone/logdrake:415
+#: standalone/drakbackup:532 standalone/logdrake:467
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr ""
 "\"%s\" ei ole korrektne e-posti aadress ega olemasolev kohalik kasutaja!"
 
-#: standalone/drakbackup:719 standalone/logdrake:420
+#: standalone/drakbackup:536 standalone/logdrake:472
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -16960,22 +17123,22 @@ msgstr ""
 "\"%s\" on kohalik kasutaja, aga Te ei valinud kohalikku SMPT-d, nii et peate "
 "kasutama täielikku e-posti aadressi!"
 
-#: standalone/drakbackup:728
+#: standalone/drakbackup:545
 #, c-format
 msgid "Valid user list changed, rewriting config file."
 msgstr "Kehtivat nimekirja on muudetud, seadistustefail kirjutatakse uuesti."
 
-#: standalone/drakbackup:730
+#: standalone/drakbackup:547
 #, c-format
 msgid "Old user list:\n"
 msgstr "Vanad kasutajate failid:\n"
 
-#: standalone/drakbackup:732
+#: standalone/drakbackup:549
 #, c-format
 msgid "New user list:\n"
 msgstr "Uued kasutajate failid:\n"
 
-#: standalone/drakbackup:779
+#: standalone/drakbackup:594
 #, c-format
 msgid ""
 "\n"
@@ -16984,7 +17147,7 @@ msgstr ""
 "\n"
 "                      DrakBackupi raport \n"
 
-#: standalone/drakbackup:780
+#: standalone/drakbackup:595
 #, c-format
 msgid ""
 "\n"
@@ -16993,7 +17156,7 @@ msgstr ""
 "\n"
 "                      DrakBackup deemoni raport\n"
 
-#: standalone/drakbackup:786
+#: standalone/drakbackup:601
 #, c-format
 msgid ""
 "\n"
@@ -17006,13 +17169,13 @@ msgstr ""
 "\n"
 "\n"
 
-#: standalone/drakbackup:810 standalone/drakbackup:883
-#: standalone/drakbackup:939
+#: standalone/drakbackup:625 standalone/drakbackup:696
+#: standalone/drakbackup:752
 #, c-format
 msgid "Total progress"
 msgstr "Edenemine kokku"
 
-#: standalone/drakbackup:865
+#: standalone/drakbackup:678
 #, c-format
 msgid ""
 "%s exists, delete?\n"
@@ -17025,42 +17188,42 @@ msgstr ""
 "Kui te olete selle protsessi juba sooritanud, tuleks Teil\n"
 " ka kirje kustutada serveril autoriseeritud võtmete seast."
 
-#: standalone/drakbackup:874
+#: standalone/drakbackup:687
 #, c-format
 msgid "This may take a moment to generate the keys."
 msgstr "Võtmete genereerimine võtab mõne hetke aega"
 
-#: standalone/drakbackup:881
+#: standalone/drakbackup:694
 #, c-format
 msgid "Cannot spawn %s."
 msgstr "%s tekitamine ebaõnnestus."
 
-#: standalone/drakbackup:898
+#: standalone/drakbackup:711
 #, c-format
 msgid "No password prompt on %s at port %s"
 msgstr "Parooli ei pärita masinal %s pordis %s"
 
-#: standalone/drakbackup:899
+#: standalone/drakbackup:712
 #, c-format
 msgid "Bad password on %s"
 msgstr "Halb parool %s puhul"
 
-#: standalone/drakbackup:900
+#: standalone/drakbackup:713
 #, c-format
 msgid "Permission denied transferring %s to %s"
 msgstr "%s ülekandmiseks %s-le puudub luba"
 
-#: standalone/drakbackup:901
+#: standalone/drakbackup:714
 #, c-format
 msgid "Can't find %s on %s"
 msgstr "%s leidmine %s-l ebaõnnestus"
 
-#: standalone/drakbackup:904
+#: standalone/drakbackup:718
 #, c-format
 msgid "%s not responding"
 msgstr "%s ei vasta"
 
-#: standalone/drakbackup:908
+#: standalone/drakbackup:722
 #, c-format
 msgid ""
 "Transfer successful\n"
@@ -17077,47 +17240,47 @@ msgstr ""
 "\n"
 "ilma et Teilt küsitaks parooli."
 
-#: standalone/drakbackup:953
+#: standalone/drakbackup:766
 #, c-format
 msgid "WebDAV remote site already in sync!"
 msgstr "WebDAVi kaugsait on juba sünkroonis!"
 
-#: standalone/drakbackup:957
+#: standalone/drakbackup:770
 #, c-format
 msgid "WebDAV transfer failed!"
 msgstr "WebDAVi edastus ebaõnnestus!"
 
-#: standalone/drakbackup:978
+#: standalone/drakbackup:791
 #, c-format
 msgid "No CD-R/DVD-R in drive!"
 msgstr "CD-R/DVD-R ei ole seadmes!"
 
-#: standalone/drakbackup:982
+#: standalone/drakbackup:795
 #, c-format
 msgid "Does not appear to be recordable media!"
 msgstr "See ei paista küll olevat kirjutatav andmekandja!"
 
-#: standalone/drakbackup:986
+#: standalone/drakbackup:799
 #, c-format
 msgid "Not erasable media!"
 msgstr "Seda andmekandjat ei saa puhastada!"
 
-#: standalone/drakbackup:1027
+#: standalone/drakbackup:840
 #, c-format
 msgid "This may take a moment to erase the media."
 msgstr "Andmekandja puhastamine võtab mõni hetk aega"
 
-#: standalone/drakbackup:1103
+#: standalone/drakbackup:898
 #, c-format
 msgid "Permission problem accessing CD."
 msgstr "CD-le ligipääsul tekkis loaprobleem."
 
-#: standalone/drakbackup:1130
+#: standalone/drakbackup:925
 #, c-format
 msgid "No tape in %s!"
 msgstr "Seadmes %s puudub lint!"
 
-#: standalone/drakbackup:1232
+#: standalone/drakbackup:1025
 #, c-format
 msgid ""
 "Backup quota exceeded!\n"
@@ -17126,37 +17289,37 @@ msgstr ""
 "Varunduskvoot on lõhki!\n"
 "%d Mb kasutatud, %d Mb eraldatud."
 
-#: standalone/drakbackup:1251 standalone/drakbackup:1305
+#: standalone/drakbackup:1044 standalone/drakbackup:1077
 #, c-format
 msgid "Backup system files..."
 msgstr "Süsteemsete failide varundamine..."
 
-#: standalone/drakbackup:1306 standalone/drakbackup:1368
+#: standalone/drakbackup:1078 standalone/drakbackup:1119
 #, c-format
 msgid "Hard Disk Backup files..."
 msgstr "Kõvaketta varundamine..."
 
-#: standalone/drakbackup:1367
+#: standalone/drakbackup:1118
 #, c-format
 msgid "Backup User files..."
 msgstr "Kasutajafailide varundamine..."
 
-#: standalone/drakbackup:1421
+#: standalone/drakbackup:1153
 #, c-format
 msgid "Backup Other files..."
 msgstr "Muude failide varundamine..."
 
-#: standalone/drakbackup:1422
+#: standalone/drakbackup:1154
 #, c-format
 msgid "Hard Disk Backup Progress..."
 msgstr "Kõvaketta varundamise edenemine..."
 
-#: standalone/drakbackup:1427
+#: standalone/drakbackup:1159
 #, c-format
 msgid "No changes to backup!"
 msgstr "Varukoopiaga võrreldes pole mingeid muutusi!"
 
-#: standalone/drakbackup:1445 standalone/drakbackup:1469
+#: standalone/drakbackup:1177 standalone/drakbackup:1201
 #, c-format
 msgid ""
 "\n"
@@ -17167,7 +17330,7 @@ msgstr ""
 "Drakbackupi tegevus %s vahendusel:\n"
 "\n"
 
-#: standalone/drakbackup:1454
+#: standalone/drakbackup:1186
 #, c-format
 msgid ""
 "\n"
@@ -17177,18 +17340,18 @@ msgstr ""
 "\n"
 " FTP ühenduse probleem: FTP kaudu pole võimalik saata Teie varukoopiafaile.\n"
 
-#: standalone/drakbackup:1455
+#: standalone/drakbackup:1187
 #, c-format
 msgid ""
 "Error during sending file via FTP. Please correct your FTP configuration."
 msgstr "Viga faili saatmisel FTP kaudu. Palun korrigeerige FTP seadistusi."
 
-#: standalone/drakbackup:1457
+#: standalone/drakbackup:1189
 #, c-format
 msgid "file list sent by FTP: %s\n"
 msgstr "FTP kaudu saadetud faililoend: %s\n"
 
-#: standalone/drakbackup:1474
+#: standalone/drakbackup:1206
 #, c-format
 msgid ""
 "\n"
@@ -17199,7 +17362,7 @@ msgstr ""
 "Drakbackupi tegevus CD vahendusel:\n"
 "\n"
 
-#: standalone/drakbackup:1479
+#: standalone/drakbackup:1211
 #, c-format
 msgid ""
 "\n"
@@ -17210,38 +17373,27 @@ msgstr ""
 "Drakbackupi tegevus lindi vahendusel:\n"
 "\n"
 
-#: standalone/drakbackup:1488
+#: standalone/drakbackup:1220
 #, c-format
 msgid "Error sending mail. Your report mail was not sent."
 msgstr "Viga meili saatmisel. Raportimeili ei õnnestunud saata."
 
-#: standalone/drakbackup:1489
+#: standalone/drakbackup:1221
 #, c-format
 msgid " Error while sending mail. \n"
 msgstr " Viga meili saatmisel. \n"
 
-#: standalone/drakbackup:1518
+#: standalone/drakbackup:1249
 #, c-format
 msgid "Can't create catalog!"
 msgstr "Kataloogi ei õnnestunud luua!"
 
-#: standalone/drakbackup:1639
-#, c-format
-msgid "Can't create log file!"
-msgstr "Logifaili ei õnnestunud luua!"
-
-#: standalone/drakbackup:1656 standalone/drakbackup:1667
-#: standalone/drakfont:584
-#, c-format
-msgid "File Selection"
-msgstr "Failivalik"
-
-#: standalone/drakbackup:1695
+#: standalone/drakbackup:1455
 #, c-format
 msgid "Select the files or directories and click on 'OK'"
 msgstr "Valige failid või kataloogid ja klõpsake 'Olgu'"
 
-#: standalone/drakbackup:1723
+#: standalone/drakbackup:1484
 #, c-format
 msgid ""
 "\n"
@@ -17250,228 +17402,214 @@ msgstr ""
 "\n"
 "Märkige pakun ära kõik vajalikud valikud.\n"
 
-#: standalone/drakbackup:1724
+#: standalone/drakbackup:1485
 #, c-format
 msgid ""
 "These options can backup and restore all files in your /etc directory.\n"
 msgstr ""
 "Need valikud lubavad varundada ja taastada kõik failid kataloogis /etc.\n"
 
-#: standalone/drakbackup:1725
+#: standalone/drakbackup:1486
 #, c-format
 msgid "Backup your System files. (/etc directory)"
 msgstr "Süsteemsete failide varundamine (kataloog /etc)"
 
-#: standalone/drakbackup:1726 standalone/drakbackup:1790
-#: standalone/drakbackup:1856
+#: standalone/drakbackup:1487 standalone/drakbackup:1551
+#: standalone/drakbackup:1617
 #, c-format
 msgid "Use Incremental/Differential Backups  (do not replace old backups)"
 msgstr "Muut/diferentsvarunduse kasutamine (vanu varukoopiaid ei asendata)"
 
-#: standalone/drakbackup:1728 standalone/drakbackup:1792
-#: standalone/drakbackup:1858
+#: standalone/drakbackup:1489 standalone/drakbackup:1553
+#: standalone/drakbackup:1619
 #, c-format
 msgid "Use Incremental Backups"
 msgstr "Muutvarunduse kasutamine"
 
-#: standalone/drakbackup:1728 standalone/drakbackup:1792
-#: standalone/drakbackup:1858
+#: standalone/drakbackup:1489 standalone/drakbackup:1553
+#: standalone/drakbackup:1619
 #, c-format
 msgid "Use Differential Backups"
 msgstr "Diferentsvarunduse kasutamine"
 
-#: standalone/drakbackup:1730
+#: standalone/drakbackup:1491
 #, c-format
 msgid "Do not include critical files (passwd, group, fstab)"
 msgstr "Kriitilised failid jäetakse välja (passwd, group, fstab)"
 
-#: standalone/drakbackup:1731
+#: standalone/drakbackup:1492
 #, c-format
 msgid ""
 "With this option you will be able to restore any version\n"
 " of your /etc directory."
 msgstr "Selle valikuga võite taastada kataloogi /etc suvalise versiooni."
 
-#: standalone/drakbackup:1762
+#: standalone/drakbackup:1523
 #, c-format
 msgid "Please check all users that you want to include in your backup."
 msgstr "Märkige palun kõik kasutajad, keda soovite varukoopiasse kaasata."
 
-#: standalone/drakbackup:1789
+#: standalone/drakbackup:1550
 #, c-format
 msgid "Do not include the browser cache"
 msgstr "Veebilehitseja mälupuhvri kõrvalejätmine"
 
-#: standalone/drakbackup:1844 standalone/drakfont:650
+#: standalone/drakbackup:1605 standalone/drakfont:656
 #, c-format
 msgid "Remove Selected"
 msgstr "Eemalda valitud"
 
-#: standalone/drakbackup:1891 standalone/drakbackup:1895
-#, c-format
-msgid "Under Devel ... please wait."
-msgstr "Tegutsen... palun oodake."
-
-#: standalone/drakbackup:1909
-#, c-format
-msgid "Windows (FAT32)"
-msgstr "Windows (FAT32)"
-
-#: standalone/drakbackup:1942
+#: standalone/drakbackup:1668
 #, c-format
 msgid "Users"
 msgstr "Kasutajad"
 
-#: standalone/drakbackup:1961
+#: standalone/drakbackup:1688
 #, c-format
 msgid "Use network connection to backup"
 msgstr "Võrguühenduse kasutamine varundamiseks"
 
-#: standalone/drakbackup:1963
+#: standalone/drakbackup:1690
 #, c-format
 msgid "Net Method:"
 msgstr "Võrgumeetod:"
 
-#: standalone/drakbackup:1967
+#: standalone/drakbackup:1694
 #, c-format
 msgid "Use Expect for SSH"
 msgstr "Expecti kasutamine SSH jaoks"
 
-#: standalone/drakbackup:1968
+#: standalone/drakbackup:1695
 #, c-format
 msgid "Create/Transfer backup keys for SSH"
 msgstr "Loo/kanna üle varundusvõtmed SSH jaoks"
 
-#: standalone/drakbackup:1970
+#: standalone/drakbackup:1697
 #, c-format
 msgid "Transfer Now"
 msgstr "Kanna kohe üle"
 
-#: standalone/drakbackup:1972
+#: standalone/drakbackup:1699
 #, c-format
 msgid "Other (not drakbackup) keys in place already"
 msgstr "Muud (drakbackupi-välised) võtmed on juba paigas"
 
-#: standalone/drakbackup:1975
+#: standalone/drakbackup:1702
 #, c-format
 msgid "Host name or IP."
 msgstr "Masinanimi või IP"
 
-#: standalone/drakbackup:1980
+#: standalone/drakbackup:1707
 #, c-format
 msgid "Directory (or module) to put the backup on this host."
 msgstr "Kataloog (või moodul), kuhu sellel masinal varukoopia salvestada"
 
-#: standalone/drakbackup:1985
+#: standalone/drakbackup:1712
 #, c-format
 msgid "Login name"
 msgstr "Kasutajatunnus"
 
-#: standalone/drakbackup:1992
+#: standalone/drakbackup:1719
 #, c-format
 msgid "Remember this password"
 msgstr "Salasõna jäetakse meelde"
 
-#: standalone/drakbackup:2004
+#: standalone/drakbackup:1735
 #, c-format
 msgid "Need hostname, username and password!"
 msgstr "Vaja läheb masinanime, kasutajatunnust ja parooli!"
 
-#: standalone/drakbackup:2106
+#: standalone/drakbackup:1833
 #, c-format
 msgid "Use CD-R/DVD-R to backup"
 msgstr "Varundamine CD-R/DVD-R-ile"
 
-#: standalone/drakbackup:2109
+#: standalone/drakbackup:1836
 #, c-format
 msgid "Choose your CD/DVD device"
 msgstr "CD/DVD-seade"
 
-#: standalone/drakbackup:2114
+#: standalone/drakbackup:1841
 #, c-format
 msgid "Choose your CD/DVD media size"
 msgstr "Valige CD/DVD plaadi suurus"
 
-#: standalone/drakbackup:2121
+#: standalone/drakbackup:1848
 #, c-format
 msgid "Multisession CD"
 msgstr "Mitmeseansiline CD"
 
-#: standalone/drakbackup:2123
+#: standalone/drakbackup:1850
 #, c-format
 msgid "CDRW media"
 msgstr "CD-RW plaat"
 
-#: standalone/drakbackup:2128
+#: standalone/drakbackup:1856
 #, c-format
 msgid "Erase your RW media (1st Session)"
 msgstr "RW plaadi puhastamine (esimene seanss)"
 
-#: standalone/drakbackup:2129
+#: standalone/drakbackup:1857
 #, c-format
 msgid " Erase Now "
 msgstr " Puhasta nüüd! "
 
-#: standalone/drakbackup:2136
+#: standalone/drakbackup:1863
 #, c-format
 msgid "DVD+RW media"
 msgstr "DVD+RW plaat"
 
-#: standalone/drakbackup:2138
+#: standalone/drakbackup:1865
 #, c-format
 msgid "DVD-R media"
 msgstr "DVD-R plaat"
 
-#: standalone/drakbackup:2140
+#: standalone/drakbackup:1867
 #, c-format
 msgid "DVDRAM device"
 msgstr "DVDRAM seade"
 
-#: standalone/drakbackup:2145
-#, c-format
-msgid ""
-"Enter your CD Writer device name\n"
-" ex: 0,1,0"
-msgstr ""
-"CD-kirjutaja seadmenimi\n"
-" nt: 0,1,0"
-
-#: standalone/drakbackup:2177
+#: standalone/drakbackup:1898
 #, c-format
 msgid "No CD device defined!"
 msgstr "CD-seade on määramata!"
 
-#: standalone/drakbackup:2227
+#: standalone/drakbackup:1945
 #, c-format
 msgid "Use tape to backup"
 msgstr "Varundamine lindile"
 
-#: standalone/drakbackup:2230
+#: standalone/drakbackup:1948
 #, c-format
 msgid "Device name to use for backup"
 msgstr "Varundamiseks kasutatava seadme nimi"
 
-#: standalone/drakbackup:2237
+#: standalone/drakbackup:1954
 #, c-format
 msgid "Don't rewind tape after backup"
 msgstr "Linti ei kerita pärast varundamist algusse"
 
-#: standalone/drakbackup:2243
+#: standalone/drakbackup:1960
 #, c-format
 msgid "Erase tape before backup"
 msgstr "Lint puhastatakse enne varundamist"
 
-#: standalone/drakbackup:2249
+#: standalone/drakbackup:1966
 #, c-format
 msgid "Eject tape after the backup"
 msgstr "Lint väljastatakse pärast varundamist"
 
-#: standalone/drakbackup:2317
+#: standalone/drakbackup:2033
 #, c-format
 msgid "Enter the directory to save to:"
 msgstr "Kataloog, kuhu salvestada:"
 
-#: standalone/drakbackup:2326
+#: standalone/drakbackup:2037
+#, c-format
+msgid "Directory to save to"
+msgstr "Kataloog, kuhu salvestada"
+
+#: standalone/drakbackup:2042
 #, c-format
 msgid ""
 "Maximum size\n"
@@ -17480,316 +17618,311 @@ msgstr ""
 "Drakbackupi suurim\n"
 " lubatud suurus (Mb)"
 
-#: standalone/drakbackup:2399
+#: standalone/drakbackup:2106
 #, c-format
 msgid "CD-R / DVD-R"
 msgstr "CD-R / DVD-R"
 
-#: standalone/drakbackup:2404
+#: standalone/drakbackup:2111
 #, c-format
 msgid "HardDrive / NFS"
 msgstr "Kõvaketas / NFS"
 
-#: standalone/drakbackup:2420 standalone/drakbackup:2425
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2127 standalone/drakbackup:2132
+#: standalone/drakbackup:2137
 #, c-format
 msgid "hourly"
 msgstr "kord tunnis"
 
-#: standalone/drakbackup:2421 standalone/drakbackup:2426
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2128 standalone/drakbackup:2133
+#: standalone/drakbackup:2137
 #, c-format
 msgid "daily"
 msgstr "kord päevas"
 
-#: standalone/drakbackup:2422 standalone/drakbackup:2427
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2129 standalone/drakbackup:2134
+#: standalone/drakbackup:2137
 #, c-format
 msgid "weekly"
 msgstr "kord nädalas"
 
-#: standalone/drakbackup:2423 standalone/drakbackup:2428
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2130 standalone/drakbackup:2135
+#: standalone/drakbackup:2137
 #, c-format
 msgid "monthly"
 msgstr "kord kuus"
 
-#: standalone/drakbackup:2424 standalone/drakbackup:2429
-#: standalone/drakbackup:2430
+#: standalone/drakbackup:2131 standalone/drakbackup:2136
+#: standalone/drakbackup:2137
 #, c-format
 msgid "custom"
 msgstr "isetehtud"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "January"
 msgstr "Jaanuar"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "February"
 msgstr "Veebruar"
 
-#: standalone/drakbackup:2435
+#: standalone/drakbackup:2142
 #, c-format
 msgid "March"
 msgstr "Märts"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "April"
 msgstr "Aprill"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "May"
 msgstr "Mai"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "June"
 msgstr "Juuni"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "July"
 msgstr "Juuli"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "August"
 msgstr "August"
 
-#: standalone/drakbackup:2436
+#: standalone/drakbackup:2143
 #, c-format
 msgid "September"
 msgstr "September"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "October"
 msgstr "Oktoober"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "November"
 msgstr "November"
 
-#: standalone/drakbackup:2437
+#: standalone/drakbackup:2144
 #, c-format
 msgid "December"
 msgstr "Detsember"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: standalone/drakbackup:2442
+#: standalone/drakbackup:2149
 #, c-format
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Friday"
 msgstr "Reede"
 
-#: standalone/drakbackup:2443
+#: standalone/drakbackup:2150
 #, c-format
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: standalone/drakbackup:2478
+#: standalone/drakbackup:2185
 #, c-format
 msgid "Use daemon"
 msgstr "Deemoni kasutamine"
 
-#: standalone/drakbackup:2483
+#: standalone/drakbackup:2190
 #, c-format
 msgid "Please choose the time interval between each backup"
 msgstr "Valige palun varundamiste vaheline ajaline intervall"
 
-#: standalone/drakbackup:2489
+#: standalone/drakbackup:2196
 #, c-format
 msgid "Custom setup/crontab entry:"
 msgstr "Isetehtud setup/crontab kirje:"
 
-#: standalone/drakbackup:2494
+#: standalone/drakbackup:2201
 #, c-format
 msgid "Minute"
 msgstr "Minutit"
 
-#: standalone/drakbackup:2498
+#: standalone/drakbackup:2205
 #, c-format
 msgid "Hour"
 msgstr "Tundi"
 
-#: standalone/drakbackup:2502
+#: standalone/drakbackup:2209
 #, c-format
 msgid "Day"
 msgstr "Päev"
 
-#: standalone/drakbackup:2506
+#: standalone/drakbackup:2213
 #, c-format
 msgid "Month"
 msgstr "Kuu"
 
-#: standalone/drakbackup:2510
+#: standalone/drakbackup:2217
 #, c-format
 msgid "Weekday"
 msgstr "Nädalapäev"
 
-#: standalone/drakbackup:2516
+#: standalone/drakbackup:2223
 #, c-format
 msgid "Please choose the media for backup."
 msgstr "Valige palun varundamiseks kasutatav andmekandja"
 
-#: standalone/drakbackup:2523
+#: standalone/drakbackup:2230
 #, c-format
 msgid "Please be sure that the cron daemon is included in your services."
 msgstr "Kontrollige palun, et cron-deemon on teenuste seas ja töötab."
 
-#: standalone/drakbackup:2524
+#: standalone/drakbackup:2231
 #, c-format
 msgid "Note that currently all 'net' media also use the hard drive."
 msgstr ""
 "Arvestage, et praegu kasutavad kõvaketast ka kõik 'võrgu'-andmekandjad."
 
-#: standalone/drakbackup:2571
+#: standalone/drakbackup:2281
 #, c-format
-msgid "Use tar and bzip2 (rather than tar and gzip)"
-msgstr "Tar ja bzip2 kasutamine (tar ja gzip asemel)"
+msgid "Please choose the compression type"
+msgstr "Palun valige tihendamise meetod"
 
-#: standalone/drakbackup:2572
+#: standalone/drakbackup:2285
 #, c-format
 msgid "Use .backupignore files"
 msgstr "Kasutatakse .backupignore faile"
 
-#: standalone/drakbackup:2574
+#: standalone/drakbackup:2287
 #, c-format
 msgid "Send mail report after each backup to:"
 msgstr "Pärast iga varundamist saadetakse raport:"
 
-#: standalone/drakbackup:2580
+#: standalone/drakbackup:2293
 #, c-format
 msgid "SMTP server for mail:"
 msgstr "SMB serveri nimi:"
 
-#: standalone/drakbackup:2585
+#: standalone/drakbackup:2298
 #, c-format
 msgid "Delete Hard Drive tar files after backup to other media."
 msgstr ""
 "Tar-failid kustutatakse kõvakettalt pärast varundamist muule andmekandjale"
 
-#: standalone/drakbackup:2624
+#: standalone/drakbackup:2338
 #, c-format
 msgid "What"
 msgstr "Mis"
 
-#: standalone/drakbackup:2629
+#: standalone/drakbackup:2343
 #, c-format
 msgid "Where"
 msgstr "Kus"
 
-#: standalone/drakbackup:2634
+#: standalone/drakbackup:2348
 #, c-format
 msgid "When"
 msgstr "Millal"
 
-#: standalone/drakbackup:2639
+#: standalone/drakbackup:2353
 #, c-format
 msgid "More Options"
 msgstr "Rohkem valikuid"
 
-#: standalone/drakbackup:2651
-#, fuzzy, c-format
+#: standalone/drakbackup:2366
+#, c-format
 msgid "Backup destination not configured..."
-msgstr "Võrguvalmidus on seadistamata"
+msgstr "Varukoopiate sihtkoht on määramata..."
 
-#: standalone/drakbackup:2667 standalone/drakbackup:4731
+#: standalone/drakbackup:2385 standalone/drakbackup:4413
 #, c-format
 msgid "Drakbackup Configuration"
 msgstr "Drakbackupi seadistused"
 
-#: standalone/drakbackup:2684
+#: standalone/drakbackup:2402
 #, c-format
 msgid "Please choose where you want to backup"
 msgstr "Valige palun, kuhu soovite varukoopia salvestada"
 
-#: standalone/drakbackup:2686
+#: standalone/drakbackup:2404
 #, c-format
 msgid "Hard Drive used to prepare backups for all media"
 msgstr ""
 "kõvakettale (seda kasutatakse kõigi andmekandjate varukoopiate "
 "ettevalmistamiseks)"
 
-#: standalone/drakbackup:2694
+#: standalone/drakbackup:2412
 #, c-format
 msgid "Across Network"
 msgstr "üle võrgu"
 
-#: standalone/drakbackup:2702
+#: standalone/drakbackup:2420
 #, c-format
 msgid "On CD-R"
 msgstr "CD-R-ile"
 
-#: standalone/drakbackup:2710
+#: standalone/drakbackup:2428
 #, c-format
 msgid "On Tape Device"
 msgstr "lindiseadmele"
 
-#: standalone/drakbackup:2738
-#, c-format
-msgid "Please select media for backup..."
-msgstr "Valige palun varundamiseks andmekandja..."
-
-#: standalone/drakbackup:2760
+#: standalone/drakbackup:2468
 #, c-format
 msgid "Backup Users"
 msgstr "kasutajate faile"
 
-#: standalone/drakbackup:2761
+#: standalone/drakbackup:2469
 #, c-format
 msgid " (Default is all users)"
 msgstr " ('vaikimisi' tähendab kõiki kasutajaid)"
 
-#: standalone/drakbackup:2773
+#: standalone/drakbackup:2481
 #, c-format
 msgid "Please choose what you want to backup"
 msgstr "Valige palun, mida soovite varundada"
 
-#: standalone/drakbackup:2774
+#: standalone/drakbackup:2482
 #, c-format
 msgid "Backup System"
 msgstr "süsteemseid faile"
 
-#: standalone/drakbackup:2776
+#: standalone/drakbackup:2484
 #, c-format
 msgid "Select user manually"
 msgstr "Kasutaja valik käsitsi"
 
-#: standalone/drakbackup:2805
+#: standalone/drakbackup:2513
 #, c-format
 msgid "Please select data to backup..."
 msgstr "Valige palun varundamiseks andmed..."
 
-#: standalone/drakbackup:2879
+#: standalone/drakbackup:2585
 #, c-format
 msgid ""
 "\n"
@@ -17798,7 +17931,7 @@ msgstr ""
 "\n"
 "Varundusallikad: \n"
 
-#: standalone/drakbackup:2880
+#: standalone/drakbackup:2586
 #, c-format
 msgid ""
 "\n"
@@ -17807,7 +17940,7 @@ msgstr ""
 "\n"
 "- Süsteemsed failid:\n"
 
-#: standalone/drakbackup:2882
+#: standalone/drakbackup:2588
 #, c-format
 msgid ""
 "\n"
@@ -17816,7 +17949,7 @@ msgstr ""
 "\n"
 "- Kasutaja failid.\n"
 
-#: standalone/drakbackup:2884
+#: standalone/drakbackup:2590
 #, c-format
 msgid ""
 "\n"
@@ -17825,7 +17958,7 @@ msgstr ""
 "\n"
 "- Muud failid:\n"
 
-#: standalone/drakbackup:2886
+#: standalone/drakbackup:2592
 #, c-format
 msgid ""
 "\n"
@@ -17834,12 +17967,12 @@ msgstr ""
 "\n"
 "- Salvestamine kõvakettale asukohta: %s\n"
 
-#: standalone/drakbackup:2887
+#: standalone/drakbackup:2593
 #, c-format
 msgid "\tLimit disk usage to %s MB\n"
 msgstr "\tKettast lubatakse kasutada %s Mb\n"
 
-#: standalone/drakbackup:2890
+#: standalone/drakbackup:2596
 #, c-format
 msgid ""
 "\n"
@@ -17848,17 +17981,17 @@ msgstr ""
 "\n"
 "- Pärast varundamist kustutatakse kõvakettalt tar-failid.\n"
 
-#: standalone/drakbackup:2894
+#: standalone/drakbackup:2600
 #, c-format
 msgid "NO"
 msgstr "EI"
 
-#: standalone/drakbackup:2895
+#: standalone/drakbackup:2601
 #, c-format
 msgid "YES"
 msgstr "JAH"
 
-#: standalone/drakbackup:2896
+#: standalone/drakbackup:2602
 #, c-format
 msgid ""
 "\n"
@@ -17867,22 +18000,22 @@ msgstr ""
 "\n"
 "- Kirjutamine CD-le"
 
-#: standalone/drakbackup:2897
+#: standalone/drakbackup:2603
 #, c-format
 msgid "RW"
 msgstr "RW"
 
-#: standalone/drakbackup:2898
+#: standalone/drakbackup:2604
 #, c-format
 msgid " on device: %s"
 msgstr " seadmel: %s"
 
-#: standalone/drakbackup:2899
+#: standalone/drakbackup:2605
 #, c-format
 msgid " (multi-session)"
 msgstr " (mitmeseansiline)"
 
-#: standalone/drakbackup:2900
+#: standalone/drakbackup:2606
 #, c-format
 msgid ""
 "\n"
@@ -17891,12 +18024,12 @@ msgstr ""
 "\n"
 "- Salvestamine lindile seadmel: %s"
 
-#: standalone/drakbackup:2901
+#: standalone/drakbackup:2607
 #, c-format
 msgid "\t\tErase=%s"
 msgstr "\t\tPuhasta=%s"
 
-#: standalone/drakbackup:2904
+#: standalone/drakbackup:2610
 #, c-format
 msgid ""
 "\n"
@@ -17905,7 +18038,7 @@ msgstr ""
 "\n"
 "- Salvestamine %s vahendusel masinale: %s\n"
 
-#: standalone/drakbackup:2905
+#: standalone/drakbackup:2611
 #, c-format
 msgid ""
 "\t\t user name: %s\n"
@@ -17914,7 +18047,7 @@ msgstr ""
 "\t\t kasutajatunnus: %s\n"
 "\t\t asukohas: %s \n"
 
-#: standalone/drakbackup:2906
+#: standalone/drakbackup:2612
 #, c-format
 msgid ""
 "\n"
@@ -17923,37 +18056,42 @@ msgstr ""
 "\n"
 "- Valikud:\n"
 
-#: standalone/drakbackup:2907
+#: standalone/drakbackup:2613
 #, c-format
 msgid "\tDo not include System Files\n"
 msgstr "\tsüsteemsete failide kõrvalejätmine\n"
 
-#: standalone/drakbackup:2910
+#: standalone/drakbackup:2615
 #, c-format
 msgid "\tBackups use tar and bzip2\n"
 msgstr "\tvarukoopiad tar- ja bzip2-vormingus\n"
 
-#: standalone/drakbackup:2912
+#: standalone/drakbackup:2616
 #, c-format
 msgid "\tBackups use tar and gzip\n"
 msgstr "\tvarukoopiad tar- ja gzip-vormingus\n"
 
-#: standalone/drakbackup:2915
+#: standalone/drakbackup:2617
+#, c-format
+msgid "\tBackups use tar only\n"
+msgstr "\tvarukoopiad ainult tar-vormingus\n"
+
+#: standalone/drakbackup:2619
 #, c-format
 msgid "\tUse .backupignore files\n"
 msgstr "\tkasutatakse .backupignore faile\n"
 
-#: standalone/drakbackup:2916
+#: standalone/drakbackup:2620
 #, c-format
 msgid "\tSend mail to %s\n"
 msgstr "\traport saadetakse %s-le\n"
 
-#: standalone/drakbackup:2917
+#: standalone/drakbackup:2621
 #, c-format
 msgid "\tUsing SMTP server %s\n"
 msgstr "\tkasutatakse SMTP serverit %s\n"
 
-#: standalone/drakbackup:2919
+#: standalone/drakbackup:2623
 #, c-format
 msgid ""
 "\n"
@@ -17962,47 +18100,47 @@ msgstr ""
 "\n"
 "- Deemon (%s) vahendusel:\n"
 
-#: standalone/drakbackup:2920
+#: standalone/drakbackup:2624
 #, c-format
 msgid "\t-Hard drive.\n"
 msgstr "\t-kõvaketas.\n"
 
-#: standalone/drakbackup:2921
+#: standalone/drakbackup:2625
 #, c-format
 msgid "\t-CD-R.\n"
 msgstr "\t-CD-R.\n"
 
-#: standalone/drakbackup:2922
+#: standalone/drakbackup:2626
 #, c-format
 msgid "\t-Tape \n"
 msgstr "\t-lint \n"
 
-#: standalone/drakbackup:2923
+#: standalone/drakbackup:2627
 #, c-format
 msgid "\t-Network by FTP.\n"
 msgstr "\t-võrk FTP vahendusel.\n"
 
-#: standalone/drakbackup:2924
+#: standalone/drakbackup:2628
 #, c-format
 msgid "\t-Network by SSH.\n"
 msgstr "\t-võrk SSH vahendusel.\n"
 
-#: standalone/drakbackup:2925
+#: standalone/drakbackup:2629
 #, c-format
 msgid "\t-Network by rsync.\n"
 msgstr "\t-võrk rsync vahendusel.\n"
 
-#: standalone/drakbackup:2926
+#: standalone/drakbackup:2630
 #, c-format
 msgid "\t-Network by webdav.\n"
 msgstr "\t-võrk webdavi vahendusel.\n"
 
-#: standalone/drakbackup:2928
+#: standalone/drakbackup:2632
 #, c-format
 msgid "No configuration, please click Wizard or Advanced.\n"
 msgstr "Seadistus puudub, klõpsake palun nupul 'Nõustaja' või 'Muud'.\n"
 
-#: standalone/drakbackup:2933
+#: standalone/drakbackup:2637
 #, c-format
 msgid ""
 "List of data to restore:\n"
@@ -18011,27 +18149,27 @@ msgstr ""
 "Taastatavate andmete loend:\n"
 "\n"
 
-#: standalone/drakbackup:2935
+#: standalone/drakbackup:2639
 #, c-format
 msgid "- Restore System Files.\n"
 msgstr "- Süsteemsete failide taastamine.\n"
 
-#: standalone/drakbackup:2937 standalone/drakbackup:2947
+#: standalone/drakbackup:2641 standalone/drakbackup:2651
 #, c-format
 msgid "   - from date: %s %s\n"
 msgstr "   - kuupäevast %s %s\n"
 
-#: standalone/drakbackup:2940
+#: standalone/drakbackup:2644
 #, c-format
 msgid "- Restore User Files: \n"
 msgstr "- Kasutaja failide taastamine: \n"
 
-#: standalone/drakbackup:2945
+#: standalone/drakbackup:2649
 #, c-format
 msgid "- Restore Other Files: \n"
 msgstr "- Muude failide taastamine: \n"
 
-#: standalone/drakbackup:3121
+#: standalone/drakbackup:2830
 #, c-format
 msgid ""
 "List of data corrupted:\n"
@@ -18040,117 +18178,127 @@ msgstr ""
 "Vigaste andmete loend:\n"
 "\n"
 
-#: standalone/drakbackup:3123
+#: standalone/drakbackup:2832
 #, c-format
 msgid "Please uncheck or remove it on next time."
 msgstr "Palun tühistage valik või eemaldage järgmisel korral"
 
-#: standalone/drakbackup:3133
+#: standalone/drakbackup:2842
 #, c-format
 msgid "Backup files are corrupted"
 msgstr "Varukoopia failid on vigased"
 
-#: standalone/drakbackup:3154
+#: standalone/drakbackup:2863
 #, c-format
 msgid "          All of your selected data have been          "
 msgstr "          Kõik valitud andmed on           "
 
-#: standalone/drakbackup:3155
+#: standalone/drakbackup:2864
 #, c-format
 msgid "          Successfuly Restored on %s       "
 msgstr "         edukalt taastatud %s -l       "
 
-#: standalone/drakbackup:3270
+#: standalone/drakbackup:2987
 #, c-format
 msgid "         Restore Configuration       "
 msgstr "         Taastamise seadistamine       "
 
-#: standalone/drakbackup:3298
+#: standalone/drakbackup:3015
 #, c-format
 msgid "OK to restore the other files."
 msgstr "Muude failide taastamiseks vajutage 'Olgu'."
 
-#: standalone/drakbackup:3316
+#: standalone/drakbackup:3031
 #, c-format
 msgid "User list to restore (only the most recent date per user is important)"
 msgstr "Taastatavad kasutajate failid (olulised on ainult kõige uuemad andmed)"
 
-#: standalone/drakbackup:3382
+#: standalone/drakbackup:3098
 #, c-format
 msgid "Please choose the date to restore:"
 msgstr "valige palun kuupäev, kust taastada"
 
-#: standalone/drakbackup:3420
+#: standalone/drakbackup:3135
 #, c-format
 msgid "Restore from Hard Disk."
 msgstr "Taastamine kõvakettalt"
 
-#: standalone/drakbackup:3422
+#: standalone/drakbackup:3137
 #, c-format
 msgid "Enter the directory where backups are stored"
 msgstr "Kataloog, kuhu varukoopiad on salvestatud"
 
-#: standalone/drakbackup:3478
+#: standalone/drakbackup:3141
+#, c-format
+msgid "Directory with backups"
+msgstr "Varukoopiate kataloog"
+
+#: standalone/drakbackup:3194
 #, c-format
 msgid "Select another media to restore from"
 msgstr "Muu andmekandja, millelt taastada"
 
-#: standalone/drakbackup:3480
+#: standalone/drakbackup:3196
 #, c-format
 msgid "Other Media"
 msgstr "Muu andmekandja"
 
-#: standalone/drakbackup:3485
+#: standalone/drakbackup:3201
 #, c-format
 msgid "Restore system"
 msgstr "Süsteemi taastamine"
 
-#: standalone/drakbackup:3486
+#: standalone/drakbackup:3202
 #, c-format
 msgid "Restore Users"
 msgstr "Kasutajate taastamine"
 
-#: standalone/drakbackup:3487
+#: standalone/drakbackup:3203
 #, c-format
 msgid "Restore Other"
 msgstr "Muu taastamine"
 
-#: standalone/drakbackup:3489
+#: standalone/drakbackup:3205
 #, c-format
-msgid "select path to restore (instead of /)"
+msgid "Select path to restore (instead of /)"
 msgstr "Asukoht, kuhu taastada (kui ei ole /)"
 
-#: standalone/drakbackup:3493
+#: standalone/drakbackup:3209 standalone/drakbackup:3490
+#, c-format
+msgid "Path To Restore To"
+msgstr "Taastamise asukoht"
+
+#: standalone/drakbackup:3212
 #, c-format
 msgid "Do new backup before restore (only for incremental backups.)"
 msgstr "Uus varundamine enne taastamist (ainult muutvarunduse puhul)"
 
-#: standalone/drakbackup:3495
+#: standalone/drakbackup:3214
 #, c-format
 msgid "Remove user directories before restore."
 msgstr "Kasutaja kataloogid eemaldatakse enne taastamist"
 
-#: standalone/drakbackup:3575
+#: standalone/drakbackup:3298
 #, c-format
 msgid "Filename text substring to search for (empty string matches all):"
 msgstr "Otsitava faili nimi (tühjaks jätmisel sobivad kõik):"
 
-#: standalone/drakbackup:3578
+#: standalone/drakbackup:3301
 #, c-format
 msgid "Search Backups"
 msgstr "Varukoopiate otsimine"
 
-#: standalone/drakbackup:3597
+#: standalone/drakbackup:3320
 #, c-format
 msgid "No matches found..."
 msgstr "Ühtegi sobivust ei leitud..."
 
-#: standalone/drakbackup:3601
+#: standalone/drakbackup:3324
 #, c-format
 msgid "Restore Selected"
 msgstr "Taasta valitud"
 
-#: standalone/drakbackup:3735
+#: standalone/drakbackup:3458
 #, c-format
 msgid ""
 "Click date/time to see backup files.\n"
@@ -18159,7 +18307,7 @@ msgstr ""
 "Klõpsake kuupäevale/ajale varundatud failide vaatamiseks.\n"
 "Ctrl+klõps võimaldab valida mitu faili korraga."
 
-#: standalone/drakbackup:3741
+#: standalone/drakbackup:3464
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18168,7 +18316,7 @@ msgstr ""
 "Taasta valitud\n"
 "kataloogikirje"
 
-#: standalone/drakbackup:3750
+#: standalone/drakbackup:3473
 #, c-format
 msgid ""
 "Restore Selected\n"
@@ -18177,26 +18325,17 @@ msgstr ""
 "Taasta valitud\n"
 "failid"
 
-#: standalone/drakbackup:3766
-#, c-format
-msgid ""
-"Change\n"
-"Restore Path"
-msgstr ""
-"Muuda\n"
-"taastamise asukohta"
-
-#: standalone/drakbackup:3833
+#: standalone/drakbackup:3550
 #, c-format
 msgid "Backup files not found at %s."
 msgstr "%s ei sisaldanud varukoopiafaile."
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid "Restore From CD"
 msgstr "Taastamine CD-lt"
 
-#: standalone/drakbackup:3846
+#: standalone/drakbackup:3563
 #, c-format
 msgid ""
 "Insert the CD with volume label %s\n"
@@ -18205,17 +18344,17 @@ msgstr ""
 "Sisestage CD nimega %s\n"
 " CD-seadmesse haakepunktis /mnt/cdrom"
 
-#: standalone/drakbackup:3848
+#: standalone/drakbackup:3565
 #, c-format
 msgid "Not the correct CD label. Disk is labelled %s."
 msgstr "CD nimi pole korrektne. Ketta nimi on %s."
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid "Restore From Tape"
 msgstr "Taastamine lindilt"
 
-#: standalone/drakbackup:3858
+#: standalone/drakbackup:3575
 #, c-format
 msgid ""
 "Insert the tape with volume label %s\n"
@@ -18224,214 +18363,219 @@ msgstr ""
 "Sisestage lint nimega %s\n"
 " lindiseadmesse %s"
 
-#: standalone/drakbackup:3860
+#: standalone/drakbackup:3577
 #, c-format
 msgid "Not the correct tape label. Tape is labelled %s."
 msgstr "Lindi nimi pole korrektne. Lint kannab nime %s."
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network"
 msgstr "Taastamine võrgust"
 
-#: standalone/drakbackup:3871
+#: standalone/drakbackup:3588
 #, c-format
 msgid "Restore Via Network Protocol: %s"
 msgstr "Taastamine võrguprotokolli abil: %s"
 
-#: standalone/drakbackup:3872
+#: standalone/drakbackup:3589
 #, c-format
 msgid "Host Name"
 msgstr "Masinanimi"
 
-#: standalone/drakbackup:3873
+#: standalone/drakbackup:3590
 #, c-format
 msgid "Host Path or Module"
 msgstr "Masina kataloog või moodul"
 
-#: standalone/drakbackup:3880
+#: standalone/drakbackup:3597
 #, c-format
 msgid "Password required"
 msgstr "Parooli nõudmine"
 
-#: standalone/drakbackup:3886
+#: standalone/drakbackup:3603
 #, c-format
 msgid "Username required"
 msgstr "Kasutajatunnuse nõudmine"
 
-#: standalone/drakbackup:3889
+#: standalone/drakbackup:3606
 #, c-format
 msgid "Hostname required"
 msgstr "Masinanime nõudmine"
 
-#: standalone/drakbackup:3894
+#: standalone/drakbackup:3611
 #, c-format
 msgid "Path or Module required"
 msgstr "Kataloogi või mooduli nõudmine"
 
-#: standalone/drakbackup:3907
+#: standalone/drakbackup:3624
 #, c-format
 msgid "Files Restored..."
 msgstr "Taastatud failid..."
 
-#: standalone/drakbackup:3910
+#: standalone/drakbackup:3627
 #, c-format
 msgid "Restore Failed..."
 msgstr "Taastamine ebaõnnestus..."
 
-#: standalone/drakbackup:4015 standalone/drakbackup:4031
-#, fuzzy, c-format
+#: standalone/drakbackup:3737 standalone/drakbackup:3754
+#, c-format
 msgid "%s not retrieved..."
-msgstr "%s jäi leidmata...\n"
+msgstr "%s jäi hankimata..."
 
-#: standalone/drakbackup:4155 standalone/drakbackup:4228
+#: standalone/drakbackup:3880 standalone/drakbackup:3953
 #, c-format
 msgid "Search for files to restore"
 msgstr "Taastatavate failide otsimine"
 
-#: standalone/drakbackup:4160
+#: standalone/drakbackup:3885
 #, c-format
 msgid "Restore all backups"
 msgstr "Taasta kõik varukoopiad"
 
-#: standalone/drakbackup:4169
+#: standalone/drakbackup:3894
 #, c-format
 msgid "Custom Restore"
 msgstr "Taastamise kohandamine"
 
-#: standalone/drakbackup:4174 standalone/drakbackup:4224
+#: standalone/drakbackup:3899 standalone/drakbackup:3949
 #, c-format
 msgid "Restore From Catalog"
 msgstr "Taastamine kataloogist"
 
-#: standalone/drakbackup:4196
+#: standalone/drakbackup:3921
 #, c-format
 msgid "Unable to find backups to restore...\n"
 msgstr "Varukoopiaid taastamiseks ei leitud...\n"
 
-#: standalone/drakbackup:4197
+#: standalone/drakbackup:3922
 #, c-format
 msgid "Verify that %s is the correct path"
 msgstr "Kontrollige, et %s on korrektne otsingutee"
 
-#: standalone/drakbackup:4198
+#: standalone/drakbackup:3923
 #, c-format
 msgid " and the CD is in the drive"
 msgstr " ja CD on sisse pandud"
 
-#: standalone/drakbackup:4200
+#: standalone/drakbackup:3925
 #, c-format
 msgid "Backups on unmountable media - Use Catalog to restore"
 msgstr ""
 "Varukoopiad haakimata andmekandjal - taastamiseks kasutatakse kataloogi"
 
-#: standalone/drakbackup:4216
+#: standalone/drakbackup:3941
 #, c-format
 msgid "CD in place - continue."
 msgstr "CD on kohal - jätka"
 
-#: standalone/drakbackup:4221
+#: standalone/drakbackup:3946
 #, c-format
 msgid "Browse to new restore repository."
 msgstr "Uue taastamishoidla valimine"
 
-#: standalone/drakbackup:4258
+#: standalone/drakbackup:3947
+#, c-format
+msgid "Directory To Restore From"
+msgstr "Taastamine kataloogist"
+
+#: standalone/drakbackup:3986
 #, c-format
 msgid "Restore Progress"
 msgstr "Taastamise edenemine"
 
-#: standalone/drakbackup:4292 standalone/drakbackup:4404
-#: standalone/logdrake:175
+#: standalone/drakbackup:4016 standalone/drakbackup:4123
+#: standalone/logdrake:174
 #, c-format
 msgid "Save"
 msgstr "Salvesta"
 
-#: standalone/drakbackup:4378
+#: standalone/drakbackup:4099
 #, c-format
 msgid "Build Backup"
 msgstr "Loo varukoopia"
 
-#: standalone/drakbackup:4430 standalone/drakbackup:4829
+#: standalone/drakbackup:4147 standalone/drakbackup:4512
 #, c-format
 msgid "Restore"
 msgstr "Taastamine"
 
-#: standalone/drakbackup:4600
+#: standalone/drakbackup:4277
 #, c-format
 msgid "The following packages need to be installed:\n"
 msgstr "Paigaldada tuleb järgmised paketid:\n"
 
-#: standalone/drakbackup:4622
+#: standalone/drakbackup:4304
 #, c-format
 msgid "Please select data to restore..."
 msgstr "Valige palun taastatavad andmed..."
 
-#: standalone/drakbackup:4662
+#: standalone/drakbackup:4344
 #, c-format
 msgid "Backup system files"
 msgstr "Süsteemsete failide varundamine"
 
-#: standalone/drakbackup:4665
+#: standalone/drakbackup:4347
 #, c-format
 msgid "Backup user files"
 msgstr "Kasutaja failide varundamine"
 
-#: standalone/drakbackup:4668
+#: standalone/drakbackup:4350
 #, c-format
 msgid "Backup other files"
 msgstr "Muude failide varundamine"
 
-#: standalone/drakbackup:4671 standalone/drakbackup:4707
+#: standalone/drakbackup:4353 standalone/drakbackup:4389
 #, c-format
 msgid "Total Progress"
 msgstr "Edenemine kokku"
 
-#: standalone/drakbackup:4699
+#: standalone/drakbackup:4381
 #, c-format
 msgid "Sending files by FTP"
 msgstr "Failide saatmine FTP vahendusel"
 
-#: standalone/drakbackup:4702
+#: standalone/drakbackup:4384
 #, c-format
 msgid "Sending files..."
 msgstr "Failide saatmine..."
 
-#: standalone/drakbackup:4772
+#: standalone/drakbackup:4455
 #, c-format
 msgid "Backup Now from configuration file"
 msgstr "Varunda seadistustefail kohe!"
 
-#: standalone/drakbackup:4777
+#: standalone/drakbackup:4460
 #, c-format
 msgid "View Backup Configuration."
 msgstr "Varundamise seadistuste vaatamine"
 
-#: standalone/drakbackup:4803
+#: standalone/drakbackup:4486
 #, c-format
 msgid "Wizard Configuration"
 msgstr "Nõustaja seadistused"
 
-#: standalone/drakbackup:4808
+#: standalone/drakbackup:4491
 #, c-format
 msgid "Advanced Configuration"
 msgstr "Muud seadistused"
 
-#: standalone/drakbackup:4813
+#: standalone/drakbackup:4496
 #, c-format
 msgid "View Configuration"
 msgstr "Seadistuse vaatamine"
 
-#: standalone/drakbackup:4817
+#: standalone/drakbackup:4500
 #, c-format
 msgid "View Last Log"
 msgstr "Viimase logi vaatamine"
 
-#: standalone/drakbackup:4822
+#: standalone/drakbackup:4505
 #, c-format
 msgid "Backup Now"
 msgstr "Varunda nüüd!"
 
-#: standalone/drakbackup:4826
+#: standalone/drakbackup:4509
 #, c-format
 msgid ""
 "No configuration file found \n"
@@ -18440,56 +18584,56 @@ msgstr ""
 "Seadistustefaili ei leitud, \n"
 "klõpsake palun nupul 'Nõustaja' või 'Muud'."
 
-#: standalone/drakbackup:4858 standalone/drakbackup:4865
+#: standalone/drakbackup:4530 standalone/drakbackup:4533
 #, c-format
 msgid "Drakbackup"
 msgstr "Drakbackup"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "Graphical boot theme selection"
 msgstr "Graafilise algkäivitusteema valik"
 
-#: standalone/drakboot:56
+#: standalone/drakboot:57
 #, c-format
 msgid "System mode"
 msgstr "Töömood"
 
-#: standalone/drakboot:66 standalone/drakfloppy:46 standalone/harddrake2:97
-#: standalone/harddrake2:98 standalone/logdrake:70 standalone/printerdrake:150
+#: standalone/drakboot:67 standalone/drakfloppy:46 standalone/harddrake2:97
+#: standalone/harddrake2:98 standalone/logdrake:71 standalone/printerdrake:150
 #: standalone/printerdrake:151 standalone/printerdrake:152
 #, c-format
 msgid "/_File"
 msgstr "/_Fail"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/logdrake:76
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/Fail/_Välju"
 
-#: standalone/drakboot:67 standalone/drakfloppy:47 standalone/harddrake2:98
-#: standalone/logdrake:76 standalone/printerdrake:152
+#: standalone/drakboot:68 standalone/drakfloppy:47 standalone/harddrake2:98
+#: standalone/logdrake:77 standalone/printerdrake:152
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: standalone/drakboot:118
+#: standalone/drakboot:119
 #, c-format
 msgid "Install themes"
 msgstr "Teemade paigaldamine"
 
-#: standalone/drakboot:119
+#: standalone/drakboot:120
 #, c-format
 msgid "Create new theme"
 msgstr "Uue teema loomine"
 
-#: standalone/drakboot:133
+#: standalone/drakboot:134
 #, c-format
 msgid "Use graphical boot"
 msgstr "Graafilise algkäivituse kasutamine"
 
-#: standalone/drakboot:138
-#, fuzzy, c-format
+#: standalone/drakboot:139
+#, c-format
 msgid ""
 "Your system bootloader is not in framebuffer mode. To activate graphical "
 "boot, select a graphic video mode from the bootloader configuration tool."
@@ -18497,12 +18641,12 @@ msgstr ""
 "Teie süsteemi alglaadur ei tööta konsooliresiimis. Graafilise alglaadimise "
 "kasutamiseks valige meelepärane resiim alglaaduri seadistusvahendiga."
 
-#: standalone/drakboot:145
+#: standalone/drakboot:146
 #, c-format
 msgid "Theme"
 msgstr "Teema"
 
-#: standalone/drakboot:147
+#: standalone/drakboot:149
 #, c-format
 msgid ""
 "Display theme\n"
@@ -18511,33 +18655,33 @@ msgstr ""
 "Teema näitamine\n"
 "konsoolis"
 
-#: standalone/drakboot:156
+#: standalone/drakboot:158
 #, c-format
 msgid "Launch the graphical environment when your system starts"
 msgstr "X Windows käivitatakse alglaadimisel"
 
-#: standalone/drakboot:164
+#: standalone/drakboot:166
+#, c-format
+msgid "No, I don't want autologin"
+msgstr "Ei taha automaatselt siseneda"
+
+#: standalone/drakboot:167
 #, c-format
 msgid "Yes, I want autologin with this (user, desktop)"
 msgstr ""
 "Jah, soovin automaatset sisselogimist sellele (kasutajale, keskkonnale)"
 
-#: standalone/drakboot:165
-#, c-format
-msgid "No, I don't want autologin"
-msgstr "Ei taha automaatselt siseneda"
-
-#: standalone/drakboot:171
+#: standalone/drakboot:173
 #, c-format
 msgid "Default user"
 msgstr "Vaikimisi kasutaja"
 
-#: standalone/drakboot:172
+#: standalone/drakboot:174
 #, c-format
 msgid "Default desktop"
 msgstr "Vaikimisi töölaud"
 
-#: standalone/drakboot:236
+#: standalone/drakboot:238
 #, c-format
 msgid "Installation of %s failed. The following error occured:"
 msgstr "%s paigaldamine ebaõnnestus. Tekkis järgmine viga:"
@@ -18635,7 +18779,7 @@ msgid ""
 "to Anthill where you will be able to upload the above information as a bug "
 "report."
 msgstr ""
-"Veateate edastamiseks vajutage nupule 'Raport'.\n"
+"Veateate edastamiseks vajutage nupule 'Vearaport'.\n"
 "See avab veebilehitseja akna Anthillis, kus saate ülal näidatud info "
 "veateatena edastada."
 
@@ -18792,12 +18936,12 @@ msgstr "Võrguajaprotokolli lubamine"
 msgid "Server:"
 msgstr "Server:"
 
-#: standalone/drakclock:125 standalone/drakclock:137
+#: standalone/drakclock:129 standalone/drakclock:141
 #, c-format
 msgid "Reset"
 msgstr "Lähtesta"
 
-#: standalone/drakclock:200
+#: standalone/drakclock:204
 #, c-format
 msgid ""
 "We need to install ntp package\n"
@@ -18810,214 +18954,203 @@ msgstr ""
 "\n"
 "Kas soovite ntp nüüd paigaldada?"
 
-#: standalone/drakconnect:78
+#: standalone/drakconnect:81
 #, c-format
 msgid "Network configuration (%d adapters)"
 msgstr "Võrguseadistused (%d liidest)"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Gateway:"
 msgstr "Vaikelüüs:"
 
-#: standalone/drakconnect:89 standalone/drakconnect:686
+#: standalone/drakconnect:92 standalone/drakconnect:728
 #, c-format
 msgid "Interface:"
 msgstr "Liides:"
 
-#: standalone/drakconnect:93 standalone/net_monitor:105
+#: standalone/drakconnect:96 standalone/net_monitor:105
 #, c-format
 msgid "Wait please"
 msgstr "Palun oodake"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "Interface"
 msgstr "Liides"
 
-#: standalone/drakconnect:113 standalone/drakconnect:502
-#: standalone/drakvpn:1136
-#, c-format
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116 standalone/drakups:233
 #, c-format
 msgid "Driver"
-msgstr "Juhtprogramm"
+msgstr "Draiver"
 
-#: standalone/drakconnect:113
+#: standalone/drakconnect:116
 #, c-format
 msgid "State"
 msgstr "Olek"
 
-#: standalone/drakconnect:130
+#: standalone/drakconnect:133
 #, c-format
 msgid "Hostname: "
 msgstr "Masinanimi: "
 
-#: standalone/drakconnect:132
+#: standalone/drakconnect:135
 #, c-format
 msgid "Configure hostname..."
 msgstr "Masinanime seadmine..."
 
-#: standalone/drakconnect:146 standalone/drakconnect:727
+#: standalone/drakconnect:149 standalone/drakconnect:769
 #, c-format
 msgid "LAN configuration"
 msgstr "LAN seadistused"
 
-#: standalone/drakconnect:151
+#: standalone/drakconnect:154
 #, c-format
 msgid "Configure Local Area Network..."
 msgstr "Kohtvõrgu (LAN) seadistamine..."
 
-#: standalone/drakconnect:159 standalone/drakconnect:228
-#: standalone/drakconnect:232
+#: standalone/drakconnect:162 standalone/drakconnect:237
+#: standalone/drakconnect:241
 #, c-format
 msgid "Apply"
 msgstr "Rakenda"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:283
-#: standalone/drakconnect:293 standalone/drakconnect:294
-#: standalone/drakconnect:540
+#: standalone/drakconnect:197
+#, c-format
+msgid "Manage connections"
+msgstr "Ühenduste haldamine"
+
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:298
+#: standalone/drakconnect:308 standalone/drakconnect:309
+#: standalone/drakconnect:576
 #, c-format
 msgid "TCP/IP"
 msgstr "TCP/IP"
 
-#: standalone/drakconnect:254 standalone/drakconnect:263
-#: standalone/drakconnect:277 standalone/drakconnect:421
-#: standalone/drakconnect:425 standalone/drakconnect:540
+#: standalone/drakconnect:263 standalone/drakconnect:272
+#: standalone/drakconnect:292 standalone/drakconnect:444
+#: standalone/drakconnect:448 standalone/drakconnect:576
 #, c-format
 msgid "Account"
 msgstr "Konto"
 
-#: standalone/drakconnect:283 standalone/drakconnect:347
-#: standalone/drakconnect:348 standalone/drakconnect:540
+#: standalone/drakconnect:298 standalone/drakconnect:370
+#: standalone/drakconnect:371 standalone/drakconnect:576
 #, c-format
 msgid "Wireless"
 msgstr "Traadita"
 
-#: standalone/drakconnect:325
+#: standalone/drakconnect:344
 #, c-format
 msgid "DNS servers"
 msgstr "Nimeserverid"
 
-#: standalone/drakconnect:332
+#: standalone/drakconnect:351
 #, c-format
 msgid "Search Domain"
 msgstr "Otsingudomeen"
 
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
 #, c-format
 msgid "static"
 msgstr "staatiline"
 
-#: standalone/drakconnect:338
+#: standalone/drakconnect:359
 #, c-format
-msgid "dhcp"
-msgstr "dhcp"
+msgid "DHCP"
+msgstr "DHCP"
 
-#: standalone/drakconnect:457
-#, fuzzy, c-format
+#: standalone/drakconnect:482
+#, c-format
 msgid "Flow control"
-msgstr "<control>S"
-
-#: standalone/drakconnect:458
-#, fuzzy, c-format
-msgid "Line termination"
-msgstr "Interneti tööjaam"
+msgstr "Vookontroll"
 
-#: standalone/drakconnect:463
+#: standalone/drakconnect:483
 #, c-format
-msgid "Tone dialing"
-msgstr ""
+msgid "Line termination"
+msgstr "Rea lõpp"
 
-#: standalone/drakconnect:463
+#: standalone/drakconnect:493
 #, c-format
-msgid "Pulse dialing"
-msgstr ""
-
-#: standalone/drakconnect:468
-#, fuzzy, c-format
 msgid "Use lock file"
-msgstr "Valige fail"
+msgstr "Kasutatakse lukustusfaili"
 
-#: standalone/drakconnect:471
-#, fuzzy, c-format
+#: standalone/drakconnect:496
+#, c-format
 msgid "Modem timeout"
-msgstr "Shelli aegumine"
+msgstr "Modemi aegumine"
 
-#: standalone/drakconnect:475
+#: standalone/drakconnect:500
 #, c-format
 msgid "Wait for dialup tone before dialing"
-msgstr ""
+msgstr "Enne valimist oodatakse tooni"
 
-#: standalone/drakconnect:478
-#, fuzzy, c-format
+#: standalone/drakconnect:503
+#, c-format
 msgid "Busy wait"
-msgstr "Kuveit"
+msgstr "Oodatakse kinnise tooni puhul"
 
-#: standalone/drakconnect:482
-#, fuzzy, c-format
+#: standalone/drakconnect:507
+#, c-format
 msgid "Modem sound"
-msgstr "Modem"
+msgstr "Modemi heli"
 
-#: standalone/drakconnect:483
-#, fuzzy, c-format
+#: standalone/drakconnect:508
+#, c-format
 msgid "Enable"
-msgstr "lubada"
+msgstr "Lubatud"
 
-#: standalone/drakconnect:483
-#, fuzzy, c-format
+#: standalone/drakconnect:508
+#, c-format
 msgid "Disable"
-msgstr "keelata"
+msgstr "Keelatud"
 
-#: standalone/drakconnect:522 standalone/harddrake2:58
+#: standalone/drakconnect:558 standalone/harddrake2:58
 #, c-format
 msgid "Media class"
 msgstr "Andmekandja klass"
 
-#: standalone/drakconnect:523 standalone/drakfloppy:140
+#: standalone/drakconnect:559 standalone/drakfloppy:140
 #, c-format
 msgid "Module name"
 msgstr "Mooduli nimi"
 
-#: standalone/drakconnect:524
+#: standalone/drakconnect:560
 #, c-format
 msgid "Mac Address"
 msgstr "MAC aadress"
 
-#: standalone/drakconnect:525 standalone/harddrake2:21
+#: standalone/drakconnect:561 standalone/harddrake2:21
 #, c-format
 msgid "Bus"
 msgstr "Siin"
 
-#: standalone/drakconnect:526 standalone/harddrake2:29
+#: standalone/drakconnect:562 standalone/harddrake2:29
 #, c-format
 msgid "Location on the bus"
 msgstr "Asukoht siinil"
 
-#: standalone/drakconnect:587
+#: standalone/drakconnect:632 standalone/drakgw:248 standalone/drakpxe:138
 #, c-format
 msgid ""
-"An unexpected error has happened:\n"
-"%s"
+"No ethernet network adapter has been detected on your system. Please run the "
+"hardware configuration tool."
 msgstr ""
-"Tekkis ootamatu viga:\n"
-"%s"
+"Ühtki võrgukaarti ei suudetud tuvastada. Palun kasutage selleks riistvara "
+"seadistajat."
 
-#: standalone/drakconnect:597
+#: standalone/drakconnect:638
 #, c-format
 msgid "Remove a network interface"
 msgstr "Eemalda võrguliides"
 
-#: standalone/drakconnect:601
+#: standalone/drakconnect:642
 #, c-format
 msgid "Select the network interface to remove:"
 msgstr "Valige eemaldatav võrguliides:"
 
-#: standalone/drakconnect:617
+#: standalone/drakconnect:656
 #, c-format
 msgid ""
 "An error occured while deleting the \"%s\" network interface:\n"
@@ -19028,53 +19161,53 @@ msgstr ""
 "\n"
 "%s"
 
-#: standalone/drakconnect:619
+#: standalone/drakconnect:658
 #, c-format
 msgid ""
 "Congratulations, the \"%s\" network interface has been succesfully deleted"
 msgstr "Õnnitlused: võrguliides \"%s\" on edukalt kustutatud"
 
-#: standalone/drakconnect:636
+#: standalone/drakconnect:675
 #, c-format
 msgid "No Ip"
 msgstr "IP puudub"
 
-#: standalone/drakconnect:637
+#: standalone/drakconnect:676
 #, c-format
 msgid "No Mask"
 msgstr "Mask puudub"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "up"
 msgstr "ühendatud"
 
-#: standalone/drakconnect:638 standalone/drakconnect:798
+#: standalone/drakconnect:677 standalone/drakconnect:840
 #, c-format
 msgid "down"
 msgstr "pole ühendatud"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Connected"
 msgstr "Ühendatud"
 
-#: standalone/drakconnect:677 standalone/net_monitor:415
+#: standalone/drakconnect:718 standalone/net_monitor:415
 #, c-format
 msgid "Not connected"
 msgstr "Ei ole ühendatud"
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Disconnect..."
 msgstr "Lahuta..."
 
-#: standalone/drakconnect:678
+#: standalone/drakconnect:720
 #, c-format
 msgid "Connect..."
 msgstr "Ühenda..."
 
-#: standalone/drakconnect:707
+#: standalone/drakconnect:749
 #, c-format
 msgid ""
 "Warning, another Internet connection has been detected, maybe using your "
@@ -19082,17 +19215,17 @@ msgid ""
 msgstr ""
 "Hoiatus, avastati veel üks Internetiühendus, mis võib-olla kasutab Teie võrku"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Deactivate now"
 msgstr "Peata nüüd"
 
-#: standalone/drakconnect:723
+#: standalone/drakconnect:765
 #, c-format
 msgid "Activate now"
 msgstr "Aktiveeri nüüd"
 
-#: standalone/drakconnect:731
+#: standalone/drakconnect:773
 #, c-format
 msgid ""
 "You don't have any configured interface.\n"
@@ -19101,27 +19234,27 @@ msgstr ""
 "Ühtegi liidest ei ole seadistatud.\n"
 "Esmalt tuleb need seadistada, klõpsake selleks nupul 'Seadista'"
 
-#: standalone/drakconnect:745
+#: standalone/drakconnect:787
 #, c-format
 msgid "LAN Configuration"
 msgstr "LAN seadistused"
 
-#: standalone/drakconnect:757
+#: standalone/drakconnect:799
 #, c-format
 msgid "Adapter %s: %s"
 msgstr "Võrgukaart %s: %s"
 
-#: standalone/drakconnect:766
+#: standalone/drakconnect:808
 #, c-format
 msgid "Boot Protocol"
 msgstr "Laadimisprotokoll"
 
-#: standalone/drakconnect:767
+#: standalone/drakconnect:809
 #, c-format
 msgid "Started on boot"
 msgstr "Käivitub laadimisel"
 
-#: standalone/drakconnect:803
+#: standalone/drakconnect:845
 #, c-format
 msgid ""
 "This interface has not been configured yet.\n"
@@ -19130,7 +19263,7 @@ msgstr ""
 "Seda liidest ei ole veel seadistatud.\n"
 "Käivitage Mandrake juhtimiskeskuses nõustaja \"Liidese lisamine\""
 
-#: standalone/drakconnect:858
+#: standalone/drakconnect:900
 #, c-format
 msgid ""
 "You don't have any configured Internet connection.\n"
@@ -19139,47 +19272,32 @@ msgstr ""
 "Te ei ole Internetiühendust veel seadistanud.\n"
 "Käivitage palun juhtimiskeskuse moodul 'Internetiühendus'."
 
-#: standalone/drakconnect:866
+#: standalone/drakconnect:908
 #, c-format
 msgid "Internet connection configuration"
 msgstr "Internetiühenduse seadistamine"
 
-#: standalone/drakconnect:907
-#, c-format
-msgid "Provider dns 1 (optional)"
-msgstr "DNS 1 (võib jätta tühjaks)"
-
-#: standalone/drakconnect:908
-#, c-format
-msgid "Provider dns 2 (optional)"
-msgstr "DNS 2 (võib jätta tühjaks)"
-
-#: standalone/drakconnect:921
+#: standalone/drakconnect:926
 #, c-format
-msgid "Ethernet Card"
-msgstr "Võrgukaart"
-
-#: standalone/drakconnect:922
-#, c-format
-msgid "DHCP Client"
-msgstr "DHCP klient"
+msgid "Third DNS server (optional)"
+msgstr "Kolmas nimeserver (pole kohustuslik)"
 
-#: standalone/drakconnect:951
+#: standalone/drakconnect:948
 #, c-format
 msgid "Internet Connection Configuration"
 msgstr "Internetiühenduse seadistamine"
 
-#: standalone/drakconnect:952
+#: standalone/drakconnect:949
 #, c-format
 msgid "Internet access"
 msgstr "Internetiühendus"
 
-#: standalone/drakconnect:954 standalone/net_monitor:87
+#: standalone/drakconnect:951 standalone/net_monitor:87
 #, c-format
 msgid "Connection type: "
 msgstr "Ühenduse tüüp: "
 
-#: standalone/drakconnect:957
+#: standalone/drakconnect:954
 #, c-format
 msgid "Status:"
 msgstr "Olek:"
@@ -19302,12 +19420,12 @@ msgstr "Fork ebaõnnestus: %s"
 #: standalone/drakfloppy:308
 #, c-format
 msgid "Floppy creation completed"
-msgstr "Flopi loomine lõpetatud"
+msgstr "Disketi loomine lõpetatud"
 
 #: standalone/drakfloppy:308
 #, c-format
 msgid "The creation of the boot floppy has been successfully completed \n"
-msgstr "Alglaadimisflopi loomine edukalt lõpetatud \n"
+msgstr "Alglaadimisdisketi loomine edukalt lõpetatud \n"
 
 #: standalone/drakfloppy:311
 #, c-format
@@ -19320,109 +19438,109 @@ msgstr ""
 "\n"
 "<span foreground=\"Red\"><tt>%s</tt></span>"
 
-#: standalone/drakfont:181
+#: standalone/drakfont:183
 #, c-format
 msgid "Search installed fonts"
 msgstr "Paigaldatud fontide otsimine"
 
-#: standalone/drakfont:183
+#: standalone/drakfont:185
 #, c-format
 msgid "Unselect fonts installed"
 msgstr "Paigaldatud fontide valiku tühistamine"
 
-#: standalone/drakfont:206
+#: standalone/drakfont:208
 #, c-format
 msgid "parse all fonts"
 msgstr "kõigi fontide parsimine"
 
-#: standalone/drakfont:208
+#: standalone/drakfont:210
 #, c-format
 msgid "No fonts found"
 msgstr "Fonte ei leitud"
 
-#: standalone/drakfont:216 standalone/drakfont:256 standalone/drakfont:323
-#: standalone/drakfont:356 standalone/drakfont:364 standalone/drakfont:390
-#: standalone/drakfont:408 standalone/drakfont:422
+#: standalone/drakfont:218 standalone/drakfont:258 standalone/drakfont:325
+#: standalone/drakfont:358 standalone/drakfont:366 standalone/drakfont:392
+#: standalone/drakfont:410 standalone/drakfont:424
 #, c-format
 msgid "done"
 msgstr "tehtud"
 
-#: standalone/drakfont:221
+#: standalone/drakfont:223
 #, c-format
 msgid "Could not find any font in your mounted partitions"
 msgstr "Haagitud partitsioonidel ei leitud ühtegi fonti"
 
-#: standalone/drakfont:254
+#: standalone/drakfont:256
 #, c-format
 msgid "Reselect correct fonts"
 msgstr "Korrektsete fontide uuestivalimine"
 
-#: standalone/drakfont:257
+#: standalone/drakfont:259
 #, c-format
 msgid "Could not find any font.\n"
 msgstr "Ei õnnestunud fonte leida.\n"
 
-#: standalone/drakfont:267
+#: standalone/drakfont:269
 #, c-format
 msgid "Search for fonts in installed list"
 msgstr "Fontide otsing paigaldatute loendis"
 
-#: standalone/drakfont:292
+#: standalone/drakfont:294
 #, c-format
 msgid "%s fonts conversion"
 msgstr "%s fontide teisendamine"
 
-#: standalone/drakfont:321
+#: standalone/drakfont:323
 #, c-format
 msgid "Fonts copy"
 msgstr "Fontide kopeerimine"
 
-#: standalone/drakfont:324
+#: standalone/drakfont:326
 #, c-format
 msgid "True Type fonts installation"
 msgstr "TrueType fontide paigaldamine"
 
-#: standalone/drakfont:331
+#: standalone/drakfont:333
 #, c-format
 msgid "please wait during ttmkfdir..."
 msgstr "palun oodake, käib ttmkdir..."
 
-#: standalone/drakfont:332
+#: standalone/drakfont:334
 #, c-format
 msgid "True Type install done"
 msgstr "TrueType paigaldus tehtud"
 
-#: standalone/drakfont:338 standalone/drakfont:353
+#: standalone/drakfont:340 standalone/drakfont:355
 #, c-format
 msgid "type1inst building"
 msgstr "type1inst loomine"
 
-#: standalone/drakfont:347
+#: standalone/drakfont:349
 #, c-format
 msgid "Ghostscript referencing"
 msgstr "Ghostcsripti määratlused"
 
-#: standalone/drakfont:357
+#: standalone/drakfont:359
 #, c-format
 msgid "Suppress Temporary Files"
 msgstr "Ajutiste failide kustutamine"
 
-#: standalone/drakfont:360
+#: standalone/drakfont:362
 #, c-format
 msgid "Restart XFS"
 msgstr "XFS taaskäivitamine"
 
-#: standalone/drakfont:406 standalone/drakfont:416
+#: standalone/drakfont:408 standalone/drakfont:418
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "Fondifailide kustutamine"
 
-#: standalone/drakfont:418
+#: standalone/drakfont:420
 #, c-format
 msgid "xfs restart"
 msgstr "xfs taaskäivitamine"
 
-#: standalone/drakfont:426
+#: standalone/drakfont:428
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19437,32 +19555,32 @@ msgstr ""
 "Fonte saab paigaldada normaalsel meetodil. Haruharva võivad vigased fondid "
 "panna küll X-serveri hanguma."
 
-#: standalone/drakfont:474 standalone/drakfont:483
+#: standalone/drakfont:477 standalone/drakfont:486
 #, c-format
 msgid "DrakFont"
 msgstr "DrakFont"
 
-#: standalone/drakfont:484
+#: standalone/drakfont:487
 #, c-format
 msgid "Font List"
 msgstr "Fontide loend"
 
-#: standalone/drakfont:490
+#: standalone/drakfont:493
 #, c-format
 msgid "About"
 msgstr "Misvärk"
 
-#: standalone/drakfont:492 standalone/drakfont:681 standalone/drakfont:719
+#: standalone/drakfont:495 standalone/drakfont:687 standalone/drakfont:725
 #, c-format
 msgid "Uninstall"
 msgstr "Eemalda"
 
-#: standalone/drakfont:493
+#: standalone/drakfont:496
 #, c-format
 msgid "Import"
 msgstr "Import"
 
-#: standalone/drakfont:509
+#: standalone/drakfont:512
 #, c-format
 msgid ""
 "Copyright (C) 2001-2002 by MandrakeSoft \n"
@@ -19483,7 +19601,7 @@ msgstr ""
 "\n"
 "       VIGNAUD Thierry <tvignaud@mandrakesoft.com>"
 
-#: standalone/drakfont:518
+#: standalone/drakfont:521
 #, c-format
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
@@ -19519,7 +19637,7 @@ msgstr ""
 "Free Software Foundation, 59 Temple Place - Suite 330, Boston,\n"
 "MA 02111-1307, USA."
 
-#: standalone/drakfont:534
+#: standalone/drakfont:537
 #, c-format
 msgid ""
 "Thanks:\n"
@@ -19550,12 +19668,12 @@ msgstr ""
 "\t  autorid: Andrew Weeks, Frank Siegert, Thomas Henlich, Sergei Babkin  \n"
 "             teisendab ttf-fondifailid afm- ja pfb-fontideks\n"
 
-#: standalone/drakfont:553
+#: standalone/drakfont:556
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "Valige rakendused, millel on fontide tugi:"
 
-#: standalone/drakfont:554
+#: standalone/drakfont:557
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -19570,195 +19688,195 @@ msgstr ""
 "Fonte saab paigaldada normaalsel meetodil. Haruharva võivad vigased fondid "
 "panna küll X-serveri hanguma."
 
-#: standalone/drakfont:564
+#: standalone/drakfont:567
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: standalone/drakfont:565
+#: standalone/drakfont:568
 #, c-format
 msgid "StarOffice"
 msgstr "StarOffice"
 
-#: standalone/drakfont:566
+#: standalone/drakfont:569
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: standalone/drakfont:567
+#: standalone/drakfont:570
 #, c-format
 msgid "Generic Printers"
 msgstr "Tavalised printerid"
 
-#: standalone/drakfont:583
+#: standalone/drakfont:586
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "Valige fondifail või kataloog ja klõpsake 'Lisa'"
 
-#: standalone/drakfont:597
+#: standalone/drakfont:587
+#, c-format
+msgid "File Selection"
+msgstr "Failivalik"
+
+#: standalone/drakfont:600
 #, c-format
 msgid "You've not selected any font"
 msgstr "Ühtegi fonti ei ole valitud!"
 
-#: standalone/drakfont:646
+#: standalone/drakfont:652
 #, c-format
 msgid "Import fonts"
 msgstr "Fontide importimine"
 
-#: standalone/drakfont:651
+#: standalone/drakfont:657
 #, c-format
 msgid "Install fonts"
 msgstr "Fontide paigaldamine"
 
-#: standalone/drakfont:686
+#: standalone/drakfont:692
 #, c-format
 msgid "click here if you are sure."
 msgstr "kui olete kindel, klõpsake siia."
 
-#: standalone/drakfont:688
+#: standalone/drakfont:694
 #, c-format
 msgid "here if no."
 msgstr "kui mitte, siis siia."
 
-#: standalone/drakfont:727
+#: standalone/drakfont:733
 #, c-format
 msgid "Unselected All"
 msgstr "Tühista kõigi valimine"
 
-#: standalone/drakfont:730
+#: standalone/drakfont:736
 #, c-format
 msgid "Selected All"
 msgstr "Kõigi valimine"
 
-#: standalone/drakfont:733
+#: standalone/drakfont:739
 #, c-format
 msgid "Remove List"
 msgstr "Eemalda loend"
 
-#: standalone/drakfont:744 standalone/drakfont:763
+#: standalone/drakfont:750 standalone/drakfont:769
 #, c-format
 msgid "Importing fonts"
 msgstr "Fontide importimine"
 
-#: standalone/drakfont:748 standalone/drakfont:768
+#: standalone/drakfont:754 standalone/drakfont:774
 #, c-format
 msgid "Initial tests"
 msgstr "Käivitustestid"
 
-#: standalone/drakfont:749
+#: standalone/drakfont:755
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "Fontide kopeerimine Teie süsteemi"
 
-#: standalone/drakfont:750
+#: standalone/drakfont:756
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "Fontide paigaldamine ja teisendamine"
 
-#: standalone/drakfont:751
+#: standalone/drakfont:757
 #, c-format
 msgid "Post Install"
 msgstr "Paigaldusjärgsed seadistused"
 
-#: standalone/drakfont:769
+#: standalone/drakfont:775
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "Fontide eemaldamine Teie süsteemist"
 
-#: standalone/drakfont:770
+#: standalone/drakfont:776
 #, c-format
 msgid "Post Uninstall"
 msgstr "Eemaldamisjärgsed seadistused"
 
-#: standalone/drakgw:59 standalone/drakgw:190
+#: standalone/drakgw:58 standalone/drakgw:193
 #, c-format
 msgid "Internet Connection Sharing"
 msgstr "Internetiühenduse jagamine"
 
-#: standalone/drakgw:117 standalone/drakvpn:49
-#, c-format
-msgid "Sorry, we support only 2.4 and above kernels."
-msgstr "Vabandust, me toetame ainult 2.4 ja uuemaid kerneleid."
-
-#: standalone/drakgw:128
+#: standalone/drakgw:124
 #, c-format
-msgid "Internet Connection Sharing currently enabled"
-msgstr "Internetiühenduse jagamine on lubatud"
+msgid "Internet Connection Sharing currently disabled"
+msgstr "Internetiühendust hetkel ei jagata"
 
-#: standalone/drakgw:129
+#: standalone/drakgw:125
 #, c-format
 msgid ""
-"The setup of Internet Connection Sharing has already been done.\n"
-"It's currently enabled.\n"
+"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\n"
-"ja hetkel ka lubatud.\n"
+"Internetiühenduse jagamine on juba seadistatud,\n"
+"aga hetkel on see keelatud.\n"
 "\n"
 "Mida soovite ette võtta?"
 
-#: standalone/drakgw:133 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakvpn:125
 #, c-format
-msgid "disable"
-msgstr "keelata"
+msgid "enable"
+msgstr "lubada"
 
-#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:99
+#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99
 #: standalone/drakvpn:125
 #, c-format
 msgid "reconfigure"
 msgstr "uuesti seadistada"
 
-#: standalone/drakgw:133 standalone/drakgw:162 standalone/drakvpn:99
-#: standalone/drakvpn:125 standalone/drakvpn:372 standalone/drakvpn:731
+#: standalone/drakgw:129 standalone/drakgw:156 standalone/drakvpn:99
+#: standalone/drakvpn:125 standalone/drakvpn:374 standalone/drakvpn:733
 #, c-format
 msgid "dismiss"
 msgstr "tühistada"
 
 #: standalone/drakgw:136
 #, c-format
-msgid "Disabling servers..."
-msgstr "Serverite peatamine..."
+msgid "Enabling servers..."
+msgstr "Serverite käivitamine..."
 
-#: standalone/drakgw:150
+#: standalone/drakgw:148
 #, c-format
-msgid "Internet Connection Sharing is now disabled."
-msgstr "Internetiühendust nüüd enam ei jagata."
+msgid "Internet Connection Sharing is now enabled."
+msgstr "Internetiühenduse jagamine on nüüd lubatud."
 
-#: standalone/drakgw:157
+#: standalone/drakgw:151
 #, c-format
-msgid "Internet Connection Sharing currently disabled"
-msgstr "Internetiühendust hetkel ei jagata"
+msgid "Internet Connection Sharing currently enabled"
+msgstr "Internetiühenduse jagamine on lubatud"
 
-#: standalone/drakgw:158
+#: standalone/drakgw:152
 #, c-format
 msgid ""
-"The setup of Internet connection sharing has already been done.\n"
-"It's currently disabled.\n"
+"The setup of Internet Connection Sharing has already been done.\n"
+"It's currently enabled.\n"
 "\n"
 "What would you like to do?"
 msgstr ""
-"Internetiühenduse jagamine on juba seadistatud,\n"
-"aga hetkel on see keelatud.\n"
+"Internetiühenduse jagamine on juba seadistatud\n"
+"ja hetkel ka lubatud.\n"
 "\n"
 "Mida soovite ette võtta?"
 
-#: standalone/drakgw:162 standalone/drakvpn:125
+#: standalone/drakgw:156 standalone/drakvpn:99
 #, c-format
-msgid "enable"
-msgstr "lubada"
+msgid "disable"
+msgstr "keelata"
 
-#: standalone/drakgw:169
+#: standalone/drakgw:159
 #, c-format
-msgid "Enabling servers..."
-msgstr "Serverite käivitamine..."
+msgid "Disabling servers..."
+msgstr "Serverite peatamine..."
 
-#: standalone/drakgw:175
+#: standalone/drakgw:174
 #, c-format
-msgid "Internet Connection Sharing is now enabled."
-msgstr "Internetiühenduse jagamine on nüüd lubatud."
+msgid "Internet Connection Sharing is now disabled."
+msgstr "Internetiühendust nüüd enam ei jagata."
 
-#: standalone/drakgw:191
+#: standalone/drakgw:194
 #, c-format
 msgid ""
 "You are about to configure your computer to share its Internet connection.\n"
@@ -19780,48 +19898,27 @@ msgstr ""
 "\n"
 "Märkus: kohtvõrgu (LAN) jaoks on vajalik eraldi võrgukaardi olemasolu."
 
-#: standalone/drakgw:211 standalone/drakvpn:210
-#, c-format
-msgid ""
-"Please enter the name of the interface connected to the internet.\n"
-"\n"
-"Examples:\n"
-"\t\tppp+ for modem or DSL connections, \n"
-"\t\teth0, or eth1 for cable connection, \n"
-"\t\tippp+ for a isdn connection.\n"
-msgstr ""
-"Palun sisestage Internetiühenduseks kasutatava seadme nimi.\n"
-"\n"
-"Näited:\n"
-"\t\tppp+ modemi- või DSL ühenduse korral. \n"
-"\t\teth0 või eth1 kaabliühenduse korral, \n"
-"\t\tippp+ ISDN ühenduse korral.\n"
-
-#: standalone/drakgw:230
+#: standalone/drakgw:237
 #, c-format
 msgid "Interface %s (using module %s)"
 msgstr "Liides %s (kasutab moodulit %s)"
 
-#: standalone/drakgw:231
+#: standalone/drakgw:238
 #, c-format
 msgid "Interface %s"
 msgstr "Liides %s"
 
-#: standalone/drakgw:241 standalone/drakpxe:138
+#: standalone/drakgw:247 standalone/drakpxe:137
 #, c-format
-msgid ""
-"No ethernet network adapter has been detected on your system. Please run the "
-"hardware configuration tool."
-msgstr ""
-"Ühtki võrgukaarti ei suudetud tuvastada. Palun kasutage selleks riistvara "
-"seadistajat."
+msgid "No network adapter on your system!"
+msgstr "Teie süsteemis ei ole võrgukaarti!"
 
-#: standalone/drakgw:247
+#: standalone/drakgw:254
 #, c-format
 msgid "Network interface"
 msgstr "Võrguliides"
 
-#: standalone/drakgw:248
+#: standalone/drakgw:255
 #, c-format
 msgid ""
 "There is only one configured network adapter on your system:\n"
@@ -19836,19 +19933,19 @@ msgstr ""
 "\n"
 "Kohtvõrgu seadistused seotakse selle liidesega."
 
-#: standalone/drakgw:255
+#: standalone/drakgw:262
 #, c-format
 msgid ""
 "Please choose what network adapter will be connected to your Local Area "
 "Network."
 msgstr "Palun valige, millist võrguliidest soovite kasutada kohtvõrgu jaoks."
 
-#: standalone/drakgw:283
+#: standalone/drakgw:291
 #, c-format
 msgid "Network interface already configured"
 msgstr "Võrguliides on juba seadistatud"
 
-#: standalone/drakgw:284
+#: standalone/drakgw:292
 #, c-format
 msgid ""
 "Warning, the network adapter (%s) is already configured.\n"
@@ -19863,27 +19960,27 @@ msgstr ""
 "\n"
 "Seda saab teha ka käsitsi, aga siis peate kindlasti teadma, mida teete."
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "Automatic reconfiguration"
 msgstr "Automaatne ümberseadistamine"
 
-#: standalone/drakgw:289
+#: standalone/drakgw:297
 #, c-format
 msgid "No (experts only)"
 msgstr "Ei (ainult eksperdile)"
 
-#: standalone/drakgw:290
+#: standalone/drakgw:298
 #, c-format
 msgid "Show current interface configuration"
 msgstr "Liidese praeguste seadistuste näitamine"
 
-#: standalone/drakgw:291
+#: standalone/drakgw:299
 #, c-format
 msgid "Current interface configuration"
 msgstr "Liidese praegune seadistus"
 
-#: standalone/drakgw:292
+#: standalone/drakgw:300
 #, c-format
 msgid ""
 "Current configuration of `%s':\n"
@@ -19898,9 +19995,9 @@ msgstr ""
 "Võrk: %s\n"
 "IP aadress: %s\n"
 "IP omistamine: %s\n"
-"Juhtprogramm: %s"
+"Draiver: %s"
 
-#: standalone/drakgw:305
+#: standalone/drakgw:313
 #, c-format
 msgid ""
 "I can keep your current configuration and assume you already set up a DHCP "
@@ -19927,12 +20024,12 @@ msgstr ""
 "DHCP server.\n"
 "\n"
 
-#: standalone/drakgw:312
+#: standalone/drakgw:320
 #, c-format
 msgid "Local Network adress"
 msgstr "Kohtvõrgu aadress"
 
-#: standalone/drakgw:316
+#: standalone/drakgw:324
 #, c-format
 msgid ""
 "DHCP Server Configuration.\n"
@@ -19945,72 +20042,72 @@ msgstr ""
 "Siin saab valida erinevaid võimalusi DHCP serveri seadistustele.\n"
 "Kui te ei tea mõne valiku tähendust, jätke see puutumata."
 
-#: standalone/drakgw:320
+#: standalone/drakgw:328
 #, c-format
 msgid "(This) DHCP Server IP"
 msgstr "(Selle) DHCP serveri IP"
 
-#: standalone/drakgw:321
+#: standalone/drakgw:329
 #, c-format
 msgid "The DNS Server IP"
 msgstr "Nimeserveri IP"
 
-#: standalone/drakgw:322
+#: standalone/drakgw:330
 #, c-format
 msgid "The internal domain name"
 msgstr "Sisemine domeeninimi"
 
-#: standalone/drakgw:323
+#: standalone/drakgw:331
 #, c-format
 msgid "The DHCP start range"
 msgstr "DHCP vahemiku algus"
 
-#: standalone/drakgw:324
+#: standalone/drakgw:332
 #, c-format
 msgid "The DHCP end range"
 msgstr "DHCP vahemiku lõpp"
 
-#: standalone/drakgw:325
+#: standalone/drakgw:333
 #, c-format
 msgid "The default lease (in seconds)"
 msgstr "Rendiaeg vaikimisi (sekundites)"
 
-#: standalone/drakgw:326
+#: standalone/drakgw:334
 #, c-format
 msgid "The maximum lease (in seconds)"
 msgstr "Maksimaalne rendiaeg (sekundites)"
 
-#: standalone/drakgw:327
+#: standalone/drakgw:335
 #, c-format
 msgid "Re-configure interface and DHCP server"
 msgstr "Liidese ja DHCP serveri ümberseadistamine"
 
-#: standalone/drakgw:334
+#: standalone/drakgw:342
 #, c-format
 msgid "The Local Network did not finish with `.0', bailing out."
 msgstr "Kohtvõrgu lõpus ei seisa '0', visatakse minema."
 
-#: standalone/drakgw:344
+#: standalone/drakgw:352
 #, c-format
 msgid "Potential LAN address conflict found in current config of %s!\n"
 msgstr "Võimalik kohtvõrgu aadressi konflikt %s seadistuses!\n"
 
-#: standalone/drakgw:354
+#: standalone/drakgw:362
 #, c-format
 msgid "Configuring..."
 msgstr "Seadistamine..."
 
-#: standalone/drakgw:355
+#: standalone/drakgw:363
 #, c-format
 msgid "Configuring scripts, installing software, starting servers..."
 msgstr "Häälestan skriptid, paigaldan tarkvara, käivitan serverid..."
 
-#: standalone/drakgw:391 standalone/drakpxe:231 standalone/drakvpn:274
+#: standalone/drakgw:399 standalone/drakpxe:231 standalone/drakvpn:276
 #, c-format
 msgid "Problems installing package %s"
 msgstr "Probleemid paketi %s paigaldamisel"
 
-#: standalone/drakgw:584
+#: standalone/drakgw:595
 #, c-format
 msgid ""
 "Everything has been configured.\n"
@@ -20098,7 +20195,7 @@ msgstr "Isetehtud ja süsteemsed seadistused"
 msgid "Editable"
 msgstr "Redigeeritav"
 
-#: standalone/drakperm:48 standalone/drakperm:315
+#: standalone/drakperm:48 standalone/drakperm:314
 #, c-format
 msgid "Path"
 msgstr "Asukoht"
@@ -20113,7 +20210,7 @@ msgstr "Kasutaja"
 msgid "Group"
 msgstr "Grupp"
 
-#: standalone/drakperm:48 standalone/drakperm:327
+#: standalone/drakperm:48 standalone/drakperm:326
 #, c-format
 msgid "Permissions"
 msgstr "Õigused"
@@ -20172,7 +20269,8 @@ msgstr "Uue reegli lisamine lõppu"
 msgid "Delete selected rule"
 msgstr "Kustuta valitud reegel"
 
-#: standalone/drakperm:125 standalone/drakvpn:329 standalone/drakvpn:690
+#: standalone/drakperm:125 standalone/drakups:281 standalone/drakups:330
+#: standalone/drakups:350 standalone/drakvpn:331 standalone/drakvpn:692
 #: standalone/printerdrake:229
 #, c-format
 msgid "Edit"
@@ -20272,12 +20370,12 @@ msgstr "Praegune kasutaja"
 msgid "When checked, owner and group won't be changed"
 msgstr "Märkimise korral ei muudeta omanikku ja gruppi"
 
-#: standalone/drakperm:301
+#: standalone/drakperm:300
 #, c-format
 msgid "Path selection"
 msgstr "Asukoha valik"
 
-#: standalone/drakperm:321
+#: standalone/drakperm:320
 #, c-format
 msgid "Property"
 msgstr "Omadus"
@@ -20364,7 +20462,7 @@ msgid ""
 msgstr ""
 "Andke palun paigalduslaadefaili asukoht.\n"
 "\n"
-"Kui Teil säherdust kataloogi ei ole, kopeerige palun CD või DVD sisu.\n"
+"Kui Teil sellist kataloogi ei ole, kopeerige palun CD või DVD sisu.\n"
 "\n"
 
 #: standalone/drakpxe:192
@@ -20413,7 +20511,7 @@ msgstr "KÕIK"
 msgid "LOCAL"
 msgstr "KOHALIK"
 
-#: standalone/draksec:44
+#: standalone/draksec:44 standalone/drakvpn:1144
 #, c-format
 msgid "default"
 msgstr "vaikimisi"
@@ -20433,7 +20531,7 @@ msgstr "ei"
 msgid "yes"
 msgstr "jah"
 
-#: standalone/draksec:70
+#: standalone/draksec:81
 #, c-format
 msgid ""
 "Here, you can setup the security level and administrator of your machine.\n"
@@ -20520,32 +20618,32 @@ msgstr ""
 "tasemele, ainult et süsteem on täiesti suletud ja turvaseadistused\n"
 "maksimumi peale keeratud."
 
-#: standalone/draksec:118
+#: standalone/draksec:129
 #, c-format
 msgid "(default value: %s)"
 msgstr "(vaikeväärtus: %s)"
 
-#: standalone/draksec:159
+#: standalone/draksec:170
 #, c-format
 msgid "Security Level:"
 msgstr "Turvatase:"
 
-#: standalone/draksec:162
+#: standalone/draksec:173
 #, c-format
 msgid "Security Alerts:"
 msgstr "Turvahoiatused:"
 
-#: standalone/draksec:166
+#: standalone/draksec:177
 #, c-format
 msgid "Security Administrator:"
 msgstr "Turvaadministraator:"
 
-#: standalone/draksec:168
+#: standalone/draksec:179
 #, c-format
 msgid "Basic options"
 msgstr "Põhiseadistused"
 
-#: standalone/draksec:181
+#: standalone/draksec:192
 #, c-format
 msgid ""
 "The following options can be set to customize your\n"
@@ -20554,27 +20652,27 @@ msgstr ""
 "Süsteemi turvalisuse kohandamiseks saab seadistada\n"
 "järgmisi parameetreid. Seletuste saamiseks vaadake abivihjeid.\n"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "Network Options"
 msgstr "Võrguparameetrid"
 
-#: standalone/draksec:183
+#: standalone/draksec:194
 #, c-format
 msgid "System Options"
 msgstr "Süsteemi parameetrid"
 
-#: standalone/draksec:229
+#: standalone/draksec:240
 #, c-format
 msgid "Periodic Checks"
 msgstr "Perioodiline kontroll"
 
-#: standalone/draksec:247
+#: standalone/draksec:258
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "Palun oodake, kehtestan turvataseme..."
 
-#: standalone/draksec:253
+#: standalone/draksec:264
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "Palun oodake, kehtestan turvaparameetrid..."
@@ -20630,37 +20728,37 @@ msgstr ""
 "Klõpsake \"Olgu\" paketi 'ImageMagick' paigaldamiseks\n"
 "või \"Loobu\" väljumiseks."
 
-#: standalone/draksplash:67
+#: standalone/draksplash:68
 #, c-format
 msgid "first step creation"
 msgstr "esimene samm loomine"
 
-#: standalone/draksplash:70
+#: standalone/draksplash:71
 #, c-format
 msgid "final resolution"
 msgstr "lõplik kuvatihedus"
 
-#: standalone/draksplash:71 standalone/draksplash:165
+#: standalone/draksplash:72
 #, c-format
 msgid "choose image file"
 msgstr "valige pildifail"
 
-#: standalone/draksplash:72
+#: standalone/draksplash:73
 #, c-format
 msgid "Theme name"
 msgstr "Teema nimi"
 
-#: standalone/draksplash:77
+#: standalone/draksplash:78
 #, c-format
 msgid "Browse"
 msgstr "Lehitse"
 
-#: standalone/draksplash:87 standalone/draksplash:153
+#: standalone/draksplash:93 standalone/draksplash:158
 #, c-format
 msgid "Configure bootsplash picture"
 msgstr "Käivituslogo pildi seadistamine"
 
-#: standalone/draksplash:90
+#: standalone/draksplash:96
 #, c-format
 msgid ""
 "x coordinate of text box\n"
@@ -20669,7 +20767,7 @@ msgstr ""
 "tekstikasti x-koordinaat\n"
 "arvulises väljenduses"
 
-#: standalone/draksplash:91
+#: standalone/draksplash:97
 #, c-format
 msgid ""
 "y coordinate of text box\n"
@@ -20678,17 +20776,17 @@ msgstr ""
 "tekstikasti y-koordinaat\n"
 "arvulises väljenduses"
 
-#: standalone/draksplash:92
+#: standalone/draksplash:98
 #, c-format
 msgid "text width"
 msgstr "teksti laius"
 
-#: standalone/draksplash:93
+#: standalone/draksplash:99
 #, c-format
 msgid "text box height"
 msgstr "tekstikasti kõrgus"
 
-#: standalone/draksplash:94
+#: standalone/draksplash:100
 #, c-format
 msgid ""
 "the progress bar x coordinate\n"
@@ -20697,7 +20795,7 @@ msgstr ""
 "edenemisriba ülemise vasaku\n"
 "nurga x-koordinaat"
 
-#: standalone/draksplash:95
+#: standalone/draksplash:101
 #, c-format
 msgid ""
 "the progress bar y coordinate\n"
@@ -20706,87 +20804,255 @@ msgstr ""
 "edenemisriba ülemise vasaku\n"
 "nurga y-koordinaat"
 
-#: standalone/draksplash:96
+#: standalone/draksplash:102
 #, c-format
 msgid "the width of the progress bar"
 msgstr "edenemisriba laius"
 
-#: standalone/draksplash:97
+#: standalone/draksplash:103
 #, c-format
 msgid "the height of the progress bar"
 msgstr "edenemisriba kõrgus"
 
-#: standalone/draksplash:98
+#: standalone/draksplash:104
 #, c-format
 msgid "the color of the progress bar"
 msgstr "edenemisriba värv"
 
-#: standalone/draksplash:113
+#: standalone/draksplash:119
 #, c-format
 msgid "Preview"
 msgstr "Eelvaatlus"
 
-#: standalone/draksplash:115
+#: standalone/draksplash:121
 #, c-format
 msgid "Save theme"
 msgstr "Teema salvestamine"
 
-#: standalone/draksplash:116
+#: standalone/draksplash:122
 #, c-format
 msgid "Choose color"
 msgstr "Värvi valimine"
 
-#: standalone/draksplash:119
+#: standalone/draksplash:125
 #, c-format
 msgid "Display logo on Console"
 msgstr "Logo näitamine konsoolil"
 
-#: standalone/draksplash:120
+#: standalone/draksplash:126
 #, c-format
 msgid "Make kernel message quiet by default"
 msgstr "Vaikimisi kerneli sõnumi keelamine"
 
-#: standalone/draksplash:156 standalone/draksplash:320
-#: standalone/draksplash:448
+#: standalone/draksplash:161 standalone/draksplash:319
+#: standalone/draksplash:462
 #, c-format
 msgid "Notice"
 msgstr "Märguanne"
 
-#: standalone/draksplash:156 standalone/draksplash:320
+#: standalone/draksplash:161 standalone/draksplash:319
 #, c-format
 msgid "This theme does not yet have a bootsplash in %s !"
 msgstr "Sellel teemal ei ole veel ühtegi käivituslogo %s!"
 
-#: standalone/draksplash:162
+#: standalone/draksplash:167
 #, c-format
 msgid "choose image"
 msgstr "valige pilt"
 
-#: standalone/draksplash:204
+#: standalone/draksplash:209
 #, c-format
 msgid "saving Bootsplash theme..."
 msgstr "Käivituslogo teema salvestamine..."
 
-#: standalone/draksplash:428
+#: standalone/draksplash:443
 #, c-format
 msgid "ProgressBar color selection"
 msgstr "Edenemisriba värvi valimine"
 
-#: standalone/draksplash:448
+#: standalone/draksplash:462
 #, c-format
 msgid "You must choose an image file first!"
 msgstr "Esmalt tuleb valida pildifail!"
 
-#: standalone/draksplash:453
+#: standalone/draksplash:467
 #, c-format
 msgid "Generating preview ..."
 msgstr "Eelvaatluse tekitamine ..."
 
-#: standalone/draksplash:499
+#: standalone/draksplash:512
 #, c-format
 msgid "%s BootSplash (%s) preview"
 msgstr "%s käivituslogo (%s) eelvaatlus"
 
+#: standalone/drakups:63
+#, c-format
+msgid "Connected through a serial port or an usb cable"
+msgstr "Ühendatud jadaporti või USB porti"
+
+#: standalone/drakups:69
+#, c-format
+msgid "Add an UPS device"
+msgstr "UPS-i lisamine"
+
+#: standalone/drakups:72
+#, c-format
+msgid ""
+"Welcome to the UPS configuration utility.\n"
+"\n"
+"Here, you'll be add a new UPS to your system.\n"
+msgstr ""
+"UPS-i seadistamise vahend.\n"
+"\n"
+"Siin saab lisada süsteemi uue UPS-i.\n"
+
+#: standalone/drakups:79
+#, c-format
+msgid ""
+"We're going to add an UPS device.\n"
+"\n"
+"Do you prefer autodetect UPS devices connected to this machine or  ?"
+msgstr ""
+"Nüüd hakkame lisama UPS-i.\n"
+"\n"
+"Kas eelistate lasta automaatselt tuvastada arvutiga ühendatud UPS-i?"
+
+#: standalone/drakups:82
+#, c-format
+msgid "Autodetection"
+msgstr "Automaattuvastus"
+
+#: standalone/drakups:90 standalone/harddrake2:134
+#, c-format
+msgid "Detection in progress"
+msgstr "Toimub tuvastamine..."
+
+#: standalone/drakups:108 standalone/drakups:144 standalone/logdrake:479
+#: standalone/logdrake:485
+#, c-format
+msgid "Congratulations"
+msgstr "Õnnitleme!"
+
+#: standalone/drakups:109
+#, c-format
+msgid "The wizard successfully added the following UPS devices:"
+msgstr "Nõustaja lisas edukalt järgmised UPS-id:"
+
+#: standalone/drakups:111
+#, c-format
+msgid "No new UPS devices was found"
+msgstr "Ühtegi UPS-i ei leitud!"
+
+#: standalone/drakups:116 standalone/drakups:128
+#, c-format
+msgid "UPS driver configuration"
+msgstr "UPS-i draiveri seadistused"
+
+#: standalone/drakups:116
+#, c-format
+msgid "Please select your UPS model."
+msgstr "Palun valige oma UPS-i mudel."
+
+#: standalone/drakups:117
+#, c-format
+msgid "Manufacturer / Model:"
+msgstr "Tootja / mudel:"
+
+#: standalone/drakups:128
+#, c-format
+msgid ""
+"We are configuring the \"%s\" UPS from \"%s\".\n"
+"Please fill in its name, its driver and its port."
+msgstr ""
+"Nüüd asume seadistama \"%s\" UPS-i, mille tootja on \"%s\".\n"
+"Palun määrake selle nimi, draiver ja port."
+
+#: standalone/drakups:133
+#, c-format
+msgid "Name:"
+msgstr "Nimi:"
+
+#: standalone/drakups:133
+#, c-format
+msgid "The name of your ups"
+msgstr "Teie UPS-i nimi"
+
+#: standalone/drakups:134
+#, c-format
+msgid "The driver that manage your ups"
+msgstr "Teie UPS-i draiver"
+
+#: standalone/drakups:135
+#, c-format
+msgid "Port:"
+msgstr "Port:"
+
+#: standalone/drakups:137
+#, c-format
+msgid "The port on which is connected your ups"
+msgstr "Port, kuhu UPS on ühendatud"
+
+#: standalone/drakups:144
+#, c-format
+msgid "The wizard successfully configured the new \"%s\" UPS device."
+msgstr "Nõustaja seadistas edukalt uue \"%s\" UPS-i."
+
+#: standalone/drakups:232
+#, c-format
+msgid "UPS devices"
+msgstr "UPS-id"
+
+#: standalone/drakups:233 standalone/drakups:251 standalone/drakups:266
+#: standalone/harddrake2:63
+#, c-format
+msgid "Name"
+msgstr "Nimi"
+
+#: standalone/drakups:250
+#, c-format
+msgid "UPS users"
+msgstr "UPS-i kasutajad"
+
+#: standalone/drakups:265
+#, c-format
+msgid "Access Control Lists"
+msgstr "Ligipääsu kontrolli loend (ACL)"
+
+#: standalone/drakups:266
+#, c-format
+msgid "IP mask"
+msgstr "IP mask"
+
+#: standalone/drakups:277
+#, c-format
+msgid "Rules"
+msgstr "Reeglid"
+
+#: standalone/drakups:278
+#, c-format
+msgid "Action"
+msgstr "Toiming"
+
+#: standalone/drakups:278 standalone/drakvpn:1144 standalone/harddrake2:57
+#, c-format
+msgid "Level"
+msgstr "Tase"
+
+#: standalone/drakups:278
+#, c-format
+msgid "ACL name"
+msgstr "ACL nimi"
+
+#: standalone/drakups:297 standalone/drakups:301 standalone/drakups:310
+#, c-format
+msgid "DrakUPS"
+msgstr "DrakUPS"
+
+#: standalone/drakups:307
+#, c-format
+msgid "Welcome to the UPS configuration tools"
+msgstr "Tere tulemast kasutama UPS-i seadistamise abilist"
+
 #: standalone/drakvpn:71
 #, c-format
 msgid "DrakVPN"
@@ -20850,13 +21116,13 @@ msgstr "VPN lubamine..."
 msgid "The VPN connection is now enabled."
 msgstr "VPN ühendus on nüüd sisse lülitatud."
 
-#: standalone/drakvpn:153 standalone/drakvpn:179
+#: standalone/drakvpn:153 standalone/drakvpn:181
 #, c-format
 msgid "Simple VPN setup."
 msgstr "Lihtne VPN seadistus."
 
 #: standalone/drakvpn:154
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to configure your computer to use a VPN connection.\n"
 "\n"
@@ -20881,7 +21147,7 @@ msgstr ""
 "Kontrollige, et oleksite drakconnecti abil seadistanud võrgu- ja\n"
 "internetiühenduse, enne kui asute edasi tegutsema."
 
-#: standalone/drakvpn:180
+#: standalone/drakvpn:182
 #, c-format
 msgid ""
 "VPN connection.\n"
@@ -20908,12 +21174,12 @@ msgstr ""
 "Palun lugege enne edasitegutsemist läbi\n"
 "VÄHEMALT ipsec-howto dokumendid."
 
-#: standalone/drakvpn:192
+#: standalone/drakvpn:194
 #, c-format
 msgid "Kernel module."
 msgstr "Kerneli moodul."
 
-#: standalone/drakvpn:193
+#: standalone/drakvpn:195
 #, c-format
 msgid ""
 "The kernel need to have ipsec support.\n"
@@ -20928,22 +21194,22 @@ msgstr ""
 "\n"
 "Sel kernelil on '%s' toetus."
 
-#: standalone/drakvpn:288
-#, fuzzy, c-format
+#: standalone/drakvpn:290
+#, c-format
 msgid "Security Policies"
-msgstr "Turvahoiatused:"
+msgstr "Turvareeglid"
 
-#: standalone/drakvpn:288
+#: standalone/drakvpn:290
 #, c-format
 msgid "IKE daemon racoon"
-msgstr ""
+msgstr "IKE deemon racoon"
 
-#: standalone/drakvpn:291 standalone/drakvpn:302
+#: standalone/drakvpn:293 standalone/drakvpn:304
 #, c-format
 msgid "Configuration file"
 msgstr "Seadistusfail"
 
-#: standalone/drakvpn:292
+#: standalone/drakvpn:294
 #, c-format
 msgid ""
 "Configuration step !\n"
@@ -20954,8 +21220,15 @@ msgid ""
 "\n"
 "What would you like to configure ?\n"
 msgstr ""
+"Seadistamine.\n"
+"\n"
+"Teil tuleb määrata turvareeglid ja seejärel seadistada \n"
+"automaatse võtmevahetuse (IKE) deemon. \n"
+"Meie kasutatav KAME IKE deemon kannab nimetust 'racoon'.\n"
+"\n"
+"Mida soovite seadistada?\n"
 
-#: standalone/drakvpn:303
+#: standalone/drakvpn:305
 #, c-format
 msgid ""
 "Next, we will configure the %s file.\n"
@@ -20968,12 +21241,12 @@ msgstr ""
 "\n"
 "Selleks klõpsake nupule 'Järgmine'.\n"
 
-#: standalone/drakvpn:321 standalone/drakvpn:681
+#: standalone/drakvpn:323 standalone/drakvpn:683
 #, c-format
 msgid "%s entries"
 msgstr "%s kirjed"
 
-#: standalone/drakvpn:322
+#: standalone/drakvpn:324
 #, c-format
 msgid ""
 "The %s file contents\n"
@@ -20996,23 +21269,27 @@ msgstr ""
 "\n"
 "Mida soovite ette võtta?\n"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
-#, fuzzy, c-format
-msgid "Display"
-msgstr "vaadata"
+#: standalone/drakvpn:331 standalone/drakvpn:692
+#, c-format
+msgid ""
+"_:display here is a verb\n"
+"Display"
+msgstr "Vaatamine"
 
-#: standalone/drakvpn:329 standalone/drakvpn:690
-#, fuzzy, c-format
+#: standalone/drakvpn:331 standalone/drakvpn:692
+#, c-format
 msgid "Commit"
-msgstr "rakendada"
+msgstr "Rakendamine"
 
-#: standalone/drakvpn:343 standalone/drakvpn:347 standalone/drakvpn:705
-#: standalone/drakvpn:709
+#: standalone/drakvpn:345 standalone/drakvpn:349 standalone/drakvpn:707
+#: standalone/drakvpn:711
 #, c-format
-msgid "Display configuration"
-msgstr "Vaateseadistused"
+msgid ""
+"_:display here is a verb\n"
+"Display configuration"
+msgstr "Seadistuse vaatamine"
 
-#: standalone/drakvpn:348
+#: standalone/drakvpn:350
 #, c-format
 msgid ""
 "The %s file does not exist.\n"
@@ -21027,12 +21304,12 @@ msgstr ""
 "\n"
 "Peaksite minema tagasi ja valima 'lisada'.\n"
 
-#: standalone/drakvpn:364
+#: standalone/drakvpn:366
 #, c-format
 msgid "ipsec.conf entries"
 msgstr "ipsec.conf kirjed"
 
-#: standalone/drakvpn:365
+#: standalone/drakvpn:367
 #, c-format
 msgid ""
 "The %s file contains different sections.\n"
@@ -21057,27 +21334,27 @@ msgstr ""
 "\n"
 "Valige, millist sektsiooni soovite lisada.\n"
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, c-format
 msgid "config setup"
 msgstr "config setup"
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, c-format
 msgid "conn %default"
 msgstr "conn %default"
 
-#: standalone/drakvpn:372
+#: standalone/drakvpn:374
 #, c-format
 msgid "normal conn"
 msgstr "normal conn"
 
-#: standalone/drakvpn:378 standalone/drakvpn:419 standalone/drakvpn:506
+#: standalone/drakvpn:380 standalone/drakvpn:421 standalone/drakvpn:508
 #, c-format
 msgid "Exists !"
 msgstr "See on olemas!"
 
-#: standalone/drakvpn:379 standalone/drakvpn:420
+#: standalone/drakvpn:381 standalone/drakvpn:422
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -21092,7 +21369,7 @@ msgstr ""
 "Võiksite minna tagasi ja valida muu sektsiooni\n"
 "või muuta selle nime.\n"
 
-#: standalone/drakvpn:396
+#: standalone/drakvpn:398
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -21111,37 +21388,37 @@ msgstr ""
 "\n"
 "Kui olete valmis, jätkake või minge tagasi.\n"
 
-#: standalone/drakvpn:401
+#: standalone/drakvpn:403
 #, c-format
 msgid "interfaces"
 msgstr "interfaces"
 
-#: standalone/drakvpn:402
+#: standalone/drakvpn:404
 #, c-format
 msgid "klipsdebug"
 msgstr "klipsdebug"
 
-#: standalone/drakvpn:403
+#: standalone/drakvpn:405
 #, c-format
 msgid "plutodebug"
 msgstr "plutodebug"
 
-#: standalone/drakvpn:404
+#: standalone/drakvpn:406
 #, c-format
 msgid "plutoload"
 msgstr "plutoload"
 
-#: standalone/drakvpn:405
+#: standalone/drakvpn:407
 #, c-format
 msgid "plutostart"
 msgstr "plutostart"
 
-#: standalone/drakvpn:406
+#: standalone/drakvpn:408
 #, c-format
 msgid "uniqueids"
 msgstr "uniqueids"
 
-#: standalone/drakvpn:440
+#: standalone/drakvpn:442
 #, c-format
 msgid ""
 "This is the first section after the config\n"
@@ -21162,52 +21439,52 @@ msgstr ""
 "te neid ei siin globaalselt ei määra, võite\n"
 "seadistada neid kõiki omaette sektsioonis.\n"
 
-#: standalone/drakvpn:447
+#: standalone/drakvpn:449
 #, c-format
-msgid "pfs"
-msgstr "pfs"
+msgid "PFS"
+msgstr "PFS"
 
-#: standalone/drakvpn:448
+#: standalone/drakvpn:450
 #, c-format
 msgid "keyingtries"
 msgstr "keyingtries"
 
-#: standalone/drakvpn:449
+#: standalone/drakvpn:451
 #, c-format
 msgid "compress"
 msgstr "compress"
 
-#: standalone/drakvpn:450
+#: standalone/drakvpn:452
 #, c-format
 msgid "disablearrivalcheck"
 msgstr "disablearrivalcheck"
 
-#: standalone/drakvpn:451 standalone/drakvpn:490
+#: standalone/drakvpn:453 standalone/drakvpn:492
 #, c-format
 msgid "left"
 msgstr "left"
 
-#: standalone/drakvpn:452 standalone/drakvpn:491
+#: standalone/drakvpn:454 standalone/drakvpn:493
 #, c-format
 msgid "leftcert"
 msgstr "leftcert"
 
-#: standalone/drakvpn:453 standalone/drakvpn:492
+#: standalone/drakvpn:455 standalone/drakvpn:494
 #, c-format
 msgid "leftrsasigkey"
 msgstr "leftrsasigkey"
 
-#: standalone/drakvpn:454 standalone/drakvpn:493
+#: standalone/drakvpn:456 standalone/drakvpn:495
 #, c-format
 msgid "leftsubnet"
 msgstr "leftsubnet"
 
-#: standalone/drakvpn:455 standalone/drakvpn:494
+#: standalone/drakvpn:457 standalone/drakvpn:496
 #, c-format
 msgid "leftnexthop"
 msgstr "leftnexthop"
 
-#: standalone/drakvpn:484
+#: standalone/drakvpn:486
 #, c-format
 msgid ""
 "Your %s file has several sections, or connections.\n"
@@ -21220,47 +21497,47 @@ msgstr ""
 "Võite nüüd lisada uue sektsiooni.\n"
 "Kui olete lõpetanud, jätkake andmete salvestamiseks.\n"
 
-#: standalone/drakvpn:487
+#: standalone/drakvpn:489
 #, c-format
 msgid "section name"
 msgstr "sektsiooni nimi"
 
-#: standalone/drakvpn:488
+#: standalone/drakvpn:490
 #, c-format
 msgid "authby"
 msgstr "authby"
 
-#: standalone/drakvpn:489
+#: standalone/drakvpn:491
 #, c-format
 msgid "auto"
 msgstr "auto"
 
-#: standalone/drakvpn:495
+#: standalone/drakvpn:497
 #, c-format
 msgid "right"
 msgstr "right"
 
-#: standalone/drakvpn:496
+#: standalone/drakvpn:498
 #, c-format
 msgid "rightcert"
 msgstr "rightcert"
 
-#: standalone/drakvpn:497
+#: standalone/drakvpn:499
 #, c-format
 msgid "rightrsasigkey"
 msgstr "rightrsasigkey"
 
-#: standalone/drakvpn:498
+#: standalone/drakvpn:500
 #, c-format
 msgid "rightsubnet"
 msgstr "rightsubnet"
 
-#: standalone/drakvpn:499
+#: standalone/drakvpn:501
 #, c-format
 msgid "rightnexthop"
 msgstr "rightnexthop"
 
-#: standalone/drakvpn:507
+#: standalone/drakvpn:509
 #, c-format
 msgid ""
 "A section with this name already exists.\n"
@@ -21275,8 +21552,8 @@ msgstr ""
 "Peaksite minema tagasi ja lisama uue sektsiooni\n"
 "või muutma käesoleva sektsiooni nime.\n"
 
-#: standalone/drakvpn:539
-#, fuzzy, c-format
+#: standalone/drakvpn:541
+#, c-format
 msgid ""
 "Add a Security Policy.\n"
 "\n"
@@ -21284,17 +21561,17 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"Failil %s on mitu sektsiooni ehk ühendust.\n"
+"Turvareegli lisamine.\n"
 "\n"
-"Võite nüüd lisada uue sektsiooni.\n"
+"Võite nüüd lisada turvareegli.\n"
 "Kui olete lõpetanud, jätkake andmete salvestamiseks.\n"
 
-#: standalone/drakvpn:572 standalone/drakvpn:822
+#: standalone/drakvpn:574 standalone/drakvpn:824
 #, c-format
 msgid "Edit section"
 msgstr "Sektsiooni redigeerimine"
 
-#: standalone/drakvpn:573
+#: standalone/drakvpn:575
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21307,19 +21584,19 @@ msgstr ""
 "Allpool saate valida, millist soovite redigeerida.\n"
 "Seejärel klõpsake nupule 'Järgmine'.\n"
 
-#: standalone/drakvpn:576 standalone/drakvpn:656 standalone/drakvpn:827
-#: standalone/drakvpn:873
+#: standalone/drakvpn:578 standalone/drakvpn:658 standalone/drakvpn:829
+#: standalone/drakvpn:875
 #, c-format
 msgid "Section names"
 msgstr "Sektsiooni nimed"
 
-#: standalone/drakvpn:586
+#: standalone/drakvpn:588
 #, c-format
 msgid "Can't edit !"
 msgstr "Redigeerimine ebaõnnestus!"
 
-#: standalone/drakvpn:587
-#, fuzzy, c-format
+#: standalone/drakvpn:589
+#, c-format
 msgid ""
 "You cannot edit this section.\n"
 "\n"
@@ -21335,8 +21612,8 @@ msgstr ""
 "alguses ja seejärel lubada või keelata\n"
 "oportunistlik krüptimine.\n"
 
-#: standalone/drakvpn:596
-#, fuzzy, c-format
+#: standalone/drakvpn:598
+#, c-format
 msgid ""
 "Your %s file has several sections.\n"
 "\n"
@@ -21348,7 +21625,7 @@ msgstr ""
 "Võite nüüd muuta sektsiooni 'config setup' kirjeid.\n"
 "Kui olete valmis, jätkake andmete salvestamiseks.\n"
 
-#: standalone/drakvpn:607
+#: standalone/drakvpn:609
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21361,7 +21638,7 @@ msgstr ""
 "Võite nüüd muuta vaikeseadistuste sektsiooni kirjeid.\n"
 "Kui olete valmis, jätkake andmete salvestamiseks.\n"
 
-#: standalone/drakvpn:620
+#: standalone/drakvpn:622
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21375,8 +21652,8 @@ msgstr ""
 "Võite nüüd muuta tavaseadistuste sektsiooni kirjeid.\n"
 "Kui olete valmis, jätkake andmete salvestamiseks.\n"
 
-#: standalone/drakvpn:641
-#, fuzzy, c-format
+#: standalone/drakvpn:643
+#, c-format
 msgid ""
 "Edit a Security Policy.\n"
 "\n"
@@ -21384,18 +21661,18 @@ msgid ""
 "\n"
 "Choose continue when you are done to write the data.\n"
 msgstr ""
-"Failil %s on mitu sektsiooni ehk ühendust.\n"
+"Turvareegli redigeerimine.\n"
 "\n"
-"Võite nüüd lisada uue sektsiooni.\n"
+"Võite nüüd lisada turvareegli.\n"
 "Kui olete lõpetanud, jätkake andmete salvestamiseks.\n"
 
-#: standalone/drakvpn:652 standalone/drakvpn:869
+#: standalone/drakvpn:654 standalone/drakvpn:871
 #, c-format
 msgid "Remove section"
 msgstr "Sektsiooni eemaldamine"
 
-#: standalone/drakvpn:653 standalone/drakvpn:870
-#, fuzzy, c-format
+#: standalone/drakvpn:655 standalone/drakvpn:872
+#, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
 "\n"
@@ -21407,7 +21684,7 @@ msgstr ""
 "Valige allpool, millist sektsiooni soovite eemaldada\n"
 "ja klõpsake nupule 'Järgmine'.\n"
 
-#: standalone/drakvpn:682
+#: standalone/drakvpn:684
 #, c-format
 msgid ""
 "The racoon.conf file configuration.\n"
@@ -21430,7 +21707,7 @@ msgstr ""
 "  - eemaldada \t\t (eemaldada olemasoleva sektsiooni)\n"
 "  - rakendada \t\t (kirjutada muudatused ka tegelikult faili)"
 
-#: standalone/drakvpn:710
+#: standalone/drakvpn:712
 #, c-format
 msgid ""
 "The %s file does not exist\n"
@@ -21445,12 +21722,12 @@ msgstr ""
 "\n"
 "Peaksite minema tagasi ja valima seadistamine.\n"
 
-#: standalone/drakvpn:724
+#: standalone/drakvpn:726
 #, c-format
 msgid "racoonf.conf entries"
 msgstr "racoon.conf kirjed"
 
-#: standalone/drakvpn:725
+#: standalone/drakvpn:727
 #, c-format
 msgid ""
 "The 'add' sections step.\n"
@@ -21471,22 +21748,22 @@ msgstr ""
 "\n"
 "Valige sektsioon, mida soovite lisada.\n"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, c-format
 msgid "path"
 msgstr "path"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, c-format
 msgid "remote"
 msgstr "remote"
 
-#: standalone/drakvpn:731
+#: standalone/drakvpn:733
 #, c-format
 msgid "sainfo"
 msgstr "sainfo"
 
-#: standalone/drakvpn:739
+#: standalone/drakvpn:741
 #, c-format
 msgid ""
 "The 'add path' section step.\n"
@@ -21501,13 +21778,13 @@ msgstr ""
 "\n"
 "Hiire hoidmine sertifikaadikirje kohal näitab abivihjet."
 
-#: standalone/drakvpn:742
+#: standalone/drakvpn:744
 #, c-format
 msgid "path type"
 msgstr "path type"
 
-#: standalone/drakvpn:746
-#, fuzzy, c-format
+#: standalone/drakvpn:748
+#, c-format
 msgid ""
 "path include path : specifies a path to include\n"
 "a file. See File Inclusion.\n"
@@ -21529,36 +21806,34 @@ msgid ""
 "of the identifier and the shared secret key which are used at\n"
 "Pre-shared key authentication method in phase 1."
 msgstr ""
-"Asukoha määratlemine\n"
-"  path include path;\n"
-"\tmäärab kaasatava faili asukoha.  Vaata faili kaasamise osa.\n"
-"  Näide: path include '/etc/racoon'\n"
+"path include path: määrab kaasatava faili asukoha.\n"
+"Vaata faili kaasamise osa.\n"
+"\tNäide: path include '/etc/racoon'\n"
 "\n"
-"  path pre_shared_key file;\n"
-"\tmäärab faili, mis sisaldab erinevate ID-de eelnevalt jagatud\n"
-"\tühisvõtmeid. Vaata ühisvõtmete osa.\n"
-"  Näide: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
+"path pre_shared_key file: määrab faili, mis sisaldab\n"
+"erinevate ID-de eelnevalt jagatud ühisvõtmeid.\n"
+"Vaata ühisvõtmete osa.\n"
+"\tNäide: path pre_shared_key '/etc/racoon/psk.txt' ;\n"
 "\n"
-"  path certificate path;\n"
-"  \tracoon(8) otsib sellest kataloogist, kui saadakse\n"
-"\t sertifikaat või sertifikaadinõue.\n"
-"  Näide: path certificate '/etc/cert' ;\n"
+"path certificate path: racoon(8) otsib sellest kataloogist,\n"
+"kui saadakse sertifikaat või sertifikaadinõue.\n"
+"\tNäide: path certificate '/etc/cert' ;\n"
 "\n"
-"Fail kaasamine\n"
-"  include file\n"
-"\tvõimalus kaasata muid seadistusfaile.\n"
+"Faili kaasamine: võimalus kaasata fail \n"
+"võimalus kaasata muid seadistusfaile.\n"
+"\tN'ide: include \"remote.conf\" ;\n"
 "\n"
-"Ühisvõtme fail\n"
-"  Eelnevalt jagatud ühisvõtme fail määrab identifikaatori ja jagatud\n"
-"  salajase võtme paari, mida kasutatakse eelnevalt jagatud ühisvõtme\n"
-"  autentimismeetodis esimeses faasis."
+"Ühisvõtme fail: eelnevalt jagatud ühisvõtme fail määrab\n"
+"identifikaatori ja jagatud salajase võtme paari, mida\n"
+"kasutatakse eelnevalt jagatud ühisvõtme autentimismeetodis\n"
+"esimeses faasis."
 
-#: standalone/drakvpn:766
+#: standalone/drakvpn:768 standalone/drakvpn:861
 #, c-format
 msgid "real file"
 msgstr "real file"
 
-#: standalone/drakvpn:789
+#: standalone/drakvpn:791
 #, c-format
 msgid ""
 "Make sure you already have the path sections\n"
@@ -21573,8 +21848,8 @@ msgstr ""
 "Nüüd võite asuda määrama kaugvõrgu seadistusi.\n"
 "Kui olete valmis, jätkake või minge tagasi.\n"
 
-#: standalone/drakvpn:806
-#, fuzzy, c-format
+#: standalone/drakvpn:808
+#, c-format
 msgid ""
 "Make sure you already have the path sections\n"
 "on the top of your %s file.\n"
@@ -21589,7 +21864,7 @@ msgstr ""
 "Nüüd võite asuda sainfo seadistuste juurde.\n"
 "Kui olete valmis, jätkake või minge tagasi.\n"
 
-#: standalone/drakvpn:823
+#: standalone/drakvpn:825
 #, c-format
 msgid ""
 "Your %s file has several sections or connections.\n"
@@ -21602,8 +21877,8 @@ msgstr ""
 "Vali allpool olevas nimekirjast, millist soovite\n"
 "redigeerida ja klõpsake nupule 'Järgmine'.\n"
 
-#: standalone/drakvpn:834
-#, fuzzy, c-format
+#: standalone/drakvpn:836
+#, c-format
 msgid ""
 "Your %s file has several sections.\n"
 "\n"
@@ -21619,8 +21894,8 @@ msgstr ""
 "\n"
 "Kui olete valmis, jätkake andmete salvestamiseks.\n"
 
-#: standalone/drakvpn:843
-#, fuzzy, c-format
+#: standalone/drakvpn:845
+#, c-format
 msgid ""
 "Your %s file has several sections.\n"
 "\n"
@@ -21632,9 +21907,9 @@ msgstr ""
 "\n"
 "Nüüd võite asuda sainfo sektsiooni juurde.\n"
 "\n"
-"Kui olete valmis, jätkake andmete salvestamiseks.\n"
+"Kui olete valmis, jätkake andmete salvestamiseks."
 
-#: standalone/drakvpn:851
+#: standalone/drakvpn:853
 #, c-format
 msgid ""
 "This section has to be on top of your\n"
@@ -21657,18 +21932,13 @@ msgstr ""
 "\n"
 "Kui olete valmis, jätkake või minge tagasi.\n"
 
-#: standalone/drakvpn:858
+#: standalone/drakvpn:860
 #, c-format
 msgid "path_type"
 msgstr "path_type"
 
-#: standalone/drakvpn:859
+#: standalone/drakvpn:901
 #, c-format
-msgid "real_file"
-msgstr "real_file"
-
-#: standalone/drakvpn:899
-#, fuzzy, c-format
 msgid ""
 "Everything has been configured.\n"
 "\n"
@@ -21686,12 +21956,12 @@ msgstr ""
 "Te peaksite siiski kontrollima, et seadistatud oleks\n"
 "ka tunnelite shorewalli sektsioon."
 
-#: standalone/drakvpn:919
-#, fuzzy, c-format
+#: standalone/drakvpn:921
+#, c-format
 msgid "Sainfo source address"
-msgstr "sainfo_source_address"
+msgstr "Sainfo lähteaadress"
 
-#: standalone/drakvpn:920
+#: standalone/drakvpn:922
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21713,13 +21983,31 @@ msgid ""
 "sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
 "\t172.16.1.0/24 is the source address"
 msgstr ""
+"sainfo (lähte_id siht_id | anonymous) { argumendid }\n"
+"määrab IKE faasi 2 parameetrid\n"
+"(IPsec-SA kehtestamine).\n"
+"\n"
+"lähte_id ja siht_id luuakse järgmiselt:\n"
+"\n"
+"\taadress address [/ prefiks] [[port]] ul_proto\n"
+"\n"
+"Näited : \n"
+"\n"
+"sainfo anonymous (võtab vastu kõik ühendused)\n"
+"\tjätke kirje tühjaks, kui soovite anonüümset\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\t203.178.141.209 on lähteaadress\n"
+"\n"
+"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
+"\t172.16.1.0/24 on lähteaadress"
 
-#: standalone/drakvpn:937
-#, fuzzy, c-format
+#: standalone/drakvpn:939
+#, c-format
 msgid "Sainfo source protocol"
-msgstr "sainfo_source_proto"
+msgstr "Sainfo lähteprotokoll"
 
-#: standalone/drakvpn:938
+#: standalone/drakvpn:940
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21738,13 +22026,28 @@ msgid ""
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
 "\tthe first 'any' allows any protocol for the source"
 msgstr ""
+"sainfo (lähte_id siht_id | anonymous) { argumendid }\n"
+"määrab IKE faasi 2 parameetrid\n"
+"(IPsec-SA kehtestamine).\n"
+"\n"
+"lähte_id ja siht_id luuakse järgmiselt:\n"
+"\n"
+"\taadress aadress [/ prefiks] [[port]] ul_proto\n"
+"\n"
+"Näited : \n"
+"\n"
+"sainfo anonymous (võtab vastu kõik ühendused)\n"
+"\tjätke tühjaks, kui soovite anonüümset\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\tesimene 'any' lubab lähtekohale kõiki protokolle"
 
-#: standalone/drakvpn:952
-#, fuzzy, c-format
+#: standalone/drakvpn:954
+#, c-format
 msgid "Sainfo destination address"
-msgstr "sainfo_dest_address"
+msgstr "Sainfo sihtaadress"
 
-#: standalone/drakvpn:953
+#: standalone/drakvpn:955
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21766,13 +22069,31 @@ msgid ""
 "sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
 "\t172.16.2.0/24 is the destination address"
 msgstr ""
+"sainfo (lähte_id siht_id | anonymous) { argumendid }\n"
+"määrab IKE faasi 2 parameetrid\n"
+"(IPsec-SA kehtestamine).\n"
+"\n"
+"lähte_id ja siht_id luuakse järgmiselt:\n"
+"\n"
+"\taadress aadress [/ prefiks] [[port]] ul_proto\n"
+"\n"
+"Näited : \n"
+"\n"
+"sainfo anonymous (võtab vastu kõik ühendused)\n"
+"\tjätke tühjaks, kui soovite anonüümset\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\t203.178.141.218 on sihtaadress\n"
+"\n"
+"sainfo address 172.16.1.0/24 any address 172.16.2.0/24 any\n"
+"\t172.16.2.0/24 on sihtaadress"
 
-#: standalone/drakvpn:970
-#, fuzzy, c-format
+#: standalone/drakvpn:972
+#, c-format
 msgid "Sainfo destination protocol"
-msgstr "sainfo_dest_proto"
+msgstr "Sainfo sihtprotokoll"
 
-#: standalone/drakvpn:971
+#: standalone/drakvpn:973
 #, c-format
 msgid ""
 "sainfo (source_id destination_id | anonymous) { statements }\n"
@@ -21791,13 +22112,28 @@ msgid ""
 "sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
 "\tthe last 'any' allows any protocol for the destination"
 msgstr ""
+"sainfo (lähte_id siht_id | anonymous) { argumendid }\n"
+"määrab IKE faasi 2 parameetrid\n"
+"(IPsec-SA kehtestamine).\n"
+"\n"
+"lähte_id ja siht_id luuakse järgmiselt:\n"
+"\n"
+"\taadress aadress [/ prefiks] [[port]] ul_proto\n"
+"\n"
+"Näited : \n"
+"\n"
+"sainfo anonymous (võtab vastu kõik ühendused)\n"
+"\tjätke tühjaks, kui soovite anonüümset\n"
+"\n"
+"sainfo address 203.178.141.209 any address 203.178.141.218 any\n"
+"\tviimane 'any' lubab sihtkohale kõiki protokolle"
 
-#: standalone/drakvpn:985
+#: standalone/drakvpn:987
 #, c-format
 msgid "PFS group"
-msgstr ""
+msgstr "PFS grupp"
 
-#: standalone/drakvpn:987
+#: standalone/drakvpn:989
 #, c-format
 msgid ""
 "define the group of Diffie-Hellman exponentiations.\n"
@@ -21806,13 +22142,18 @@ msgid ""
 "group is one of following: modp768, modp1024, modp1536.\n"
 "Or you can define 1, 2, or 5 as the DH group number."
 msgstr ""
+"määrab Diffie-Hellmani astenduse grupi.\n"
+"Kui Te ei vaja PFS-i, võite selle direktiivi vahele jätta.\n"
+"Iga ettepanek võetakse vastu, kui Te midagi ei määra.\n"
+"grupp võib olla üks järgmistest: modp768, modp1024, modp1536.\n"
+"Samuti võib määrata 1, 2 või 5 DH grupi numbri tähistajana."
 
-#: standalone/drakvpn:992
-#, fuzzy, c-format
+#: standalone/drakvpn:994
+#, c-format
 msgid "Lifetime number"
-msgstr "lifetime_number"
+msgstr "Eluea number"
 
-#: standalone/drakvpn:993
+#: standalone/drakvpn:995
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21821,7 +22162,25 @@ msgid ""
 "the peer if you do not specify it(them).  They can be\n"
 "individually specified in each proposal.\n"
 "\n"
-"Examples : \n"
+"Examples : \n"
+"\n"
+"        lifetime time 1 min;    # sec,min,hour\n"
+"        lifetime time 1 min;    # sec,min,hour\n"
+"        lifetime time 30 sec;\n"
+"        lifetime time 30 sec;\n"
+"        lifetime time 60 sec;\n"
+"\tlifetime time 12 hour;\n"
+"\n"
+"So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
+msgstr ""
+"määrab teatud eluea, mis pakutakse välja faasi 1\n"
+"läbirääkimistel. Iga ettepanek võetakse vastu ja\n"
+"partnerile ei pakuta atribuuti/atribuute, kui Te\n"
+"seda/neid ei määra. Neid võib iga ettepaneku puhul\n"
+"eraldi määrata.\n"
+"\n"
+"Näited:: \n"
+"\n"
 "\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
 "        lifetime time 1 min;    # sec,min,hour\n"
@@ -21830,15 +22189,14 @@ msgid ""
 "        lifetime time 60 sec;\n"
 "\tlifetime time 12 hour;\n"
 "\n"
-"So, here, the lifetime numbers are 1, 1, 30, 30, 60 and 12.\n"
-msgstr ""
+"Antud juhul on siis eluea numbrid 1, 1, 30, 30, 60 ja 12.\n"
 
-#: standalone/drakvpn:1009
-#, fuzzy, c-format
+#: standalone/drakvpn:1011
+#, c-format
 msgid "Lifetime unit"
-msgstr "lifetime_unit"
+msgstr "Eluea ühik"
 
-#: standalone/drakvpn:1011
+#: standalone/drakvpn:1013
 #, c-format
 msgid ""
 "define a lifetime of a certain time which will be pro-\n"
@@ -21859,28 +22217,51 @@ msgid ""
 "So, here, the lifetime units are 'min', 'min', 'sec', 'sec', 'sec' and "
 "'hour'.\n"
 msgstr ""
+"määrab teatud eluea, mis pakutakse välja faasi 1\n"
+"läbirääkimistel. Iga ettepanek võetakse vastu ja\n"
+"partnerile ei pakuta atribuuti/atribuute, kui Te\n"
+"seda/neid ei määra. Neid võib iga ettepaneku puhul\n"
+"eraldi määrata.\n"
+"\n"
+"Näited:: \n"
+"\n"
+"\n"
+"        lifetime time 1 min;    # sec,min,hour\n"
+"        lifetime time 1 min;    # sec,min,hour\n"
+"        lifetime time 30 sec;\n"
+"        lifetime time 30 sec;\n"
+"        lifetime time 60 sec;\n"
+"\tlifetime time 12 hour;\n"
+"\n"
+"Antud juhul on siis eluea ühikud 'min', 'min', 'sec', 'sec', 'sec' ja "
+"'hour'.\n"
 
-#: standalone/drakvpn:1027 standalone/drakvpn:1112
-#, fuzzy, c-format
+#: standalone/drakvpn:1029 standalone/drakvpn:1114
+#, c-format
 msgid "Encryption algorithm"
-msgstr "encryption_algorithm"
+msgstr "Krüptoalgoritm"
 
-#: standalone/drakvpn:1029
-#, fuzzy, c-format
+#: standalone/drakvpn:1031
+#, c-format
 msgid "Authentication algorithm"
-msgstr "authentication_algorithm"
+msgstr "Autentimisalgoritm"
 
-#: standalone/drakvpn:1031
-#, fuzzy, c-format
+#: standalone/drakvpn:1033
+#, c-format
 msgid "Compression algorithm"
-msgstr "compression_algorithm"
+msgstr "Tihendusalgoritm"
 
-#: standalone/drakvpn:1039
-#, fuzzy, c-format
+#: standalone/drakvpn:1034
+#, c-format
+msgid "deflate"
+msgstr "deflate"
+
+#: standalone/drakvpn:1041
+#, c-format
 msgid "Remote"
-msgstr "Eemalda"
+msgstr "Mujalasuv"
 
-#: standalone/drakvpn:1040
+#: standalone/drakvpn:1042
 #, c-format
 msgid ""
 "remote (address | anonymous) [[port]] { statements }\n"
@@ -21894,13 +22275,23 @@ msgid ""
 "remote anonymous\n"
 "remote ::1 [8000]"
 msgstr ""
+"remote (aadress | anonymous) [[port]] { argumendid }\n"
+"määrab IKE faasi 1 parameetrid igale kaugsõlmele.\n"
+"Vaikeport on 500.  Kui määratud on anonüümne, rakenduvad\n"
+"argumendid kõigile partneritele, kes ei vasta mingile\n"
+"muule direktiivile.\n"
+"\n"
+"Näited : \n"
+"\n"
+"remote anonymous\n"
+"remote ::1 [8000]"
 
-#: standalone/drakvpn:1048
-#, fuzzy, c-format
+#: standalone/drakvpn:1050
+#, c-format
 msgid "Exchange mode"
-msgstr "exchange_mode"
+msgstr "Vahetusresiim"
 
-#: standalone/drakvpn:1050
+#: standalone/drakvpn:1052
 #, c-format
 msgid ""
 "defines the exchange mode for phase 1 when racoon is the\n"
@@ -21910,13 +22301,28 @@ msgid ""
 "modes are acceptable. The first exchange mode is what\n"
 "racoon uses when it is the initiator.\n"
 msgstr ""
+"määrab vahetusresiimi faasis 1, kui algataja on racoon.\n"
+"Samuti määrab vastuvõetava vahetusresiimi, kui racoon on\n"
+"vastaja. Määrata võib enam kui ühe resiimi, eraldajaks\n"
+"koma. Kõik resiimid on vastuvõetavad. Esimene resiim on see,\n"
+"mida racoon kasutab juhul, kui ta on algataja.\n"
 
-#: standalone/drakvpn:1056
-#, fuzzy, c-format
+#: standalone/drakvpn:1058
+#, c-format
 msgid "Generate policy"
-msgstr "generate_policy"
+msgstr "Reegli genereerimine"
 
-#: standalone/drakvpn:1058
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "off"
+msgstr "väljas"
+
+#: standalone/drakvpn:1059 standalone/drakvpn:1075 standalone/drakvpn:1088
+#, c-format
+msgid "on"
+msgstr "sees"
+
+#: standalone/drakvpn:1060
 #, c-format
 msgid ""
 "This directive is for the responder.  Therefore you\n"
@@ -21934,73 +22340,89 @@ msgid ""
 "tiator and the responder.  This directive is ignored in\n"
 "the initiator case.  The default value is off."
 msgstr ""
+"See direktiiv on mõeldud vastuvõtjale. Seepärast võiks\n"
+"selle määrata passiivseks, et racoon(8) oleks ainult\n"
+"vastuvõtja. Kui vastuvõtja SPD ei sisalda faasi 2\n"
+"läbirääkimiste ajal mingit reeglit ja see direktiiv on\n"
+"kehtestatud, valib racoon(8) esimese ettepaneku algataja SA\n"
+"seast ja loob selle põhjal reeglikirjed. See on kasulik\n"
+"läbirääkimistel kliendiga, kellele IP eraldatakse dünaamiliselt.\n"
+"Pange tähele, et algataja võib olla paigaldanud vastuvõtja\n"
+"SPD-sse sobimatu reegli, mis tähendab, et algataja ja\n"
+"vastuvõtja reeglite erinevuse tõttu võib suhtlemine kannatada.\n"
+"Algataja ise ei tee sellest direktiivist välja. Vaikimisi on\n"
+"see välja lülitatud."
 
-#: standalone/drakvpn:1072
-#, fuzzy, c-format
+#: standalone/drakvpn:1074
+#, c-format
 msgid "Passive"
-msgstr "passive"
+msgstr "Passiivne"
 
-#: standalone/drakvpn:1074
+#: standalone/drakvpn:1076
 #, c-format
 msgid ""
 "If you do not want to initiate the negotiation, set this\n"
 "to on.  The default value is off.  It is useful for a\n"
 "server."
 msgstr ""
+"Kui Te ei soovi algatada läbirääkimisi, lülitage see sisse.\n"
+"Vaikimisi on väljas. See on mõttekas serveri puhul."
 
-#: standalone/drakvpn:1077
-#, fuzzy, c-format
+#: standalone/drakvpn:1079
+#, c-format
 msgid "Certificate type"
-msgstr "certificate_type"
+msgstr "Sertifikaadi tüüp"
 
-#: standalone/drakvpn:1079
-#, fuzzy, c-format
+#: standalone/drakvpn:1081
+#, c-format
 msgid "My certfile"
-msgstr "my_certfile"
+msgstr "Minu sertifikaadifail"
 
-#: standalone/drakvpn:1080
-#, fuzzy, c-format
+#: standalone/drakvpn:1082
+#, c-format
 msgid "Name of the certificate"
-msgstr "Printeri nimi"
+msgstr "Sertifikaadi nimi"
 
-#: standalone/drakvpn:1081
-#, fuzzy, c-format
+#: standalone/drakvpn:1083
+#, c-format
 msgid "My private key"
-msgstr "my_private_key"
+msgstr "Minu privaatvõti"
 
-#: standalone/drakvpn:1082
-#, fuzzy, c-format
+#: standalone/drakvpn:1084
+#, c-format
 msgid "Name of the private key"
-msgstr "Printeri nimi"
+msgstr "Privaatvõtme nimi"
 
-#: standalone/drakvpn:1083
-#, fuzzy, c-format
+#: standalone/drakvpn:1085
+#, c-format
 msgid "Peers certfile"
-msgstr "peers_certfile"
+msgstr "Partneri sertifikaadifail"
 
-#: standalone/drakvpn:1084
+#: standalone/drakvpn:1086
 #, c-format
 msgid "Name of the peers certificate"
-msgstr ""
+msgstr "Partneri sertifikaadi nimi"
 
-#: standalone/drakvpn:1085
-#, fuzzy, c-format
+#: standalone/drakvpn:1087
+#, c-format
 msgid "Verify cert"
-msgstr "verify_cert"
+msgstr "Sertifikaadi verifitseerimine"
 
-#: standalone/drakvpn:1087
+#: standalone/drakvpn:1089
 #, c-format
 msgid ""
 "If you do not want to verify the peer's certificate for\n"
 "some reason, set this to off.  The default is on."
 msgstr ""
+"Kui Te mingil põhjusel ei soovi partneri sertifikaati\n"
+"kontrollida, lülitage see välja. Vaikimisi on sees."
 
-#: standalone/drakvpn:1089
-#, fuzzy, c-format
+#: standalone/drakvpn:1091
+#, c-format
 msgid "My identifier"
-msgstr "my_identifier"
+msgstr "Minu identifikaator"
 
-#: standalone/drakvpn:1090
+#: standalone/drakvpn:1092
 #, c-format
 msgid ""
 "specifies the identifier sent to the remote host and the\n"
@@ -22026,18 +22448,40 @@ msgid ""
 "\n"
 "my_identifier user_fqdn \"myemail@mydomain.com\""
 msgstr ""
+"määrab faasi 1 läbirääkimistel kaugmasinale saadetava\n"
+"identifikaatori ja kasutatava tübi.  aadress, fqdn,\n"
+"user_fqdn, keyid ja asn1dn on kasutatava ID tüübina.\n"
+"kasutamine on järgmine:\n"
+"\tmy_identifier address [aadress];\n"
+"\t\ttüüp on IP aadress.  See on vaiketüüp,\n"
+"\t\tkui Te ei määra kasutatavat identifikaatorit.\n"
+"\tmy_identifier user_fqdn string;\n"
+"\t\ttüüp on USER_FQDN (kasutaja täielik\n"
+"\t\tdomeeni nimi).\n"
+"\tmy_identifier fqdn string;\n"
+"\t\ttüüp on FQDN (täielik domeeni nimi).\n"
+"\tmy_identifier keyid fail;\n"
+"\t\ttüüp on KEY_ID.\n"
+"\tmy_identifier asn1dn [string];\n"
+"\t\ttüüp on ASN.1 eristatav nimi.  Kui\n"
+"\t\tstring ära jätta, hangib (8) DN\n"
+"\t\tsertifikaadi subjektirealt.\n"
+"\n"
+"Näited : \n"
+"\n"
+"my_identifier user_fqdn \"minuepostiaadress@minudomeen.ee\""
 
-#: standalone/drakvpn:1110
-#, fuzzy, c-format
+#: standalone/drakvpn:1112
+#, c-format
 msgid "Peers identifier"
-msgstr "peers_identifier"
+msgstr "Partneri identifikaator"
 
-#: standalone/drakvpn:1111
-#, fuzzy, c-format
+#: standalone/drakvpn:1113
+#, c-format
 msgid "Proposal"
-msgstr "proposal"
+msgstr "Ettepanek"
 
-#: standalone/drakvpn:1113
+#: standalone/drakvpn:1115
 #, c-format
 msgid ""
 "specify the encryption algorithm used for the\n"
@@ -22048,71 +22492,113 @@ msgid ""
 "\n"
 "For other transforms, this statement should not be used."
 msgstr ""
+"määrab faasi 1 läbirääkimistel kasutatava\n"
+"krüptoalgoritmi. See peab olema määratud. \n"
+"algoritm võib olla üks järgmistest: \n"
+"\n"
+"des, 3des, blowfish, cast128 oakley puhul.\n"
+"\n"
+"Muudel juhtudel ei peaks seda direktiivi kasutama."
 
-#: standalone/drakvpn:1120
-#, fuzzy, c-format
+#: standalone/drakvpn:1122
+#, c-format
 msgid "Hash algorithm"
-msgstr "hash_algorithm"
+msgstr "Räsialgoritm"
 
-#: standalone/drakvpn:1121
-#, fuzzy, c-format
+#: standalone/drakvpn:1123
+#, c-format
 msgid "Authentication method"
-msgstr "authentication_method"
+msgstr "Autentimisviis"
 
-#: standalone/drakvpn:1122
-#, fuzzy, c-format
+#: standalone/drakvpn:1124
+#, c-format
 msgid "DH group"
-msgstr "dh_group"
+msgstr "DH grupp"
 
-#: standalone/drakvpn:1129
-#, fuzzy, c-format
+#: standalone/drakvpn:1131
+#, c-format
 msgid "Command"
-msgstr "Käsurida"
+msgstr "Käsk"
 
-#: standalone/drakvpn:1130
+#: standalone/drakvpn:1132
 #, c-format
 msgid "Source IP range"
-msgstr ""
+msgstr "Lähtekoha IP vahemik"
 
-#: standalone/drakvpn:1131
+#: standalone/drakvpn:1133
 #, c-format
 msgid "Destination IP range"
-msgstr ""
+msgstr "Sihtkoha IP vahemik"
 
-#: standalone/drakvpn:1132
-#, fuzzy, c-format
+#: standalone/drakvpn:1134
+#, c-format
 msgid "Upper-layer protocol"
-msgstr "Euroopa protokoll"
+msgstr "Ülakihi protokoll"
 
-#: standalone/drakvpn:1133
-#, fuzzy, c-format
+#: standalone/drakvpn:1134 standalone/drakvpn:1141
+#, c-format
+msgid "any"
+msgstr "suvaline"
+
+#: standalone/drakvpn:1136
+#, c-format
 msgid "Flag"
-msgstr "Lipud"
+msgstr "Lipp"
 
-#: standalone/drakvpn:1134
-#, fuzzy, c-format
+#: standalone/drakvpn:1137
+#, c-format
 msgid "Direction"
-msgstr "direction = "
+msgstr "Suund"
 
-#: standalone/drakvpn:1135
-#, fuzzy, c-format
+#: standalone/drakvpn:1138
+#, c-format
 msgid "IPsec policy"
-msgstr "secure_policy = "
+msgstr "IPsec reegel"
 
-#: standalone/drakvpn:1137
-#, fuzzy, c-format
-msgid "Mode"
-msgstr "Mudel"
+#: standalone/drakvpn:1138
+#, c-format
+msgid "ipsec"
+msgstr "ipsec"
 
 #: standalone/drakvpn:1138
-#, fuzzy, c-format
+#, c-format
+msgid "discard"
+msgstr "keelatud"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "Mode"
+msgstr "Resiim"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "tunnel"
+msgstr "tunnel"
+
+#: standalone/drakvpn:1141
+#, c-format
+msgid "transport"
+msgstr "transport"
+
+#: standalone/drakvpn:1143
+#, c-format
 msgid "Source/destination"
-msgstr "Tööjaam"
+msgstr "Lähtekoht/sihtkoht"
 
-#: standalone/drakvpn:1139 standalone/harddrake2:57
+#: standalone/drakvpn:1144
 #, c-format
-msgid "Level"
-msgstr "Tase"
+msgid "require"
+msgstr "nõutav"
+
+#: standalone/drakvpn:1144
+#, c-format
+msgid "use"
+msgstr "kasutatakse"
+
+#: standalone/drakvpn:1144
+#, c-format
+msgid "unique"
+msgstr "unikaalne"
 
 #: standalone/drakxtv:46
 #, c-format
@@ -22252,12 +22738,12 @@ msgstr ""
 #: standalone/harddrake2:18
 #, c-format
 msgid "Alternative drivers"
-msgstr "Alternatiivsed juhtprogrammid"
+msgstr "Alternatiivsed draiverid"
 
 #: standalone/harddrake2:19
 #, c-format
 msgid "the list of alternative drivers for this sound card"
-msgstr "selle helikaardi alternatiivsete juhtprogrammide loend"
+msgstr "selle helikaardi alternatiivsete draiverite loend"
 
 #: standalone/harddrake2:22
 #, c-format
@@ -22488,12 +22974,12 @@ msgstr ""
 #: standalone/harddrake2:56
 #, c-format
 msgid "Floppy format"
-msgstr "Flopi vorming"
+msgstr "Disketi vorming"
 
 #: standalone/harddrake2:56
 #, c-format
 msgid "format of floppies supported by the drive"
-msgstr "flopi vorming, mida seade tunnustab"
+msgstr "disketi vorming, mida seade tunnustab"
 
 #: standalone/harddrake2:57
 #, c-format
@@ -22541,11 +23027,6 @@ msgstr "Nuppude arv"
 msgid "the number of buttons the mouse has"
 msgstr "hiire nuppude arv"
 
-#: standalone/harddrake2:63
-#, c-format
-msgid "Name"
-msgstr "Nimi"
-
 #: standalone/harddrake2:63
 #, c-format
 msgid "the name of the CPU"
@@ -22607,13 +23088,13 @@ msgstr ""
 "võimaldades nii protsessoril takistada kerneli kontrollimatut ligipääsu "
 "kasutajamälule (kannab ka nimetust veavalvur)"
 
-#: standalone/harddrake2:84 standalone/logdrake:77 standalone/printerdrake:146
+#: standalone/harddrake2:84 standalone/logdrake:78 standalone/printerdrake:146
 #: standalone/printerdrake:159
 #, c-format
 msgid "/_Options"
 msgstr "/_Eelistused"
 
-#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:79
+#: standalone/harddrake2:85 standalone/harddrake2:106 standalone/logdrake:80
 #: standalone/printerdrake:171 standalone/printerdrake:172
 #: standalone/printerdrake:173 standalone/printerdrake:174
 #, c-format
@@ -22659,11 +23140,6 @@ msgstr ""
 "Väljade kirjeldus:\n"
 "\n"
 
-#: standalone/harddrake2:115
-#, c-format
-msgid "Select a device !"
-msgstr "Valige seade!"
-
 #: standalone/harddrake2:115
 #, c-format
 msgid ""
@@ -22703,64 +23179,59 @@ msgstr ""
 "<tvignaud@mandrakesoft.com>&gt;\n"
 "\n"
 
-#: standalone/harddrake2:133
-#, c-format
-msgid "Detection in progress"
-msgstr "Toimub tuvastamine..."
-
-#: standalone/harddrake2:140
+#: standalone/harddrake2:141
 #, c-format
 msgid "Harddrake2 version %s"
 msgstr "Harddrake2 versioon %s"
 
-#: standalone/harddrake2:156
+#: standalone/harddrake2:157
 #, c-format
 msgid "Detected hardware"
 msgstr "Tuvastatud riistvara"
 
-#: standalone/harddrake2:161
+#: standalone/harddrake2:162
 #, c-format
 msgid "Configure module"
 msgstr "Mooduli seadistamine"
 
-#: standalone/harddrake2:168
+#: standalone/harddrake2:169
 #, c-format
 msgid "Run config tool"
 msgstr "Seadistamisvahendi käivitamine"
 
-#: standalone/harddrake2:215
+#: standalone/harddrake2:216
 #, c-format
 msgid "unknown"
 msgstr "tundmatu"
 
-#: standalone/harddrake2:216
+#: standalone/harddrake2:217
 #, c-format
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: standalone/harddrake2:234
+#: standalone/harddrake2:235
 #, c-format
 msgid ""
 "Click on a device in the left tree in order to display its information here."
 msgstr ""
 "Klõps seadmel vasakul asuvas puus näitab siin selle kohta käivat infot."
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "secondary"
 msgstr "teisene"
 
-#: standalone/harddrake2:282
+#: standalone/harddrake2:286
 #, c-format
 msgid "primary"
 msgstr "esmane"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "burner"
 msgstr "CD-kirjutaja"
 
-#: standalone/harddrake2:290
+#: standalone/harddrake2:294
 #, c-format
 msgid "DVD"
 msgstr "DVD"
@@ -22780,210 +23251,210 @@ msgstr "Kas soovite konsoolil kasutada BackSpace-i kui Delete?"
 msgid "The change is done, but to be effective you must logout"
 msgstr "Muudatus on tehtud, aga selle rakendamiseks tuleb välja logida"
 
-#: standalone/logdrake:50
+#: standalone/logdrake:51
 #, c-format
-msgid "Mandrake Tools Explanation"
-msgstr "Mandrake vahendite seletused"
+msgid "Mandrake Tools Logs"
+msgstr "Mandrake vahendite logi"
 
-#: standalone/logdrake:51
+#: standalone/logdrake:52
 #, c-format
 msgid "Logdrake"
 msgstr "Logdrake"
 
-#: standalone/logdrake:64
+#: standalone/logdrake:65
 #, c-format
 msgid "Show only for the selected day"
 msgstr "Ainult valitud päeval näitamine"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "/File/_New"
 msgstr "/Fail/_Uus"
 
-#: standalone/logdrake:71
+#: standalone/logdrake:72
 #, c-format
 msgid "<control>N"
 msgstr "<control>N"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:73
 #, c-format
 msgid "/File/_Open"
 msgstr "/Fail/_Ava"
 
-#: standalone/logdrake:72
+#: standalone/logdrake:73
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:74
 #, c-format
 msgid "/File/_Save"
 msgstr "/Fail/_Salvesta"
 
-#: standalone/logdrake:73
+#: standalone/logdrake:74
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: standalone/logdrake:74
+#: standalone/logdrake:75
 #, c-format
 msgid "/File/Save _As"
 msgstr "/Fail/Salvesta _kui"
 
-#: standalone/logdrake:75
+#: standalone/logdrake:76
 #, c-format
 msgid "/File/-"
 msgstr "/Fail/-"
 
-#: standalone/logdrake:78
+#: standalone/logdrake:79
 #, c-format
 msgid "/Options/Test"
 msgstr "/Eelistused/Test"
 
-#: standalone/logdrake:80
+#: standalone/logdrake:81
 #, c-format
 msgid "/Help/_About..."
 msgstr "/Abi/_Misvärk"
 
-#: standalone/logdrake:111
+#: standalone/logdrake:110
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "Autentimine"
 
-#: standalone/logdrake:112
+#: standalone/logdrake:111
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "Kasutaja"
 
-#: standalone/logdrake:113
+#: standalone/logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "Teated"
 
-#: standalone/logdrake:114
+#: standalone/logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr "Süsteemilogi"
 
-#: standalone/logdrake:118
+#: standalone/logdrake:117
 #, c-format
 msgid "search"
 msgstr "otsing"
 
-#: standalone/logdrake:130
+#: standalone/logdrake:129
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "Vahend logide jälgimiseks"
 
-#: standalone/logdrake:131 standalone/net_monitor:85
+#: standalone/logdrake:130 standalone/net_monitor:85
 #, c-format
 msgid "Settings"
 msgstr "Seadistused"
 
-#: standalone/logdrake:136
+#: standalone/logdrake:135
 #, c-format
 msgid "Matching"
 msgstr "Sobib"
 
-#: standalone/logdrake:137
+#: standalone/logdrake:136
 #, c-format
 msgid "but not matching"
 msgstr "aga ei sobi"
 
-#: standalone/logdrake:141
+#: standalone/logdrake:140
 #, c-format
 msgid "Choose file"
 msgstr "Faili valimine"
 
-#: standalone/logdrake:150
+#: standalone/logdrake:149
 #, c-format
 msgid "Calendar"
 msgstr "Kalender"
 
-#: standalone/logdrake:160
+#: standalone/logdrake:159
 #, c-format
 msgid "Content of the file"
 msgstr "Faili sisu"
 
-#: standalone/logdrake:164 standalone/logdrake:377
+#: standalone/logdrake:163 standalone/logdrake:429
 #, c-format
 msgid "Mail alert"
 msgstr "Meilihoiatus"
 
-#: standalone/logdrake:171
+#: standalone/logdrake:170
 #, c-format
 msgid "The alert wizard had unexpectly failled:"
 msgstr "Hoiatusnõustajat tabas ootamatu krahh:"
 
-#: standalone/logdrake:219
+#: standalone/logdrake:221
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "palun oodake, parsin faili: %s"
 
-#: standalone/logdrake:355
+#: standalone/logdrake:406
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache veebiserver"
 
-#: standalone/logdrake:356
+#: standalone/logdrake:407
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "Domeeninimede lahendaja"
 
-#: standalone/logdrake:357
+#: standalone/logdrake:408
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP server"
 
-#: standalone/logdrake:358
+#: standalone/logdrake:409
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix meiliserver"
 
-#: standalone/logdrake:359
+#: standalone/logdrake:410
 #, c-format
 msgid "Samba Server"
 msgstr "Samba server"
 
-#: standalone/logdrake:360
+#: standalone/logdrake:411
 #, c-format
 msgid "SSH Server"
 msgstr "SSH server"
 
-#: standalone/logdrake:361
+#: standalone/logdrake:412
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin teenus"
 
-#: standalone/logdrake:362
+#: standalone/logdrake:413
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd teenus"
 
-#: standalone/logdrake:372
+#: standalone/logdrake:424
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "Meilihoiatuste süsteemi seadistamine"
 
-#: standalone/logdrake:373
+#: standalone/logdrake:425
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "Peata meilihoiatuse süsteem"
 
-#: standalone/logdrake:380
+#: standalone/logdrake:432
 #, c-format
 msgid "Mail alert configuration"
 msgstr "Meilihoiatuse seadistused"
 
-#: standalone/logdrake:381
+#: standalone/logdrake:433
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -22994,71 +23465,66 @@ msgstr ""
 "\n"
 "Siin saab seadistada hoiatussüsteemi.\n"
 
-#: standalone/logdrake:384
+#: standalone/logdrake:436
 #, c-format
 msgid "What do you want to do?"
 msgstr "Mida soovite ette võtta?"
 
-#: standalone/logdrake:391
+#: standalone/logdrake:443
 #, c-format
 msgid "Services settings"
 msgstr "Teenuste seadistus"
 
-#: standalone/logdrake:392
+#: standalone/logdrake:444
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "Saate hoiatuse, kui mõni valitud teenustest enam ei tööta"
 
-#: standalone/logdrake:399
+#: standalone/logdrake:451
 #, c-format
 msgid "Load setting"
 msgstr "Koormuse seadistused"
 
-#: standalone/logdrake:400
+#: standalone/logdrake:452
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "Saate hoiatuse, kui koormus on siin määratust suurem"
 
-#: standalone/logdrake:401
+#: standalone/logdrake:453
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "Koormus"
 
-#: standalone/logdrake:406
+#: standalone/logdrake:458
 #, c-format
 msgid "Alert configuration"
 msgstr "Hoiatuse seadistus"
 
-#: standalone/logdrake:407
+#: standalone/logdrake:459
 #, c-format
 msgid "Please enter your email address below "
 msgstr "Sisestage palun siia oma e-posti aadress"
 
-#: standalone/logdrake:408
+#: standalone/logdrake:460
 #, c-format
 msgid "and enter the name (or the IP) of the SMTP server you whish to use"
 msgstr "ja sisestage SMTP serveri nimi (või IP), mida soovite kasutada"
 
-#: standalone/logdrake:427 standalone/logdrake:433
-#, c-format
-msgid "Congratulations"
-msgstr "Õnnitleme!"
-
-#: standalone/logdrake:427
+#: standalone/logdrake:479
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "Nõustaja seadistas edukalt meilihoiatuse."
 
-#: standalone/logdrake:433
+#: standalone/logdrake:485
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "Nõustaja keelustas edukalt meilihoiatused."
 
-#: standalone/logdrake:492
+#: standalone/logdrake:544
 #, c-format
 msgid "Save as.."
 msgstr "Salvesta kui..."
@@ -23374,7 +23840,23 @@ msgstr "Autorid: "
 msgid "Printer Management \n"
 msgstr "Printerite haldamine \n"
 
-#: standalone/scannerdrake:53
+#: standalone/scannerdrake:50
+#, c-format
+msgid ""
+"SANE packages need to be installed to use scanners.\n"
+"\n"
+"Do you want to install the SANE packages?"
+msgstr ""
+"Skänneri kasutamiseks on vajalik paigaldada SANE tarkvara.\n"
+"\n"
+"Kas soovite seda teha?"
+
+#: standalone/scannerdrake:54
+#, c-format
+msgid "Aborting Scannerdrake."
+msgstr "Scannerdrakest väljumine."
+
+#: standalone/scannerdrake:59
 #, c-format
 msgid ""
 "Could not install the packages needed to set up a scanner with Scannerdrake."
@@ -23382,90 +23864,90 @@ msgstr ""
 "Pakettide paigaldamine, mis on vajalikud skänneri seadistamiseks "
 "Scannerdrake abil, ei õnnestunud."
 
-#: standalone/scannerdrake:54
+#: standalone/scannerdrake:60
 #, c-format
 msgid "Scannerdrake will not be started now."
 msgstr "Scannerdraket praegu ei käivitata."
 
-#: standalone/scannerdrake:60 standalone/scannerdrake:452
+#: standalone/scannerdrake:66 standalone/scannerdrake:459
 #, c-format
 msgid "Searching for configured scanners ..."
 msgstr "Seadistatud skännerite otsimine..."
 
-#: standalone/scannerdrake:64 standalone/scannerdrake:456
+#: standalone/scannerdrake:70 standalone/scannerdrake:463
 #, c-format
 msgid "Searching for new scanners ..."
 msgstr "Uute skännerite otsimine..."
 
-#: standalone/scannerdrake:72 standalone/scannerdrake:478
+#: standalone/scannerdrake:78 standalone/scannerdrake:485
 #, c-format
 msgid "Re-generating list of configured scanners ..."
 msgstr "Seadistatud skännerite loendi taasloomine..."
 
-#: standalone/scannerdrake:94 standalone/scannerdrake:135
-#: standalone/scannerdrake:149
+#: standalone/scannerdrake:100 standalone/scannerdrake:141
+#: standalone/scannerdrake:155
 #, c-format
 msgid "The %s is not supported by this version of %s."
 msgstr "%s praegusel versioonil puudub %s tugi."
 
-#: standalone/scannerdrake:97
+#: standalone/scannerdrake:103
 #, c-format
 msgid "%s found on %s, configure it automatically?"
 msgstr "%s leiti asukohas %s, kas seadistada see automaatselt?"
 
-#: standalone/scannerdrake:109
+#: standalone/scannerdrake:115
 #, c-format
 msgid "%s is not in the scanner database, configure it manually?"
 msgstr "%s puudub skännerite andmebaasis, kas seadistada see käsitsi?"
 
-#: standalone/scannerdrake:124
+#: standalone/scannerdrake:130
 #, c-format
 msgid "Select a scanner model"
 msgstr "Valige skänneri mudel"
 
-#: standalone/scannerdrake:125
+#: standalone/scannerdrake:131
 #, c-format
 msgid " ("
 msgstr " ("
 
-#: standalone/scannerdrake:126
+#: standalone/scannerdrake:132
 #, c-format
 msgid "Detected model: %s"
 msgstr "Tuvastati mudel: %s"
 
-#: standalone/scannerdrake:128
+#: standalone/scannerdrake:134
 #, c-format
 msgid ", "
 msgstr ", "
 
-#: standalone/scannerdrake:129
+#: standalone/scannerdrake:135
 #, c-format
 msgid "Port: %s"
 msgstr "Port: %s"
 
-#: standalone/scannerdrake:155
+#: standalone/scannerdrake:161
 #, c-format
 msgid "The %s is not known by this version of Scannerdrake."
 msgstr "%s on Scannerdrake praegusele versioonile tundmatu."
 
-#: standalone/scannerdrake:163 standalone/scannerdrake:177
+#: standalone/scannerdrake:169 standalone/scannerdrake:183
 #, c-format
 msgid "Do not install firmware file"
 msgstr "Püsivarafaili ei paigaldata"
 
-#: standalone/scannerdrake:167 standalone/scannerdrake:219
+#: standalone/scannerdrake:173 standalone/scannerdrake:225
 #, c-format
 msgid ""
 "It is possible that your %s needs its firmware to be uploaded everytime when "
 "it is turned on."
 msgstr "On võimalik, et Teie %s vajab püsivara laadimist igal käivitamisel."
 
-#: standalone/scannerdrake:168 standalone/scannerdrake:220
+#: standalone/scannerdrake:174 standalone/scannerdrake:226
 #, c-format
 msgid "If this is the case, you can make this be done automatically."
 msgstr "Sellisel juhul võite lasta selle automaatselt ära teha."
 
-#: standalone/scannerdrake:169 standalone/scannerdrake:223
+#: standalone/scannerdrake:175 standalone/scannerdrake:229
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware file for your scanner so that it "
@@ -23473,7 +23955,7 @@ msgid ""
 msgstr ""
 "Selleks tuleb anda skännerile vajalik püsivarafail, mis siis paigaldatakse."
 
-#: standalone/scannerdrake:170 standalone/scannerdrake:224
+#: standalone/scannerdrake:176 standalone/scannerdrake:230
 #, c-format
 msgid ""
 "You find the file on the CD or floppy coming with the scanner, on the "
@@ -23482,22 +23964,22 @@ msgstr ""
 "Faili leiab skänneriga kaasas olnud CD-lt või disketilt, tootja "
 "koduleheküljelt või Windowsi partitsioonilt."
 
-#: standalone/scannerdrake:172 standalone/scannerdrake:231
+#: standalone/scannerdrake:178 standalone/scannerdrake:237
 #, c-format
 msgid "Install firmware file from"
 msgstr "Püsivarafaili paigaldamine asukohast"
 
-#: standalone/scannerdrake:192
+#: standalone/scannerdrake:198
 #, c-format
 msgid "Select firmware file"
 msgstr "Valige püsivarafail"
 
-#: standalone/scannerdrake:195 standalone/scannerdrake:254
+#: standalone/scannerdrake:201 standalone/scannerdrake:260
 #, c-format
 msgid "The firmware file %s does not exist or is unreadable!"
 msgstr "Püsivarafaili %s ei ole olemas või ei ole see loetav!"
 
-#: standalone/scannerdrake:218
+#: standalone/scannerdrake:224
 #, c-format
 msgid ""
 "It is possible that your scanners need their firmware to be uploaded "
@@ -23505,7 +23987,7 @@ msgid ""
 msgstr ""
 "On võimalik, et Teie skännerid vajavad püsivara laadimist igal käivitamisel."
 
-#: standalone/scannerdrake:222
+#: standalone/scannerdrake:228
 #, c-format
 msgid ""
 "To do so, you need to supply the firmware files for your scanners so that it "
@@ -23514,7 +23996,7 @@ msgstr ""
 "Selleks tuleb määrata skännerile vajalik püsivarafail, mis siis "
 "paigaldatakse."
 
-#: standalone/scannerdrake:225
+#: standalone/scannerdrake:231
 #, c-format
 msgid ""
 "If you have already installed your scanner's firmware you can update the "
@@ -23523,27 +24005,27 @@ msgstr ""
 "Kui olete juba skänneri püsivara paigaldanud, võite seda uuendada, määrates "
 "siin uue püsivarafaili."
 
-#: standalone/scannerdrake:227
+#: standalone/scannerdrake:233
 #, c-format
 msgid "Install firmware for the"
 msgstr "Püsivarafaili paigaldamine seadmele"
 
-#: standalone/scannerdrake:250
+#: standalone/scannerdrake:256
 #, c-format
 msgid "Select firmware file for the %s"
 msgstr "Valige %s jaoks püsivarafail"
 
-#: standalone/scannerdrake:276
+#: standalone/scannerdrake:282
 #, c-format
 msgid "The firmware file for your %s was successfully installed."
 msgstr "Teie %s püsivarafail paigaldati edukalt."
 
-#: standalone/scannerdrake:286
+#: standalone/scannerdrake:292
 #, c-format
 msgid "The %s is unsupported"
 msgstr "Sel %s skänneril puudub tugi"
 
-#: standalone/scannerdrake:291
+#: standalone/scannerdrake:297
 #, c-format
 msgid ""
 "The %s must be configured by printerdrake.\n"
@@ -23552,44 +24034,44 @@ msgstr ""
 "See %s skänner tuleb seadistada printerdrake abil.\n"
 "Printerdrake saab käivitada %s juhtimiskeskuse riistvara sektsioonist."
 
-#: standalone/scannerdrake:295 standalone/scannerdrake:302
-#: standalone/scannerdrake:332
+#: standalone/scannerdrake:301 standalone/scannerdrake:308
+#: standalone/scannerdrake:338
 #, c-format
 msgid "Auto-detect available ports"
 msgstr "Kättesaadavate portide automaattuvastus"
 
-#: standalone/scannerdrake:297 standalone/scannerdrake:343
+#: standalone/scannerdrake:303 standalone/scannerdrake:349
 #, c-format
 msgid "Please select the device where your %s is attached"
 msgstr "Valige palun seade, kuhu %s on ühendatud"
 
-#: standalone/scannerdrake:298
+#: standalone/scannerdrake:304
 #, c-format
 msgid "(Note: Parallel ports cannot be auto-detected)"
 msgstr "(Märkus: paralleelporte ei tuvastata)"
 
-#: standalone/scannerdrake:300 standalone/scannerdrake:345
+#: standalone/scannerdrake:306 standalone/scannerdrake:351
 #, c-format
 msgid "choose device"
 msgstr "valige seade"
 
-#: standalone/scannerdrake:334
+#: standalone/scannerdrake:340
 #, c-format
 msgid "Searching for scanners ..."
 msgstr "Skännerite otsimine..."
 
-#: standalone/scannerdrake:368
+#: standalone/scannerdrake:375
 #, c-format
 msgid ""
 "Your %s has been configured.\n"
-"You may now scan documents using \"XSane\" from Multimedia/Graphics in the "
-"applications menu."
+"You may now scan documents using \"XSane\" or \"Kooka\" 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."
+"Teie %s on seadistatud.\n"
+"Nüüd võite skaneerida dokumente, kasutades selleks rakendust \"XSane\" või "
+"\"Kooka\", mille leiate rakenduste menüüs rubriigist Multimeedia/Graafika."
 
-#: standalone/scannerdrake:392
+#: standalone/scannerdrake:399
 #, c-format
 msgid ""
 "The following scanners\n"
@@ -23602,7 +24084,7 @@ msgstr ""
 "%s\n"
 "skännerid.\n"
 
-#: standalone/scannerdrake:393
+#: standalone/scannerdrake:400
 #, c-format
 msgid ""
 "The following scanner\n"
@@ -23615,52 +24097,52 @@ msgstr ""
 "%s\n"
 "skänner.\n"
 
-#: standalone/scannerdrake:396 standalone/scannerdrake:399
+#: standalone/scannerdrake:403 standalone/scannerdrake:406
 #, c-format
 msgid "There are no scanners found which are available on your system.\n"
 msgstr "Ei leitud ühtegi skännerit, mida süsteem saaks kasutada.\n"
 
-#: standalone/scannerdrake:413
+#: standalone/scannerdrake:420
 #, c-format
 msgid "Search for new scanners"
 msgstr "Uute skännerite otsimine..."
 
-#: standalone/scannerdrake:419
+#: standalone/scannerdrake:426
 #, c-format
 msgid "Add a scanner manually"
 msgstr "Skänneri lisamine käsitsi"
 
-#: standalone/scannerdrake:426
+#: standalone/scannerdrake:433
 #, c-format
 msgid "Install/Update firmware files"
 msgstr "Püsivarafailide paigaldamine/uuendamine"
 
-#: standalone/scannerdrake:432
+#: standalone/scannerdrake:439
 #, c-format
 msgid "Scanner sharing"
 msgstr "Skänneri jagamine"
 
-#: standalone/scannerdrake:491 standalone/scannerdrake:656
+#: standalone/scannerdrake:498 standalone/scannerdrake:663
 #, c-format
 msgid "All remote machines"
 msgstr "Kõik kaugmasinad"
 
-#: standalone/scannerdrake:503 standalone/scannerdrake:806
+#: standalone/scannerdrake:510 standalone/scannerdrake:813
 #, c-format
 msgid "This machine"
 msgstr "See masin"
 
-#: standalone/scannerdrake:543
+#: standalone/scannerdrake:550
 #, c-format
 msgid ""
 "Here you can choose whether the scanners connected to this machine should be "
-"accessable by remote machines and by which remote machines."
+"accessible by remote machines and by which remote machines."
 msgstr ""
 "Siin saate valida, millised selle arvuti külge kinnitatud skännerid peaksid "
 "olema kättesaadavad ka teistele kohtvõrgu arvutitele ja millistele nende "
 "hulgast."
 
-#: standalone/scannerdrake:544
+#: standalone/scannerdrake:551
 #, c-format
 msgid ""
 "You can also decide here whether scanners on remote machines should be made "
@@ -23669,33 +24151,33 @@ msgstr ""
 "Samuti saate otsustada, kas võrguskännerid peaksid olema automaatselt siin "
 "arvutis kättesaadavad"
 
-#: standalone/scannerdrake:547
+#: standalone/scannerdrake:554
 #, c-format
 msgid "The scanners on this machine are available to other computers"
 msgstr "Selle arvuti külge ühendatud skännerid on teistele kättesaadavad"
 
-#: standalone/scannerdrake:549
+#: standalone/scannerdrake:556
 #, c-format
 msgid "Scanner sharing to hosts: "
 msgstr "Skänneri jagamine masinatele:"
 
-#: standalone/scannerdrake:563
+#: standalone/scannerdrake:570
 #, c-format
 msgid "Use scanners on remote computers"
 msgstr "Skännerite kasutamine kaugmasinatel"
 
-#: standalone/scannerdrake:566
+#: standalone/scannerdrake:573
 #, c-format
 msgid "Use the scanners on hosts: "
 msgstr "Skännerite kasutamine masinatel:"
 
-#: standalone/scannerdrake:593 standalone/scannerdrake:665
-#: standalone/scannerdrake:815
+#: standalone/scannerdrake:600 standalone/scannerdrake:672
+#: standalone/scannerdrake:822
 #, c-format
 msgid "Sharing of local scanners"
 msgstr "Skännerite jagamine"
 
-#: standalone/scannerdrake:594
+#: standalone/scannerdrake:601
 #, c-format
 msgid ""
 "These are the machines on which the locally connected scanner(s) should be "
@@ -23704,56 +24186,67 @@ msgstr ""
 "Nende masinate jaoks on selle arvuti küljes olevad skännerid kättesaadavaks  "
 "tehtud:"
 
-#: standalone/scannerdrake:605 standalone/scannerdrake:755
+#: standalone/scannerdrake:612 standalone/scannerdrake:762
 #, c-format
 msgid "Add host"
 msgstr "Lisa masin"
 
-#: standalone/scannerdrake:611 standalone/scannerdrake:761
+#: standalone/scannerdrake:618 standalone/scannerdrake:768
 #, c-format
 msgid "Edit selected host"
 msgstr "Muuda valitud masinat"
 
-#: standalone/scannerdrake:620 standalone/scannerdrake:770
+#: standalone/scannerdrake:627 standalone/scannerdrake:777
 #, c-format
 msgid "Remove selected host"
 msgstr "Eemalda valitud masin"
 
-#: standalone/scannerdrake:644 standalone/scannerdrake:652
-#: standalone/scannerdrake:657 standalone/scannerdrake:703
-#: standalone/scannerdrake:794 standalone/scannerdrake:802
-#: standalone/scannerdrake:807 standalone/scannerdrake:853
+#: standalone/scannerdrake:651 standalone/scannerdrake:659
+#: standalone/scannerdrake:664 standalone/scannerdrake:710
+#: standalone/scannerdrake:801 standalone/scannerdrake:809
+#: standalone/scannerdrake:814 standalone/scannerdrake:860
 #, c-format
 msgid "Name/IP address of host:"
 msgstr "Masina nimi/IP aadress:"
 
-#: standalone/scannerdrake:666 standalone/scannerdrake:816
+#: standalone/scannerdrake:673 standalone/scannerdrake:823
 #, c-format
 msgid "Choose the host on which the local scanners should be made available:"
 msgstr ""
 "Valige palun masin, mille jaoks soovite siinseid skännereid välja jagada:"
 
-#: standalone/scannerdrake:677 standalone/scannerdrake:827
+#: standalone/scannerdrake:684 standalone/scannerdrake:834
 #, c-format
 msgid "You must enter a host name or an IP address.\n"
 msgstr "Sisestage palun masinanimi või IP aadress.\n"
 
-#: standalone/scannerdrake:688 standalone/scannerdrake:838
+#: standalone/scannerdrake:695 standalone/scannerdrake:845
 #, c-format
 msgid "This host is already in the list, it cannot be added again.\n"
 msgstr "See masin on juba nimekirjas ja seda ei ole võimalik uuesti lisada.\n"
 
-#: standalone/scannerdrake:743
+#: standalone/scannerdrake:750
 #, c-format
 msgid "Usage of remote scanners"
 msgstr "Võrguskänneri kasutamine"
 
-#: standalone/scannerdrake:744
+#: standalone/scannerdrake:751
 #, c-format
 msgid "These are the machines from which the scanners should be used:"
 msgstr "Nende masinate skännereid saab selle arvutiga kasutada:"
 
-#: standalone/scannerdrake:904
+#: standalone/scannerdrake:908
+#, c-format
+msgid ""
+"saned needs to be installed to share the local scanner(s).\n"
+"\n"
+"Do you want to install the saned package?"
+msgstr ""
+"Kohaliku skänneri jagamiseks on vaja paigaldada tarkvarapakett saned.\n"
+"\n"
+"Kas soovite seda nüüd teha?"
+
+#: standalone/scannerdrake:912 standalone/scannerdrake:916
 #, c-format
 msgid "Your scanner(s) will not be available on the network."
 msgstr "Teie skänner(id) ei ole võrgus kättesaadavad."
@@ -23768,7 +24261,7 @@ msgstr "Mõned seadmed riistvaraklassis \"%s\" eemaldati:\n"
 msgid "Some devices were added: %s\n"
 msgstr "Mõned seadmed lisati: %s\n"
 
-#: standalone/service_harddrake:94
+#: standalone/service_harddrake:98
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "Riistvara tuvastamine..."
@@ -23863,22 +24356,22 @@ msgstr "Uuenduste paigaldus"
 msgid "Exit install"
 msgstr "Programmist väljumine"
 
-#: ugtk2.pm:1047
+#: ugtk2.pm:1075
 #, c-format
 msgid "Is this correct?"
 msgstr "Kas see on sobiv?"
 
-#: ugtk2.pm:1175
+#: ugtk2.pm:1203
 #, c-format
 msgid "Expand Tree"
 msgstr "Ava puu"
 
-#: ugtk2.pm:1176
+#: ugtk2.pm:1204
 #, c-format
 msgid "Collapse Tree"
 msgstr "Sulge puu"
 
-#: ugtk2.pm:1177
+#: ugtk2.pm:1205
 #, c-format
 msgid "Toggle between flat and group sorted"
 msgstr "Sorteeritud või sorteerimata"
@@ -23897,299 +24390,178 @@ msgstr ""
 msgid "Installation failed"
 msgstr "Paigaldamine ebaõnnestus!"
 
-#~ msgid "%s="
-#~ msgstr "%s="
-
-#~ msgid "Configuration of a remote printer"
-#~ msgstr "Võrguprinteri seadistamine"
-
-#~ msgid ""
-#~ "Welcome to the configuration files step !\n"
-#~ "\n"
-#~ "You can now configure the sections of these files.\n"
-#~ "\n"
-#~ "Which file would you like to configure ?\n"
-#~ msgstr ""
-#~ "Tere tulemast seadistama seadistusfaile!\n"
-#~ "\n"
-#~ "Nüüd saate seadistada nende failide sektsioone.\n"
-#~ "\n"
-#~ "Millist faili soovite seadistada?\n"
-
-#~ msgid "configure %s"
-#~ msgstr "seadistamine %s"
-
-#~ msgid "add"
-#~ msgstr "lisada"
-
-#~ msgid "edit"
-#~ msgstr "muuta"
-
-#~ msgid "remove"
-#~ msgstr "eemaldada"
-
-#~ msgid "src_range = "
-#~ msgstr "src_range = "
-
-#~ msgid "dst_range = "
-#~ msgstr "dst_range = "
-
-#~ msgid "upperspec = "
-#~ msgstr "upperspec = "
-
-#~ msgid "flag = "
-#~ msgstr "flag = "
-
-#~ msgid "ipsec = "
-#~ msgstr "ipsec = "
-
-#~ msgid "protocol = "
-#~ msgstr "protocol = "
-
-#~ msgid "mode = "
-#~ msgstr "mode = "
-
-#~ msgid "src_dest = "
-#~ msgstr "src_dest = "
-
-#~ msgid "level = "
-#~ msgstr "level = "
-
-#~ msgid ""
-#~ "Your %s file has several sections, or connections.\n"
-#~ "\n"
-#~ "You can now edit the chosen section.\n"
-#~ "Choose continue when you are done to write the data.\n"
-#~ msgstr ""
-#~ "Failil %s on mitu sektsiooni või ühendust.\n"
-#~ "\n"
-#~ "Võite nüüd muuta valitud sektsiooni kirjeid.\n"
-#~ "Kui olete valmis, jätkake andmete salvestamiseks.\n"
-
-#~ msgid "pfs_group"
-#~ msgstr "pfs_group"
-
-#~ msgid "Office Workstation"
-#~ msgstr "Kontori tööjaam"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Kontori tööjaam"
 
-#~ msgid ""
-#~ "Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-#~ "gnumeric), pdf viewers, etc"
-#~ msgstr ""
-#~ "Kontoritöö programmid: tekstitöötlus (kword, abiword), tabeltöötlus "
-#~ "(kspread, gnumeric), PDF vaatajad jne"
-
-#~ msgid "Game station"
-#~ msgstr "Mänguvahend"
-
-#~ msgid "Amusement programs: arcade, boards, strategy, etc"
-#~ msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
-
-#~ msgid "Multimedia station"
-#~ msgstr "Multimeedia tööjaam"
-
-#~ msgid "Sound and video playing/editing programs"
-#~ msgstr "Heli ja video mängimine ja redigeerimine"
-
-#~ msgid ""
-#~ "Set of tools to read and send mail and news (mutt, tin..) and to browse "
-#~ "the Web"
-#~ msgstr ""
-#~ "Valik rakendusi meili ja uudiste lugemiseks (mutt, tin...) ning veebi "
-#~ "lehitsemiseks"
-
-#~ msgid "Network Computer (client)"
-#~ msgstr "Võrguarvuti (klient)"
-
-#~ msgid "Clients for different protocols including ssh"
-#~ msgstr "Mitme protokolli, sealhulgas ssh kliendid"
-
-#~ msgid "Configuration"
-#~ msgstr "Seadistamine"
-
-#~ msgid "Tools to ease the configuration of your computer"
-#~ msgstr "Vahendid süsteemi lihtsamaks administreerimiseks"
-
-#~ msgid "Scientific Workstation"
-#~ msgstr "Teadustööjaam"
-
-#~ msgid "Scientific applications such as gnuplot"
-#~ msgstr "Teaduserakendused, näiteks gnuplot"
-
-#~ msgid "Console Tools"
-#~ msgstr "Konsoolivahendid"
-
-#~ msgid "Editors, shells, file tools, terminals"
-#~ msgstr "Redaktorid, shellid, terminalid, failihaldus"
-
-#~ msgid "KDE Workstation"
-#~ msgstr "KDE tööjaam"
-
-#~ msgid ""
-#~ "The K Desktop Environment, the basic graphical environment with a "
-#~ "collection of accompanying tools"
-#~ msgstr ""
-#~ "K töölaua keskkond: graafiline töökeskkond ja rida seonduvaid rakendusi"
-
-#~ msgid "Gnome Workstation"
-#~ msgstr "Gnome tööjaam"
-
-#~ msgid ""
-#~ "A graphical environment with user-friendly set of applications and "
-#~ "desktop tools"
-#~ msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
-
-#~ msgid "Other Graphical Desktops"
-#~ msgstr "Muud graafilised töölauad"
-
-#~ msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-#~ msgstr "Icewm, WindowMaker, Enlightenment, Fvwm jt"
-
-#~ msgid "C and C++ development libraries, programs and include files"
-#~ msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
-
-#~ msgid "Documentation"
-#~ msgstr "Dokumentatsioon"
-
-#~ msgid "Books and Howto's on Linux and Free Software"
-#~ msgstr "Raamatud ja HOWTO-d Linuxi ja vabavara kohta"
-
-#~ msgid "LSB"
-#~ msgstr "LSB"
+#: ../../share/compssUsers:999
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Kontoritöö programmid: tekstitöötlus (kword, abiword), tabeltöötlus "
+"(kspread, gnumeric), PDF vaatajad jne"
 
-#~ msgid "Linux Standard Base. Third party applications support"
-#~ msgstr "Linux Standard Base. Võõraste rakenduste toetus"
+#: ../../share/compssUsers:999
+msgid "Game station"
+msgstr "Mänguvahend"
 
-#~ msgid "Web/FTP"
-#~ msgstr "Veeb/FTP"
+#: ../../share/compssUsers:999
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Meelelahutus: põnevus-, laua-, strateegiamängud jne"
 
-#~ msgid "Apache, Pro-ftpd"
-#~ msgstr "Apache ja Pro-ftpd"
+#: ../../share/compssUsers:999
+msgid "Multimedia station"
+msgstr "Multimeedia tööjaam"
 
-#~ msgid "Mail"
-#~ msgstr "E-post"
+#: ../../share/compssUsers:999
+msgid "Sound and video playing/editing programs"
+msgstr "Heli ja video mängimine ja redigeerimine"
 
-#~ msgid "Postfix mail server"
-#~ msgstr "Postfix meiliserver"
+#: ../../share/compssUsers:999
+msgid "Internet station"
+msgstr "Interneti-tööjaam"
 
-#~ msgid "Database"
-#~ msgstr "Andmebaasid"
+#: ../../share/compssUsers:999
+msgid ""
+"Set of tools to read and send mail and news (mutt, tin..) and to browse the "
+"Web"
+msgstr ""
+"Valik rakendusi meili ja uudiste lugemiseks (mutt, tin...) ning veebi "
+"lehitsemiseks"
 
-#~ msgid "PostgreSQL or MySQL database server"
-#~ msgstr "PostgreSQL või MySQL andmebaasiserver"
+#: ../../share/compssUsers:999
+msgid "Network Computer (client)"
+msgstr "Võrguarvuti (klient)"
 
-#~ msgid "Firewall/Router"
-#~ msgstr "Tulemüür/marsruuter"
+#: ../../share/compssUsers:999
+msgid "Clients for different protocols including ssh"
+msgstr "Mitme protokolli, sealhulgas ssh kliendid"
 
-#~ msgid "Internet gateway"
-#~ msgstr "Internetiasjad"
+#: ../../share/compssUsers:999
+msgid "Configuration"
+msgstr "Seadistamine"
 
-#~ msgid "DNS/NIS "
-#~ msgstr "DNS/NIS "
+#: ../../share/compssUsers:999
+msgid "Tools to ease the configuration of your computer"
+msgstr "Vahendid süsteemi lihtsamaks administreerimiseks"
 
-#~ msgid "Domain Name and Network Information Server"
-#~ msgstr "Nimeserver ja NIS"
+#: ../../share/compssUsers:999
+msgid "Console Tools"
+msgstr "Konsoolivahendid"
 
-#~ msgid "Network Computer server"
-#~ msgstr "Võrguserver"
+#: ../../share/compssUsers:999
+msgid "Editors, shells, file tools, terminals"
+msgstr "Redaktorid, shellid, terminalid, failihaldus"
 
-#~ msgid "NFS server, SMB server, Proxy server, ssh server"
-#~ msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
+#: ../../share/compssUsers:999
+msgid "KDE Workstation"
+msgstr "KDE tööjaam"
 
-#~ msgid "Set of tools to read and send mail and news and to browse the Web"
-#~ msgstr ""
-#~ "Valik rakendusi e-posti lugemiseks ja saatmiseks ning veebi lehitsemiseks"
+#: ../../share/compssUsers:999
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"K töölaua keskkond: graafiline töökeskkond ja rida seonduvaid rakendusi"
 
-#~ msgid "Connected through a serial port or an usb cable"
-#~ msgstr "Ühendatud jadapordi või USB kaabli kaudu"
+#: ../../share/compssUsers:999
+msgid "GNOME Workstation"
+msgstr "GNOME tööjaam"
 
-#~ msgid "Add an UPS device"
-#~ msgstr "Lisa UPS"
+#: ../../share/compssUsers:999
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr "Graafiline töökeskkond koos kasutajasõbralike rakendustega"
 
-#~ msgid ""
-#~ "Welcome to the UPS configuration utility.\n"
-#~ "\n"
-#~ "Here, you'll be add a new UPS to your system.\n"
-#~ msgstr ""
-#~ "UPS-i seadistamise vahend.\n"
-#~ "\n"
-#~ "Siin saab lisada süsteemi uue UPS-i.\n"
+#: ../../share/compssUsers:999
+msgid "Other Graphical Desktops"
+msgstr "Muud graafilised töölauad"
 
-#~ msgid ""
-#~ "We're going to add an UPS device.\n"
-#~ "\n"
-#~ "Do you prefer autodetect UPS devices connected to this machine or  ?"
-#~ msgstr ""
-#~ "Nüüd hakatakse UPS-i lisama.\n"
-#~ "\n"
-#~ "Kas soovite lasta masinaga ühendatud UPS-id automaatselt tuvastada?"
+#: ../../share/compssUsers:999
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, WindowMaker, Enlightenment, Fvwm jt"
 
-#~ msgid "Autodetection"
-#~ msgstr "Automaattuvastus"
+#: ../../share/compssUsers:999
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C ja C++ arendusteegid, rakendused ja include-failid"
 
-#~ msgid "The wizard successfully added the following UPS devices:"
-#~ msgstr "Nõustaja lisas edukalt järgmised UPS-id:"
+#: ../../share/compssUsers:999
+msgid "Documentation"
+msgstr "Dokumentatsioon"
 
-#~ msgid "No new UPS devices was found"
-#~ msgstr "Ühtegi uut UPS-i ei leitud!"
+#: ../../share/compssUsers:999
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Raamatud ja HOWTO-d Linuxi ja vabavara kohta"
 
-#~ msgid "UPS driver configuration"
-#~ msgstr "UPS-i draiveri seadistused"
+#: ../../share/compssUsers:999
+msgid "LSB"
+msgstr "LSB"
 
-#~ msgid "Please select your UPS model."
-#~ msgstr "Palun valige UPS-i mudel."
+#: ../../share/compssUsers:999
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Võõraste rakenduste toetus"
 
-#~ msgid "Manufacturer / Model:"
-#~ msgstr "Tootja/mudel:"
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Veeb/FTP"
 
-#~ msgid ""
-#~ "We are configuring the \"%s\" UPS from \"%s\".\n"
-#~ "Please fill in its name, its driver and its port."
-#~ msgstr ""
-#~ "Hakatakse seadistama \"%s\" UPS-i (\"%s\").\n"
-#~ "Palun määrake selle nimi, draiver ja port."
+#: ../../share/compssUsers:999
+msgid "Apache, Pro-ftpd"
+msgstr "Apache ja Pro-ftpd"
 
-#~ msgid "Name:"
-#~ msgstr "Nimi:"
+#: ../../share/compssUsers:999
+msgid "Mail"
+msgstr "E-post"
 
-#~ msgid "The name of your ups"
-#~ msgstr "UPS-i nimi"
+#: ../../share/compssUsers:999
+msgid "Postfix mail server"
+msgstr "Postfix meiliserver"
 
-#~ msgid "The driver that manage your ups"
-#~ msgstr "UPS-i kontrolliv draiver"
+#: ../../share/compssUsers:999
+msgid "Database"
+msgstr "Andmebaasid"
 
-#~ msgid "Port:"
-#~ msgstr "Port:"
+#: ../../share/compssUsers:999
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgreSQL või MySQL andmebaasiserver"
 
-#~ msgid "The port on which is connected your ups"
-#~ msgstr "Port, millega UPS on ühendatud"
+#: ../../share/compssUsers:999
+msgid "Firewall/Router"
+msgstr "Tulemüür/marsruuter"
 
-#~ msgid "The wizard successfully configured the new \"%s\" UPS device."
-#~ msgstr "Nõustaja seadistas edukalt uue \"%s\" UPS-i."
+#: ../../share/compssUsers:999
+msgid "Internet gateway"
+msgstr "Internetiasjad"
 
-#~ msgid "UPS devices"
-#~ msgstr "UPS-id"
+#: ../../share/compssUsers:999
+msgid "Network Computer server"
+msgstr "Võrguserver"
 
-#~ msgid "UPS users"
-#~ msgstr "UPS-i kasutajad"
+#: ../../share/compssUsers:999
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS, SMB, SSH server, vahendaja (proxy)"
 
-#~ msgid "Access Control Lists"
-#~ msgstr "Ligipääsu kontrolli loendid"
+#: ../../share/compssUsers:999
+msgid "Set of tools to read and send mail and news and to browse the Web"
+msgstr ""
+"Valik rakendusi e-posti lugemiseks ja saatmiseks ning veebi lehitsemiseks"
 
-#~ msgid "IP mask"
-#~ msgstr "IP mask"
+#~ msgid "Provider dns 1 (optional)"
+#~ msgstr "DNS 1 (võib jätta tühjaks)"
 
-#~ msgid "Rules"
-#~ msgstr "Reeglid"
+#~ msgid "Provider dns 2 (optional)"
+#~ msgstr "DNS 2 (võib jätta tühjaks)"
 
-#~ msgid "Action"
-#~ msgstr "Toiming"
+#~ msgid "Ethernet Card"
+#~ msgstr "Võrgukaart"
 
-#~ msgid "ACL name"
-#~ msgstr "ACL nimi"
+#~ msgid "DHCP Client"
+#~ msgstr "DHCP klient"
 
-#~ msgid "Welcome to the UPS configuration tools"
-#~ msgstr "Tere tulemast kasutama USP-i seadistamise vahendit!"
+#~ msgid "Display"
+#~ msgstr "Vaatamine"
 
-#~ msgid "Running \"%s\" ..."
-#~ msgstr "\"%s\" käib..."
+#~ msgid "Display configuration"
+#~ msgstr "Seadistuse vaatamine"
-- 
cgit v1.2.1